Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix handling of application disabled state.

Browse Source 
Change-Id: I617b76e89eeb75437b384b92f1205bb00b15bb70
This commit is contained in:
Dianne Hackborn
2010-07-24 16:32:42 -07:00
parent 3bee5af816
commit 46730fc783
2 changed files with 29 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
services/java/com/android/server/PackageManagerService.java
View File

@@ -1495,6 +1495,7 @@ class PackageManagerService extends IPackageManager.Stub {
ps.pkg.applicationInfo.publicSourceDir = ps.resourcePathString;
ps.pkg.applicationInfo.sourceDir = ps.codePathString;
ps.pkg.applicationInfo.dataDir = getDataPathForPackage(ps.pkg).getPath();
ps.pkg.mSetEnabled = ps.enabled;
}
return generatePackageInfo(ps.pkg, flags);
}
@@ -6875,6 +6876,7 @@ class PackageManagerService extends IPackageManager.Stub {
return;
}
pkgSetting.enabled = newState;
pkgSetting.pkg.mSetEnabled = newState;
} else {
// We're dealing with a component level state change
switch (newState) {
@@ -8261,6 +8263,7 @@ class PackageManagerService extends IPackageManager.Stub {
private void insertPackageSettingLP(PackageSetting p, PackageParser.Package pkg) {
p.pkg = pkg;
pkg.mSetEnabled = p.enabled;
String codePath = pkg.applicationInfo.sourceDir;
String resourcePath = pkg.applicationInfo.publicSourceDir;
// Update code path if needed
@@ -9486,6 +9489,9 @@ class PackageManagerService extends IPackageManager.Stub {
}
boolean isEnabledLP(ComponentInfo componentInfo, int flags) {
if ((flags&PackageManager.GET_DISABLED_COMPONENTS) != 0) {
return true;
}
final PackageSetting packageSettings = mPackages.get(componentInfo.packageName);
if (Config.LOGV) {
Log.v(TAG, "isEnabledLock - packageName = " + componentInfo.packageName
@@ -9501,14 +9507,20 @@ class PackageManagerService extends IPackageManager.Stub {
Debug.waitForDebugger();
Log.i(TAG, "We will crash!");
}
return false;
}
return ((flags&PackageManager.GET_DISABLED_COMPONENTS) != 0)
|| ((componentInfo.enabled
&& ((packageSettings.enabled == COMPONENT_ENABLED_STATE_ENABLED)
|| (componentInfo.applicationInfo.enabled
&& packageSettings.enabled != COMPONENT_ENABLED_STATE_DISABLED))
&& !packageSettings.disabledComponents.contains(componentInfo.name))
|| packageSettings.enabledComponents.contains(componentInfo.name));
if (packageSettings.enabled == COMPONENT_ENABLED_STATE_DISABLED
|| (packageSettings.pkg != null && !packageSettings.pkg.applicationInfo.enabled
&& packageSettings.enabled == COMPONENT_ENABLED_STATE_DEFAULT)) {
return false;
}
if (packageSettings.enabledComponents.contains(componentInfo.name)) {
return true;
}
if (packageSettings.disabledComponents.contains(componentInfo.name)) {
return false;
}
return componentInfo.enabled;
}
}