Merge "Remove unused package_verifier_state setting." (3b48187f) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+0 −8

Original line number	Original line	Diff line number	Diff line
	@@ -7880,14 +7880,6 @@ public final class Settings {
	*/		*/
	public static final String DEVICE_PAIRED = "device_paired";		public static final String DEVICE_PAIRED = "device_paired";

	/**
	* Integer state indicating whether package verifier is enabled.
	* TODO(b/34259924): Remove this setting.
	*
	* @hide
	*/
	public static final String PACKAGE_VERIFIER_STATE = "package_verifier_state";

	/**		/**
	* Specifies additional package name for broadcasting the CMAS messages.		* Specifies additional package name for broadcasting the CMAS messages.
	* @hide		* @hide

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

+0 −3

Original line number	Original line	Diff line number	Diff line
	@@ -2242,9 +2242,6 @@ class SettingsProtoDumpUtil {
	dumpSetting(s, p,		dumpSetting(s, p,
	Settings.Secure.PACKAGE_VERIFIER_USER_CONSENT,		Settings.Secure.PACKAGE_VERIFIER_USER_CONSENT,
	SecureSettingsProto.PackageVerifier.USER_CONSENT);		SecureSettingsProto.PackageVerifier.USER_CONSENT);
	dumpSetting(s, p,
	Settings.Secure.PACKAGE_VERIFIER_STATE,
	SecureSettingsProto.PackageVerifier.STATE);
	p.end(packageVerifierToken);		p.end(packageVerifierToken);

	final long parentalControlToken = p.start(SecureSettingsProto.PARENTAL_CONTROL);		final long parentalControlToken = p.start(SecureSettingsProto.PARENTAL_CONTROL);

packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java

+5 −8

Original line number	Original line	Diff line number	Diff line
	@@ -17,8 +17,7 @@
	package android.provider;		package android.provider;

	import static com.google.android.collect.Sets.newHashSet;		import static com.google.android.collect.Sets.newHashSet;
			import static com.google.common.truth.Truth.assertWithMessage;
	import static junit.framework.Assert.assertTrue;

	import static java.lang.reflect.Modifier.isFinal;		import static java.lang.reflect.Modifier.isFinal;
	import static java.lang.reflect.Modifier.isPublic;		import static java.lang.reflect.Modifier.isPublic;
	@@ -655,7 +654,6 @@ public class SettingsBackupTest {
	Settings.Secure.NIGHT_DISPLAY_LAST_ACTIVATED_TIME,		Settings.Secure.NIGHT_DISPLAY_LAST_ACTIVATED_TIME,
	Settings.Secure.NUM_ROTATION_SUGGESTIONS_ACCEPTED,		Settings.Secure.NUM_ROTATION_SUGGESTIONS_ACCEPTED,
	Settings.Secure.ODI_CAPTIONS_ENABLED,		Settings.Secure.ODI_CAPTIONS_ENABLED,
	Settings.Secure.PACKAGE_VERIFIER_STATE,
	Settings.Secure.PACKAGE_VERIFIER_USER_CONSENT,		Settings.Secure.PACKAGE_VERIFIER_USER_CONSENT,
	Settings.Secure.PARENTAL_CONTROL_LAST_UPDATE,		Settings.Secure.PARENTAL_CONTROL_LAST_UPDATE,
	Settings.Secure.PAYMENT_SERVICE_SEARCH_URI,		Settings.Secure.PAYMENT_SERVICE_SEARCH_URI,
	@@ -754,12 +752,11 @@ public class SettingsBackupTest {
	Set<String> settings, Set<String> settingsToBackup, Set<String> blacklist) {		Set<String> settings, Set<String> settingsToBackup, Set<String> blacklist) {
	Set<String> settingsNotBackedUp = difference(settings, settingsToBackup);		Set<String> settingsNotBackedUp = difference(settings, settingsToBackup);
	Set<String> settingsNotBackedUpOrBlacklisted = difference(settingsNotBackedUp, blacklist);		Set<String> settingsNotBackedUpOrBlacklisted = difference(settingsNotBackedUp, blacklist);
	assertTrue(		assertWithMessage("Settings not backed up or blacklisted")
	"Settings not backed up or blacklisted",		.that(settingsNotBackedUpOrBlacklisted).isEmpty();
	settingsNotBackedUpOrBlacklisted.isEmpty());

	assertTrue(		assertWithMessage("blacklisted settings backed up")
	"blacklisted settings backed up", intersect(settingsToBackup, blacklist).isEmpty());		.that(intersect(settingsToBackup, blacklist)).isEmpty();
	}		}

	private static Set<String> getCandidateSettings(		private static Set<String> getCandidateSettings(