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

This commit is contained in:
Billy Lau
2015-08-03 19:53:28 +00:00
committed by Android (Google) Code Review

View File

@ -8333,9 +8333,9 @@ public final class Settings {
return true; return true;
case AppOpsManager.MODE_DEFAULT: case AppOpsManager.MODE_DEFAULT:
// this is the default operating mode after an app's installation // this is the default operating mode after an app's installation
if (!throwException) { if(context.checkCallingOrSelfPermission(permissionName) == PackageManager
return context.checkCallingOrSelfPermission(permissionName) == .PERMISSION_GRANTED) {
PackageManager.PERMISSION_GRANTED; return true;
} }
default: default:
// this is for all other cases trickled down here... // this is for all other cases trickled down here...