summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/backup/PrivacySettingsConfigData.java
diff options
context:
space:
mode:
authorFan Zhang <zhfan@google.com>2018-04-30 13:41:56 -0700
committerFan Zhang <zhfan@google.com>2018-04-30 15:17:22 -0700
commit16de45d8ec0ca888cd61203de29378ce1cd58ae6 (patch)
tree5ffec58c0a403a609e9bd1b592791d137f31f993 /src/com/android/settings/backup/PrivacySettingsConfigData.java
parent8efbe6e255190ba9e673dd64a574d6a3e01815cc (diff)
downloadpackages_apps_Settings-16de45d8ec0ca888cd61203de29378ce1cd58ae6.tar.gz
packages_apps_Settings-16de45d8ec0ca888cd61203de29378ce1cd58ae6.tar.bz2
packages_apps_Settings-16de45d8ec0ca888cd61203de29378ce1cd58ae6.zip
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
Diffstat (limited to 'src/com/android/settings/backup/PrivacySettingsConfigData.java')
-rw-r--r--src/com/android/settings/backup/PrivacySettingsConfigData.java12
1 files changed, 11 insertions, 1 deletions
diff --git a/src/com/android/settings/backup/PrivacySettingsConfigData.java b/src/com/android/settings/backup/PrivacySettingsConfigData.java
index 9b72a829a2..ffe05b8559 100644
--- a/src/com/android/settings/backup/PrivacySettingsConfigData.java
+++ b/src/com/android/settings/backup/PrivacySettingsConfigData.java
@@ -19,6 +19,9 @@ package com.android.settings.backup;
import android.content.Intent;
public class PrivacySettingsConfigData {
+
+ private static PrivacySettingsConfigData sInstance;
+
private boolean mBackupEnabled;
private boolean mBackupGray;
private Intent mConfigIntent;
@@ -26,7 +29,7 @@ public class PrivacySettingsConfigData {
private Intent mManageIntent;
private String mManageLabel;
- public PrivacySettingsConfigData() {
+ private PrivacySettingsConfigData() {
mBackupEnabled = false;
mBackupGray = false;
mConfigIntent = null;
@@ -35,6 +38,13 @@ public class PrivacySettingsConfigData {
mManageLabel = null;
}
+ public static PrivacySettingsConfigData getInstance() {
+ if (sInstance == null) {
+ sInstance = new PrivacySettingsConfigData();
+ }
+ return sInstance;
+ }
+
public boolean isBackupEnabled() {
return mBackupEnabled;
}