PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am b8e39041: Merge "Allow space management for device admins" into klp-dev

Browse Source 
* commit 'b8e39041a5e8994376e44f7b5c5b9cd32a09377e':
  Allow space management for device admins
This commit is contained in:
Amith Yamasani
2013-09-13 17:16:09 -07:00
committed by Android Git Automerger
parent c6c6eb1ff8 b8e39041a5
commit 33b18383d7
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/android/settings/applications/InstalledAppDetails.java
View File

@@ -242,10 +242,14 @@ public class InstalledAppDetails extends Fragment
} }
private void initDataButtons() { private void initDataButtons() {
if ((mAppEntry.info.flags&(ApplicationInfo.FLAG_SYSTEM // If the app doesn't have its own space management UI
| ApplicationInfo.FLAG_ALLOW_CLEAR_USER_DATA)) // And it's a system app that doesn't allow clearing user data or is an active admin
== ApplicationInfo.FLAG_SYSTEM // Then disable the Clear Data button.
|| mDpm.packageHasActiveAdmins(mPackageInfo.packageName)) { 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.setText(R.string.clear_user_data_text);
mClearDataButton.setEnabled(false); mClearDataButton.setEnabled(false);
mCanClearData = false; mCanClearData = false;