From 35ca873bd9e1331765343a6cae8387431794b0af Mon Sep 17 00:00:00 2001 From: Sunny Goyal Date: Mon, 6 Apr 2015 10:45:31 -0700 Subject: Adding nullcheck when getting app restrictions Bug: 20085185 Change-Id: I782a79a331a2d58287e34e24ed7730207bf260cb --- src/com/android/launcher3/LauncherProvider.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/com') diff --git a/src/com/android/launcher3/LauncherProvider.java b/src/com/android/launcher3/LauncherProvider.java index a23553a04..1f59533cc 100644 --- a/src/com/android/launcher3/LauncherProvider.java +++ b/src/com/android/launcher3/LauncherProvider.java @@ -341,8 +341,11 @@ public class LauncherProvider extends ContentProvider { Context ctx = getContext(); UserManager um = (UserManager) ctx.getSystemService(Context.USER_SERVICE); Bundle bundle = um.getApplicationRestrictions(ctx.getPackageName()); - String packageName = bundle.getString(RESTRICTION_PACKAGE_NAME); + if (bundle == null) { + return null; + } + String packageName = bundle.getString(RESTRICTION_PACKAGE_NAME); if (packageName != null) { try { Resources targetResources = ctx.getPackageManager() -- cgit v1.2.3