| commit | 638fc1f8099a0ffb5f11787552c6c18002ae607e | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Wed Apr 19 01:06:26 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Apr 19 01:06:27 2017 +0000 |
| tree | 1d452cf41f84db9c11201737cedcf00106692831 | |
| parent | 932dc64614f29f53701766fed0c07c8cf592ccf1 [diff] | |
| parent | 7320612aeb8674a63106299f2cba5d23df1ca03b [diff] |
Merge "atrace: Don't NPE if we can't access hal-related tracepoint files." into oc-dev
diff --git a/cmds/atrace/atrace.cpp b/cmds/atrace/atrace.cpp index 05e1615..6cfbed9 100644 --- a/cmds/atrace/atrace.cpp +++ b/cmds/atrace/atrace.cpp
@@ -552,7 +552,13 @@ // ignore continue; } + sp<IBase> interface = interfaceRet; + if (interface == nullptr) { + // ignore + continue; + } + auto notifyRet = interface->notifySyspropsChanged(); if (!notifyRet.isOk()) { // ignore