commit 16de45d8ec0ca888cd61203de29378ce1cd58ae6
author Fan Zhang <zhfan@google.com> Mon Apr 30 13:41:56 2018 -0700
committer Fan Zhang <zhfan@google.com> Mon Apr 30 15:17:22 2018 -0700
tree 5ffec58c0a403a609e9bd1b592791d137f31f993
parent 8efbe6e255190ba9e673dd64a574d6a3e01815cc

Fix NPE during unit test

As of ag/3932176 the slice indexer now queries getSummary() for each
controller. So we need to create all necessary objects before
getSummary(). In this case, the PSCD object.

Change-Id: I0162996be37d740f1e450880bf4698acd94ca0ad
Fixes: 78897071
Test: atest

src/com/android/settings/backup/PrivacySettings.java

diff --git a/src/com/android/settings/backup/PrivacySettings.java b/src/com/android/settings/backup/PrivacySettings.java
index 9b342e7..684956e 100644
--- a/src/com/android/settings/backup/PrivacySettings.java
+++ b/src/com/android/settings/backup/PrivacySettings.java
@@ -65,15 +65,10 @@
     }
 
     private void updatePrivacySettingsConfigData(final Context context) {
-        final PrivacySettingsConfigData pData = new PrivacySettingsConfigData();
         if (PrivacySettingsUtils.isAdminUser(context)) {
-            PrivacySettingsUtils.updatePrivacyBuffer(context, pData);
+            PrivacySettingsUtils.updatePrivacyBuffer(context,
+                    PrivacySettingsConfigData.getInstance());
         }
-
-        use(BackupDataPreferenceController.class).setPrivacySettingsConfigData(pData);
-        use(ConfigureAccountPreferenceController.class).setPrivacySettingsConfigData(pData);
-        use(DataManagementPreferenceController.class).setPrivacySettingsConfigData(pData);
-        use(AutoRestorePreferenceController.class).setPrivacySettingsConfigData(pData);
     }
 
     public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =