commit 366e7a20c4d716c3d260faef929f0e8d6be267fb
author Adam Lesinski <adamlesinski@google.com> Fri Jul 25 10:20:26 2014 -0700
committer Adam Lesinski <adamlesinski@google.com> Thu Jul 31 19:12:09 2014 +0000
tree 45af84d3a4efce099b7e6f8c20575a49b686e8d1
parent 80e1f1bfdb814a08fb8b07b2e279285d495042e9

Fix UsageStats permissions in Settings

AppOpsManager returns all permission for all users. We need
to check that the permission we're getting is actually for
our user.

Change-Id: I8287d2dc1959d4a22c19ebb2d24136324e04cd2b

src/com/android/settings/UsageAccessSettings.java

diff --git a/src/com/android/settings/UsageAccessSettings.java b/src/com/android/settings/UsageAccessSettings.java
index 8e8e533..8ae277d 100644
--- a/src/com/android/settings/UsageAccessSettings.java
+++ b/src/com/android/settings/UsageAccessSettings.java
@@ -148,6 +148,11 @@
                     continue;
                 }
 
+                if (packageOp.getUid() != pe.packageInfo.applicationInfo.uid) {
+                    // This AppOp does not belong to this user.
+                    continue;
+                }
+
                 if (packageOp.getOps().size() < 1) {
                     Log.w(TAG, "No AppOps permission exists for package "
                             + packageOp.getPackageName());
@@ -294,9 +299,13 @@
 
         final int newMode = (Boolean) newValue ?
                 AppOpsManager.MODE_ALLOWED : AppOpsManager.MODE_IGNORED;
-        mAppOpsManager.setMode(AppOpsManager.OP_GET_USAGE_STATS, pe.packageInfo.applicationInfo.uid,
-                packageName, newMode);
-        pe.appOpMode = newMode;
+
+        // Check if we need to do any work.
+        if (pe.appOpMode != newMode) {
+            mAppOpsManager.setMode(AppOpsManager.OP_GET_USAGE_STATS,
+                    pe.packageInfo.applicationInfo.uid, packageName, newMode);
+            pe.appOpMode = newMode;
+        }
         return true;
     }