diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-06-19 10:38:47 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-06-19 10:38:47 -0700 |
| commit | 6976dca6c89d4d3ff986e46b6eedebdbdd656b0c (patch) | |
| tree | 7cdd95e9d394f3a0939a9e44861b593d2754a098 /packages/SettingsProvider | |
| parent | c73e9ad55a28f6bec3260e919573e0597fdd23ab (diff) | |
| parent | 6afe81339ed973f1ef4a6c30110d5ce3b001ea4c (diff) | |
| download | frameworks_base-6976dca6c89d4d3ff986e46b6eedebdbdd656b0c.zip frameworks_base-6976dca6c89d4d3ff986e46b6eedebdbdd656b0c.tar.gz frameworks_base-6976dca6c89d4d3ff986e46b6eedebdbdd656b0c.tar.bz2 | |
am 6afe8133: Merge change 4720 into donut
Merge commit '6afe81339ed973f1ef4a6c30110d5ce3b001ea4c'
* commit '6afe81339ed973f1ef4a6c30110d5ce3b001ea4c':
Fix string formatters in SettingsProvider SecurityException message.
Diffstat (limited to 'packages/SettingsProvider')
| -rw-r--r-- | packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java index 94c5d41..1a03900 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java @@ -159,7 +159,7 @@ public class SettingsProvider extends ContentProvider { android.Manifest.permission.WRITE_SECURE_SETTINGS) != PackageManager.PERMISSION_GRANTED) { 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)); // 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) != PackageManager.PERMISSION_GRANTED) { 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)); } } |