diff options
| author | 2018-06-08 23:25:19 -0700 | |
|---|---|---|
| committer | 2018-06-08 23:25:19 -0700 | |
| commit | 22f140d66305760076ab34626eb093a6eb3f6f04 (patch) | |
| tree | 84b80d9ab3f43650df29a07cb3c24065e37c1e7f /libs/binder/AppOpsManager.cpp | |
| parent | d938b65f8a7645644faa233d299546111dd1c82d (diff) | |
| parent | f11e2bd016d886a333345dea853ebda23a408d5c (diff) | |
resolve merge conflicts of f11e2bd016d886a333345dea853ebda23a408d5c to pi-dev-plus-aosp
Test: I solemnly swear I tested this conflict resolution.
Bug: None
Change-Id: I4966411ed2eb3f4e29726a29069c1cd66a4becff
Diffstat (limited to 'libs/binder/AppOpsManager.cpp')
| -rw-r--r-- | libs/binder/AppOpsManager.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/binder/AppOpsManager.cpp b/libs/binder/AppOpsManager.cpp index 62c8987def..91773fb96f 100644 --- a/libs/binder/AppOpsManager.cpp +++ b/libs/binder/AppOpsManager.cpp @@ -103,7 +103,7 @@ int32_t AppOpsManager::noteOp(int32_t op, int32_t uid, const String16& callingPa int32_t AppOpsManager::startOpNoThrow(int32_t op, int32_t uid, const String16& callingPackage, bool startIfModeDefault) { sp<IAppOpsService> service = getService(); - return service != NULL + return service != nullptr ? service->startOperation(getToken(service), op, uid, callingPackage, startIfModeDefault) : APP_OPS_MANAGER_UNAVAILABLE_MODE; } |