commit 24c6ab4cc132151ff2238214731f10b5f6bda99c
author Tony Mak <tonymak@google.com> Mon Jan 08 14:35:34 2018 +0000
committer Tony Mak <tonymak@google.com> Mon Jan 08 14:35:49 2018 +0000
tree c496d982a88c2ddb963f92045d374b8130234df9
parent c21066b0e7256fea485f15c4a9811b2b2f071bf4

Add null checking in onUidRemovedLocked

Bug: 71697620

Test: cts-tradefed run cts-dev --module DevicePolicyManager --test com.android.cts.devicepolicy.CrossProfileAppsHostSideTest
Change-Id: I6d7f70c01ab3d6b077ffeb9a076d46159a633682

packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java

diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
index bef2bcb..1167d69 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
@@ -2592,7 +2592,9 @@
         public void onUidRemovedLocked(int uid) {
             final SettingsState ssaidSettings = getSettingsLocked(SETTINGS_TYPE_SSAID,
                     UserHandle.getUserId(uid));
-            ssaidSettings.deleteSettingLocked(Integer.toString(uid));
+            if (ssaidSettings != null) {
+                ssaidSettings.deleteSettingLocked(Integer.toString(uid));
+            }
         }
 
         @Nullable