From d7faba5c25f40c0b6753dd3fcc5475d7757c69b9 Mon Sep 17 00:00:00 2001 From: Julia Reynolds Date: Mon, 17 Aug 2015 13:09:47 -0400 Subject: [PATCH] Add null check when loading restricted profile apps. In case the profile is being deleted. Bug: 22235449 Change-Id: Ia67deb4e578edf79079ddc308b0750327c1ff85d --- .../android/settings/users/AppRestrictionsFragment.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/com/android/settings/users/AppRestrictionsFragment.java b/src/com/android/settings/users/AppRestrictionsFragment.java index a166f0d9e12..10e51856539 100644 --- a/src/com/android/settings/users/AppRestrictionsFragment.java +++ b/src/com/android/settings/users/AppRestrictionsFragment.java @@ -30,6 +30,7 @@ import android.content.pm.IPackageManager; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.content.pm.PackageManager.NameNotFoundException; +import android.content.pm.ParceledListSlice; import android.content.pm.ResolveInfo; import android.content.res.Resources; import android.graphics.drawable.Drawable; @@ -556,8 +557,11 @@ public class AppRestrictionsFragment extends SettingsPreferenceFragment implemen // Get the list of apps already installed for the user mUserApps = null; try { - mUserApps = ipm.getInstalledApplications( - PackageManager.GET_UNINSTALLED_PACKAGES, mUser.getIdentifier()).getList(); + ParceledListSlice listSlice = ipm.getInstalledApplications( + PackageManager.GET_UNINSTALLED_PACKAGES, mUser.getIdentifier()); + if (listSlice != null) { + mUserApps = listSlice.getList(); + } } catch (RemoteException re) { }