commit f575552320c63859f29af65c4e0e5b79fd4770df
author Carmen Jackson <carmenjackson@google.com> Wed Apr 19 01:14:21 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Apr 19 01:14:21 2017 +0000
tree 69b3c49388dae240f9e423d48c2dd56584505ff0
parent 000dd99ef84411150828b8e678e5c78653896146
parent c35a2c65144b32f578db91746d982195f47f48dc

Merge "atrace: Don't NPE if we can't access hal-related tracepoint files." into oc-dev am: 638fc1f809
am: c35a2c6514

Change-Id: I3f97bed1c56b8ed47fe93489aea575a018494795

cmds/atrace/atrace.cpp

diff --git a/cmds/atrace/atrace.cpp b/cmds/atrace/atrace.cpp
index cfe3628..054b00e 100644
--- a/cmds/atrace/atrace.cpp
+++ b/cmds/atrace/atrace.cpp
@@ -550,7 +550,13 @@
                 // ignore
                 continue;
             }
+
             sp<IBase> interface = interfaceRet;
+            if (interface == nullptr) {
+                // ignore
+                continue;
+            }
+
             auto notifyRet = interface->notifySyspropsChanged();
             if (!notifyRet.isOk()) {
                 // ignore