From 6a2c77856f1cfa402363cfbb04b5718b431bbc6e Mon Sep 17 00:00:00 2001 From: Jason Monk Date: Tue, 2 Sep 2014 13:13:24 -0400 Subject: [PATCH] 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 | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/com/android/launcher3/DeleteDropTarget.java b/src/com/android/launcher3/DeleteDropTarget.java index fbdd7eb8c7..05e8906cb5 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; + } } }