Remove unused package_verifier_state setting.
This was added during O development but never used. (It was going to
be used to store whether GPP was enabled, but the relevant settings
screen was implemented in GMS Core instead. See b/31002801, especially
comment 7 onwards.)
It now serves no purpose other than misinformation.
I also updated the test so when backup of settings is misconfigured
the error message tells you which ones.
Change-Id: Ib5e9a9ced1d1a43844889192cefddeec335f9f78
Fix: 34259924
Bug: 135751498
Test: Builds
Test: atest SettingsProviderTest
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 8b20f0b..61d8eb1 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -7881,14 +7881,6 @@
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.
* @hide
*/
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java
index 365923e..046ffc3 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java
@@ -2242,9 +2242,6 @@
dumpSetting(s, p,
Settings.Secure.PACKAGE_VERIFIER_USER_CONSENT,
SecureSettingsProto.PackageVerifier.USER_CONSENT);
- dumpSetting(s, p,
- Settings.Secure.PACKAGE_VERIFIER_STATE,
- SecureSettingsProto.PackageVerifier.STATE);
p.end(packageVerifierToken);
final long parentalControlToken = p.start(SecureSettingsProto.PARENTAL_CONTROL);
diff --git a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java
index 6ea3db3..3a7de18 100644
--- a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java
+++ b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java
@@ -17,8 +17,7 @@
package android.provider;
import static com.google.android.collect.Sets.newHashSet;
-
-import static junit.framework.Assert.assertTrue;
+import static com.google.common.truth.Truth.assertWithMessage;
import static java.lang.reflect.Modifier.isFinal;
import static java.lang.reflect.Modifier.isPublic;
@@ -655,7 +654,6 @@
Settings.Secure.NIGHT_DISPLAY_LAST_ACTIVATED_TIME,
Settings.Secure.NUM_ROTATION_SUGGESTIONS_ACCEPTED,
Settings.Secure.ODI_CAPTIONS_ENABLED,
- Settings.Secure.PACKAGE_VERIFIER_STATE,
Settings.Secure.PACKAGE_VERIFIER_USER_CONSENT,
Settings.Secure.PARENTAL_CONTROL_LAST_UPDATE,
Settings.Secure.PAYMENT_SERVICE_SEARCH_URI,
@@ -754,12 +752,11 @@
Set<String> settings, Set<String> settingsToBackup, Set<String> blacklist) {
Set<String> settingsNotBackedUp = difference(settings, settingsToBackup);
Set<String> settingsNotBackedUpOrBlacklisted = difference(settingsNotBackedUp, blacklist);
- assertTrue(
- "Settings not backed up or blacklisted",
- settingsNotBackedUpOrBlacklisted.isEmpty());
+ assertWithMessage("Settings not backed up or blacklisted")
+ .that(settingsNotBackedUpOrBlacklisted).isEmpty();
- assertTrue(
- "blacklisted settings backed up", intersect(settingsToBackup, blacklist).isEmpty());
+ assertWithMessage("blacklisted settings backed up")
+ .that(intersect(settingsToBackup, blacklist)).isEmpty();
}
private static Set<String> getCandidateSettings(