Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change 4694 into donut

Browse Source 
* changes:
  Make SettingsProviders SecurityException messages more verbose.
This commit is contained in:
Android (Google) Code Review
2009-06-18 17:24:47 -07:00
parent 167dbe0bf1 16dd82cfdc
commit 2810f68199
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
View File

@@ -158,14 +158,18 @@ public class SettingsProvider extends ContentProvider {
getContext().checkCallingOrSelfPermission( getContext().checkCallingOrSelfPermission(
android.Manifest.permission.WRITE_SECURE_SETTINGS) != android.Manifest.permission.WRITE_SECURE_SETTINGS) !=
PackageManager.PERMISSION_GRANTED) { PackageManager.PERMISSION_GRANTED) {
throw new SecurityException("Cannot write secure settings table"); throw new SecurityException(
String.format("Permission denial: writing to secure settings requires $1%s",
android.Manifest.permission.WRITE_SECURE_SETTINGS));
// TODO: Move gservices into its own provider so we don't need this nonsense. // TODO: Move gservices into its own provider so we don't need this nonsense.
} else if ("gservices".equals(args.table) && } else if ("gservices".equals(args.table) &&
getContext().checkCallingOrSelfPermission( getContext().checkCallingOrSelfPermission(
android.Manifest.permission.WRITE_GSERVICES) != android.Manifest.permission.WRITE_GSERVICES) !=
PackageManager.PERMISSION_GRANTED) { PackageManager.PERMISSION_GRANTED) {
throw new SecurityException("Cannot write gservices table"); throw new SecurityException(
String.format("Permission denial: writing to gservices settings requires $1%s",
android.Manifest.permission.WRITE_GSERVICES));
} }
} }