commit b64afe17064f126eb782c42a238db65f080fc8f0
author Dianne Hackborn <hackbod@google.com> Tue Jul 22 16:29:04 2014 -0700
committer Dianne Hackborn <hackbod@google.com> Tue Jul 22 18:26:29 2014 -0700
tree 1db47add5c140325052078bba86e8ee64f87178f
parent 368c5adaf7a1141bfee3cf622efbc7285e370979

Further fix on issue #16013164

Dumb dumb dumb copy/paste error when moving the
uid checking up out of the function.

Change-Id: I01513ccd80750b724dbfa8d9d7d171819c6b959b

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 579c449..5a510a9 100644
--- a/services/core/java/com/android/server/AppOpsService.java
+++ b/services/core/java/com/android/server/AppOpsService.java
@@ -371,11 +371,10 @@
 
     @Override
     public void setMode(int code, int uid, String packageName, int mode) {
-        if (Binder.getCallingPid() == Process.myPid()) {
-            return;
+        if (Binder.getCallingPid() != Process.myPid()) {
+            mContext.enforcePermission(android.Manifest.permission.UPDATE_APP_OPS_STATS,
+                    Binder.getCallingPid(), Binder.getCallingUid(), null);
         }
-        mContext.enforcePermission(android.Manifest.permission.UPDATE_APP_OPS_STATS,
-                Binder.getCallingPid(), Binder.getCallingUid(), null);
         verifyIncomingOp(code);
         ArrayList<Callback> repCbs = null;
         code = AppOpsManager.opToSwitch(code);