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

* commit '5680f9f6d669e7d2f45db1027d53359b9ad327ff':
  Bug: 22879202 App compatibility with WRITE_SETTINGS failing
This commit is contained in:
Billy Lau
2015-08-03 20:00:55 +00:00
committed by Android Git Automerger

View File

@@ -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...