commit 35ca873bd9e1331765343a6cae8387431794b0af
author Sunny Goyal <sunnygoyal@google.com> Mon Apr 06 10:45:31 2015 -0700
committer Sunny Goyal <sunnygoyal@google.com> Mon Apr 06 10:46:01 2015 -0700
tree cd8a20f501c769a3951e1b303a2b536765e3a16e
parent adb75416488f04c237b724f30deeb7f6e3fe8a52

Adding nullcheck when getting app restrictions

Bug: 20085185
Change-Id: I782a79a331a2d58287e34e24ed7730207bf260cb

src/com/android/launcher3/LauncherProvider.java

diff --git a/src/com/android/launcher3/LauncherProvider.java b/src/com/android/launcher3/LauncherProvider.java
index a23553a..1f59533 100644
--- a/src/com/android/launcher3/LauncherProvider.java
+++ b/src/com/android/launcher3/LauncherProvider.java
@@ -341,8 +341,11 @@
         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()