Adding nullcheck when getting app restrictions

Bug: 20085185 Change-Id: I782a79a331a2d58287e34e24ed7730207bf260cb
2015-04-06 10:45:31 -07:00
parent adb7541648
commit 35ca873bd9
1 changed files with 4 additions and 1 deletions
@@ -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()