commit 6a2c77856f1cfa402363cfbb04b5718b431bbc6e
author Jason Monk <jmonk@google.com> Tue Sep 02 13:13:24 2014 -0400
committer Jason Monk <jmonk@google.com> Tue Sep 02 13:13:24 2014 -0400
tree 2daadde97f1d30833a00771f4924916cb8ec9218
parent 25ad9e4ee53110405cabf2fdb34d4412372532d1

Add sdk version guard to UserManager use

Also switch call to getUserRestrictions to support back to JBMR2
with one call.

Bug: 17300500
Change-Id: I1205730e517c6670f6359a0d448458cae6e8a8d4

src/com/android/launcher3/DeleteDropTarget.java

diff --git a/src/com/android/launcher3/DeleteDropTarget.java b/src/com/android/launcher3/DeleteDropTarget.java
index fbdd7eb..05e8906 100644
--- a/src/com/android/launcher3/DeleteDropTarget.java
+++ b/src/com/android/launcher3/DeleteDropTarget.java
@@ -30,6 +30,8 @@
 import android.graphics.Rect;
 import android.graphics.drawable.TransitionDrawable;
 import android.os.AsyncTask;
+import android.os.Build;
+import android.os.Bundle;
 import android.os.UserManager;
 import android.util.AttributeSet;
 import android.view.View;
@@ -193,11 +195,14 @@
             isVisible = false;
         }
         if (useUninstallLabel) {
-            UserManager userManager = (UserManager)
-                getContext().getSystemService(Context.USER_SERVICE);
-            if (userManager.hasUserRestriction(UserManager.DISALLOW_APPS_CONTROL)
-                    || userManager.hasUserRestriction(UserManager.DISALLOW_UNINSTALL_APPS)) {
-                isVisible = false;
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) {
+                UserManager userManager = (UserManager)
+                        getContext().getSystemService(Context.USER_SERVICE);
+                Bundle restrictions = userManager.getUserRestrictions();
+                if (restrictions.getBoolean(UserManager.DISALLOW_APPS_CONTROL, false)
+                        || restrictions.getBoolean(UserManager.DISALLOW_UNINSTALL_APPS, false)) {
+                    isVisible = false;
+                }
             }
         }