summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Mikhail Naganov <mnaganov@google.com> 2019-04-23 10:19:51 -0700
committer Mikhail Naganov <mnaganov@google.com> 2019-04-23 10:19:51 -0700
commit29fef7d7b34aabd451f34b65d2a274ae2db48f37 (patch)
treec8dc77602510908fa3d15541d1dd1df4313ec7ac
parent8cd204d6cd66f581e10ce574ba72faf1ebf6b592 (diff)
AppOpsCallback: do not log error on null package name
Java side can pass 'null' as packageName parameter for IAppOpsCallback::opChanged, e.g. when calling it via AppOpsService.notifyWatchersOfChange. BnAppOpsCallback on the native side should not emit "Reading a NULL string not supported here" error logs in this case. For that, a different overload of 'Parcel::readString16' method must be used. Bug: 130038586 Test: turn DND on / off, watch logcat Change-Id: I69d28d6a998d75acf987bf49fb0cbfb75cb95828
-rw-r--r--libs/binder/IAppOpsCallback.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/libs/binder/IAppOpsCallback.cpp b/libs/binder/IAppOpsCallback.cpp
index 2f4dbeea18..aba49673b1 100644
--- a/libs/binder/IAppOpsCallback.cpp
+++ b/libs/binder/IAppOpsCallback.cpp
@@ -57,7 +57,8 @@ status_t BnAppOpsCallback::onTransact(
case OP_CHANGED_TRANSACTION: {
CHECK_INTERFACE(IAppOpsCallback, data, reply);
int32_t op = data.readInt32();
- String16 packageName = data.readString16();
+ String16 packageName;
+ (void)data.readString16(&packageName);
opChanged(op, packageName);
reply->writeNoException();
return NO_ERROR;