diff options
| author | 2018-01-08 14:35:34 +0000 | |
|---|---|---|
| committer | 2018-01-08 14:35:49 +0000 | |
| commit | 24c6ab4cc132151ff2238214731f10b5f6bda99c (patch) | |
| tree | c496d982a88c2ddb963f92045d374b8130234df9 | |
| parent | c21066b0e7256fea485f15c4a9811b2b2f071bf4 (diff) | |
Add null checking in onUidRemovedLocked
Bug: 71697620
Test: cts-tradefed run cts-dev --module DevicePolicyManager --test com.android.cts.devicepolicy.CrossProfileAppsHostSideTest
Change-Id: I6d7f70c01ab3d6b077ffeb9a076d46159a633682
| -rw-r--r-- | packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java index bef2bcbd80f1..1167d69a1577 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 class SettingsProvider extends ContentProvider { 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 |