commit bbb6a57146827ee4b45a10c20dbf1f516bde509d
author Sunny Goyal <sunnygoyal@google.com> Mon Apr 06 18:38:47 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Apr 06 18:38:47 2015 +0000
tree 6de9542a0862218938ae6d2e6c4ff55f0d03228a
parent b72f80b4e2c0fd2c4344f4af98fe16781549285c
parent 35ca873bd9e1331765343a6cae8387431794b0af

am 35ca873b: Adding nullcheck when getting app restrictions

* commit '35ca873bd9e1331765343a6cae8387431794b0af':
  Adding nullcheck when getting app restrictions

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()