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

Merge change 4720 into donut

Browse Source 
* changes:
  Fix string formatters in SettingsProvider SecurityException message.
This commit is contained in:
Android (Google) Code Review
2009-06-19 10:29:59 -07:00
parent bc806f65ed 31a88fac91
commit 6afe81339e
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -159,7 +159,7 @@ public class SettingsProvider extends ContentProvider {
android.Manifest.permission.WRITE_SECURE_SETTINGS) != android.Manifest.permission.WRITE_SECURE_SETTINGS) !=
PackageManager.PERMISSION_GRANTED) { PackageManager.PERMISSION_GRANTED) {
throw new SecurityException( throw new SecurityException(
String.format("Permission denial: writing to secure settings requires $1%s", String.format("Permission denial: writing to secure settings requires %1$s",
android.Manifest.permission.WRITE_SECURE_SETTINGS)); 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.
@@ -168,7 +168,7 @@ public class SettingsProvider extends ContentProvider {
android.Manifest.permission.WRITE_GSERVICES) != android.Manifest.permission.WRITE_GSERVICES) !=
PackageManager.PERMISSION_GRANTED) { PackageManager.PERMISSION_GRANTED) {
throw new SecurityException( throw new SecurityException(
String.format("Permission denial: writing to gservices settings requires $1%s", String.format("Permission denial: writing to gservices settings requires %1$s",
android.Manifest.permission.WRITE_GSERVICES)); android.Manifest.permission.WRITE_GSERVICES));
} }
} }