From c6fe9cc319a78b6174fe59e8732b07bb46e454bc Mon Sep 17 00:00:00 2001 From: Amith Yamasani Date: Fri, 13 Sep 2013 10:05:47 -0700 Subject: [PATCH] Allow space management for device admins If an active device admin has a space management UI, enable the button to manage space. Bug: 10527304 Change-Id: I1d03eec6d766b49b1c3d9bb30151db4cad7e84e8 --- .../settings/applications/InstalledAppDetails.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/com/android/settings/applications/InstalledAppDetails.java b/src/com/android/settings/applications/InstalledAppDetails.java index 3e9ba54d059..37c33db6796 100644 --- a/src/com/android/settings/applications/InstalledAppDetails.java +++ b/src/com/android/settings/applications/InstalledAppDetails.java @@ -242,10 +242,14 @@ public class InstalledAppDetails extends Fragment } private void initDataButtons() { - if ((mAppEntry.info.flags&(ApplicationInfo.FLAG_SYSTEM - | ApplicationInfo.FLAG_ALLOW_CLEAR_USER_DATA)) - == ApplicationInfo.FLAG_SYSTEM - || mDpm.packageHasActiveAdmins(mPackageInfo.packageName)) { + // If the app doesn't have its own space management UI + // And it's a system app that doesn't allow clearing user data or is an active admin + // Then disable the Clear Data button. + if (mAppEntry.info.manageSpaceActivityName == null + && ((mAppEntry.info.flags&(ApplicationInfo.FLAG_SYSTEM + | ApplicationInfo.FLAG_ALLOW_CLEAR_USER_DATA)) + == ApplicationInfo.FLAG_SYSTEM + || mDpm.packageHasActiveAdmins(mPackageInfo.packageName))) { mClearDataButton.setText(R.string.clear_user_data_text); mClearDataButton.setEnabled(false); mCanClearData = false;