Merge "Bug: 22879202 App compatibility with WRITE_SETTINGS failing" into mnc-dev

2015-08-03 19:53:28 +00:00
parent 87920455ae 7c19f4cf20
commit 5680f9f6d6
1 changed files with 3 additions and 3 deletions
--- 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...