diff options
author | Jason Monk <jmonk@google.com> | 2014-09-02 13:13:24 -0400 |
---|---|---|
committer | Jason Monk <jmonk@google.com> | 2014-09-02 13:13:24 -0400 |
commit | 6a2c77856f1cfa402363cfbb04b5718b431bbc6e (patch) | |
tree | 2daadde97f1d30833a00771f4924916cb8ec9218 | |
parent | 25ad9e4ee53110405cabf2fdb34d4412372532d1 (diff) | |
download | android_packages_apps_Trebuchet-6a2c77856f1cfa402363cfbb04b5718b431bbc6e.tar.gz android_packages_apps_Trebuchet-6a2c77856f1cfa402363cfbb04b5718b431bbc6e.tar.bz2 android_packages_apps_Trebuchet-6a2c77856f1cfa402363cfbb04b5718b431bbc6e.zip |
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
-rw-r--r-- | src/com/android/launcher3/DeleteDropTarget.java | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/com/android/launcher3/DeleteDropTarget.java b/src/com/android/launcher3/DeleteDropTarget.java index fbdd7eb8c..05e8906cb 100644 --- a/src/com/android/launcher3/DeleteDropTarget.java +++ b/src/com/android/launcher3/DeleteDropTarget.java @@ -30,6 +30,8 @@ import android.graphics.PointF; 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 @@ public class DeleteDropTarget extends ButtonDropTarget { 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; + } } } |