diff options
| author | Julia Reynolds <juliacr@google.com> | 2021-07-08 10:47:12 -0400 |
|---|---|---|
| committer | Artem Radchenko <artem.radchenko@globallogic.com> | 2021-11-18 10:14:30 +0000 |
| commit | 09c10d18bf318f5f0c6b3f1f10f0430336014722 (patch) | |
| tree | c138a1f08c7496d3f21336128c3eff1b137d78e1 | |
| parent | eeabcfbaa1c82cad1f57ae32b498a309c4773f5f (diff) | |
| download | base-09c10d18bf318f5f0c6b3f1f10f0430336014722.tar.gz | |
Fix NPE during restore
This CL was cherry-picked from aosp master branch to fix cts.
Test: atest, manual restore
Fixes: 192325449
Bug: 206476700
./cts-tradefed run cts-dev -m CtsIncidentHostTestCases -t com.android.server.cts.IncidentdTest
Signed
Change-Id: I52d230aa9534a12b35da82dc8fd8449732812511
Signed-off-by: Artem Radchenko <artem.radchenko@globallogic.com>
| -rw-r--r-- | services/core/java/com/android/server/notification/ManagedServices.java | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/services/core/java/com/android/server/notification/ManagedServices.java b/services/core/java/com/android/server/notification/ManagedServices.java index 4a6eb276bd02..f78531bd5214 100644 --- a/services/core/java/com/android/server/notification/ManagedServices.java +++ b/services/core/java/com/android/server/notification/ManagedServices.java @@ -422,10 +422,12 @@ abstract public class ManagedServices { private void loadAllowedComponentsFromSettings() { for (UserInfo user : mUm.getUsers()) { final ContentResolver cr = mContext.getContentResolver(); - addApprovedList(Settings.Secure.getStringForUser( - cr, - getConfig().secureSettingName, - user.id), user.id, true); + if (!TextUtils.isEmpty(getConfig().secureSettingName)) { + addApprovedList(Settings.Secure.getStringForUser( + cr, + getConfig().secureSettingName, + user.id), user.id, true); + } if (!TextUtils.isEmpty(getConfig().secondarySettingName)) { addApprovedList(Settings.Secure.getStringForUser( cr, |