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

Re-enable user disabling of apps.

Browse Source 
Change-Id: I5f3a474926cf2b93e311435f67f36837f5f56caa
This commit is contained in:
Dianne Hackborn
2011-06-17 14:50:11 -07:00
parent 9599f0a520
commit a12c1e3226
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/applications/ApplicationsState.java
View File

@@ -392,6 +392,14 @@ public class ApplicationsState {
for (int i=0; i<mApplications.size(); i++) { for (int i=0; i<mApplications.size(); i++) {
final ApplicationInfo info = mApplications.get(i); final ApplicationInfo info = mApplications.get(i);
// Need to trim out any applications that are disabled by
// something different than the user.
if (!info.enabled && info.enabledSetting
!= PackageManager.COMPONENT_ENABLED_STATE_DISABLED_USER) {
mApplications.remove(i);
i--;
continue;
}
final AppEntry entry = mEntriesMap.get(info.packageName); final AppEntry entry = mEntriesMap.get(info.packageName);
if (entry != null) { if (entry != null) {
entry.info = info; entry.info = info;

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

@@ -79,7 +79,7 @@ public class InstalledAppDetails extends Fragment
implements View.OnClickListener, CompoundButton.OnCheckedChangeListener, implements View.OnClickListener, CompoundButton.OnCheckedChangeListener,
ApplicationsState.Callbacks { ApplicationsState.Callbacks {
private static final String TAG="InstalledAppDetails"; private static final String TAG="InstalledAppDetails";
static final boolean SUPPORT_DISABLE_APPS = false; static final boolean SUPPORT_DISABLE_APPS = true;
private static final boolean localLOGV = false; private static final boolean localLOGV = false;
public static final String ARG_PACKAGE_NAME = "package"; public static final String ARG_PACKAGE_NAME = "package";
@@ -829,7 +829,7 @@ public class InstalledAppDetails extends Fragment
} else { } else {
if ((mAppEntry.info.flags & ApplicationInfo.FLAG_SYSTEM) != 0) { if ((mAppEntry.info.flags & ApplicationInfo.FLAG_SYSTEM) != 0) {
new DisableChanger(this, mAppEntry.info, mAppEntry.info.enabled ? new DisableChanger(this, mAppEntry.info, mAppEntry.info.enabled ?
PackageManager.COMPONENT_ENABLED_STATE_DISABLED PackageManager.COMPONENT_ENABLED_STATE_DISABLED_USER
: PackageManager.COMPONENT_ENABLED_STATE_DEFAULT).execute((Object)null); : PackageManager.COMPONENT_ENABLED_STATE_DEFAULT).execute((Object)null);
} else { } else {
uninstallPkg(packageName); uninstallPkg(packageName);