commit 1030ca69a26b7caac2bf14d4e97f9d4cca95e179
author Svetoslav Ganov <svetoslavganov@google.com> Thu Dec 10 02:26:33 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Dec 10 02:26:33 2015 +0000
tree d1f1b95dc05d4a24e4a99ff62ce1feb944dd13f4
parent d7963806f15a1435d3e6c8023cd55b5a84340e77
parent 8de5971ac68fdae1a418ed6cd95d276b98b21996

Merge "Avoid caller NPE if callback null in AppOpsService"

services/core/java/com/android/server/AppOpsService.java

diff --git a/services/core/java/com/android/server/AppOpsService.java b/services/core/java/com/android/server/AppOpsService.java
index ede92fb..7fcedc6 100644
--- a/services/core/java/com/android/server/AppOpsService.java
+++ b/services/core/java/com/android/server/AppOpsService.java
@@ -788,6 +788,9 @@
 
     @Override
     public void startWatchingMode(int op, String packageName, IAppOpsCallback callback) {
+        if (callback == null) {
+            return;
+        }
         synchronized (this) {
             op = (op != AppOpsManager.OP_NONE) ? AppOpsManager.opToSwitch(op) : op;
             Callback cb = mModeWatchers.get(callback.asBinder());
@@ -816,6 +819,9 @@
 
     @Override
     public void stopWatchingMode(IAppOpsCallback callback) {
+        if (callback == null) {
+            return;
+        }
         synchronized (this) {
             Callback cb = mModeWatchers.remove(callback.asBinder());
             if (cb != null) {