diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-11-30 13:12:11 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-11-30 13:12:11 +0000 |
| commit | c560608ce54f813b65b00258dd170c483deeaef6 (patch) | |
| tree | c138a1f08c7496d3f21336128c3eff1b137d78e1 | |
| parent | eeabcfbaa1c82cad1f57ae32b498a309c4773f5f (diff) | |
| parent | 09c10d18bf318f5f0c6b3f1f10f0430336014722 (diff) | |
| download | base-android10-dev.tar.gz | |
Merge "Fix NPE during restore" into android10-devandroid10-dev
| -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, |