Merge change 4720 into donut (6afe8133) · Commits · e / os / android_frameworks_base

packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -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));
	}		}
	}		}