From d093c9f059a9fa9f68504da176a4913a9793d80e Mon Sep 17 00:00:00 2001
From: Julia Reynolds <juliacr@google.com>
Date: Fri, 8 Aug 2014 12:22:42 -0400
Subject: [PATCH] Disable disable button according to user restrictions.

Bug: 16891777
Change-Id: I5223af905dc43d259c5fd3e03eedf8c71bf23ae9
---
 .../settings/applications/InstalledAppDetails.java       | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/com/android/settings/applications/InstalledAppDetails.java b/src/com/android/settings/applications/InstalledAppDetails.java
index 463520d03c1..28bc7eb0025 100755
--- a/src/com/android/settings/applications/InstalledAppDetails.java
+++ b/src/com/android/settings/applications/InstalledAppDetails.java
@@ -350,12 +350,15 @@ public class InstalledAppDetails extends Fragment
         boolean enabled = true;
         if (mUpdatedSysApp) {
             mUninstallButton.setText(R.string.app_factory_reset);
-            boolean specialDisable = false;
+            boolean showSpecialDisable = false;
             if ((mAppEntry.info.flags & ApplicationInfo.FLAG_SYSTEM) != 0) {
-                specialDisable = handleDisableable(mSpecialDisableButton);
+                showSpecialDisable = handleDisableable(mSpecialDisableButton);
                 mSpecialDisableButton.setOnClickListener(this);
             }
-            mMoreControlButtons.setVisibility(specialDisable ? View.VISIBLE : View.GONE);
+            if (mAppControlRestricted) {
+                showSpecialDisable = false;
+            }
+            mMoreControlButtons.setVisibility(showSpecialDisable ? View.VISIBLE : View.GONE);
         } else {
             mMoreControlButtons.setVisibility(View.GONE);
             if ((mAppEntry.info.flags & ApplicationInfo.FLAG_SYSTEM) != 0) {