PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add null check when loading restricted profile apps."

Browse Source
This commit is contained in:
Julia Reynolds
2015-08-17 17:15:34 +00:00
committed by Android (Google) Code Review
parent 38d1b86e09 d7faba5c25
commit 646bee6157
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/users/AppRestrictionsFragment.java
View File

@@ -30,6 +30,7 @@ import android.content.pm.IPackageManager;
import android.content.pm.PackageInfo; import android.content.pm.PackageInfo;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.content.pm.PackageManager.NameNotFoundException; import android.content.pm.PackageManager.NameNotFoundException;
import android.content.pm.ParceledListSlice;
import android.content.pm.ResolveInfo; import android.content.pm.ResolveInfo;
import android.content.res.Resources; import android.content.res.Resources;
import android.graphics.drawable.Drawable; 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 // Get the list of apps already installed for the user
mUserApps = null; mUserApps = null;
try { try {
mUserApps = ipm.getInstalledApplications( ParceledListSlice listSlice = ipm.getInstalledApplications(
PackageManager.GET_UNINSTALLED_PACKAGES, mUser.getIdentifier()).getList(); PackageManager.GET_UNINSTALLED_PACKAGES, mUser.getIdentifier());
if (listSlice != null) {
mUserApps = listSlice.getList();
}
} catch (RemoteException re) { } catch (RemoteException re) {
} }