commit 52d1a6b5ffb8cef003c8469c1c4ec1dd1593063a
author Billy Lau <billylau@google.com> Sat Aug 01 13:16:25 2015 +0100
committer The Android Automerger <android-build@google.com> Mon Aug 03 16:16:10 2015 -0700
tree 16a1cc2ab2c1303dd97d3ca288bf6f43966de620
parent 80c88659f43fb825f6ecb4874a1bf3e50fc8c2b3

Bug: 22879202 App compatibility with WRITE_SETTINGS failing

Fix a bug in the app ops protected permission check that broke backwards
compatibility.

Change-Id: Ic73759edd29a479a670fb31407e36aa50d09b6c3

core/java/android/provider/Settings.java

diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index a836cc5..6f98788 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -8333,9 +8333,9 @@
                 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...