summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorBilly Lau <billylau@google.com>2015-08-03 19:53:28 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-08-03 19:53:28 +0000
commit5680f9f6d669e7d2f45db1027d53359b9ad327ff (patch)
treed7357d0c02100e2d0781b5f85b38abf569cb7a39 /core/java
parent87920455ae63deb0b7d14df06edeb879e6494cc1 (diff)
parent7c19f4cf20b8549870b1d570988f47fc1276f176 (diff)
Merge "Bug: 22879202 App compatibility with WRITE_SETTINGS failing" into mnc-dev
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/provider/Settings.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index a836cc5a5fcd..6f98788976bf 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -8333,9 +8333,9 @@ public final class Settings {
return true;
case AppOpsManager.MODE_DEFAULT:
// this is the default operating mode after an app's installation
- if (!throwException) {
- return context.checkCallingOrSelfPermission(permissionName) ==
- PackageManager.PERMISSION_GRANTED;
+ if(context.checkCallingOrSelfPermission(permissionName) == PackageManager
+ .PERMISSION_GRANTED) {
+ return true;
}
default:
// this is for all other cases trickled down here...