commit 4e1a74241b0052db0ae191d410cd42ff33fc2226
author Alan Stokes <alanstokes@google.com> Tue Sep 24 14:15:10 2019 +0100
committer Alan Stokes <alanstokes@google.com> Tue Sep 24 15:56:08 2019 +0100
tree 11666d8bae020be287cf9310f498b9e14c2c277c
parent efb5b79fcd4bbecbac0e803623a3037d02750da8

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

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

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(