summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@android.com>2013-08-05 11:15:43 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-08-05 11:15:43 -0700
commitfc222b8d3aa716fe1596109ea960d57eb3aea1c5 (patch)
tree597c32ba23f317ee80e63155ac4c5a876a252d3b
parentad38b60b372314f6266381207bd82144f21b1027 (diff)
parent8f00b7711c48a102a70f9b7e6a563aa14b79f5a5 (diff)
downloadpackages_apps_Settings-fc222b8d3aa716fe1596109ea960d57eb3aea1c5.zip
packages_apps_Settings-fc222b8d3aa716fe1596109ea960d57eb3aea1c5.tar.gz
packages_apps_Settings-fc222b8d3aa716fe1596109ea960d57eb3aea1c5.tar.bz2
am 8f00b771: Merge "Fix app ops details not displaying permissions under certain conditions."
* commit '8f00b7711c48a102a70f9b7e6a563aa14b79f5a5': Fix app ops details not displaying permissions under certain conditions.
-rw-r--r--src/com/android/settings/applications/AppOpsState.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/settings/applications/AppOpsState.java b/src/com/android/settings/applications/AppOpsState.java
index 6cdbdaf..39eefe2 100644
--- a/src/com/android/settings/applications/AppOpsState.java
+++ b/src/com/android/settings/applications/AppOpsState.java
@@ -525,7 +525,7 @@ public class AppOpsState {
& PackageInfo.REQUESTED_PERMISSION_GRANTED) == 0) {
if (DEBUG) Log.d(TAG, "Pkg " + appInfo.packageName + " perm "
+ appInfo.requestedPermissions[j] + " not granted; skipping");
- break;
+ continue;
}
}
if (DEBUG) Log.d(TAG, "Pkg " + appInfo.packageName + ": requested perm "