Merge "Fixing invalid check to get component enabled state. (Bug 17679693)" into lmp-dev (7f76e505) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/am/ActivityManagerService.java

+6 −4

Original line number	Original line	Diff line number	Diff line
	@@ -2031,7 +2031,7 @@ public final class ActivityManagerService extends ActivityManagerNative
	@Override		@Override
	public void onPackageModified(String packageName) {		public void onPackageModified(String packageName) {
	final int eventUserId = getChangingUserId();		final int eventUserId = getChangingUserId();
	final PackageManager pm = mContext.getPackageManager();		final IPackageManager pm = AppGlobals.getPackageManager();
	final ArrayList<Pair<Intent, Integer>> recentTaskIntents =		final ArrayList<Pair<Intent, Integer>> recentTaskIntents =
	new ArrayList<Pair<Intent, Integer>>();		new ArrayList<Pair<Intent, Integer>>();
	final HashSet<ComponentName> componentsKnownToExist = new HashSet<ComponentName>();		final HashSet<ComponentName> componentsKnownToExist = new HashSet<ComponentName>();
	@@ -2056,13 +2056,15 @@ public final class ActivityManagerService extends ActivityManagerNative
	continue;		continue;
	}		}
	try {		try {
	ActivityInfo info = pm.getActivityInfo(cn, eventUserId);		ActivityInfo info = pm.getActivityInfo(cn, 0, eventUserId);
	if (info != null && info.isEnabled()) {		if (info != null) {
	componentsKnownToExist.add(cn);		componentsKnownToExist.add(cn);
	} else {		} else {
	tasksToRemove.add(p.second);		tasksToRemove.add(p.second);
	}		}
	} catch (Exception e) {}		} catch (RemoteException e) {
			Log.e(TAG, "Failed to query activity info for component: " + cn, e);
			}
	}		}
	}		}
	// Prune all the tasks with removed components from the list of recent tasks		// Prune all the tasks with removed components from the list of recent tasks

services/core/java/com/android/server/pm/LauncherAppsService.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -254,7 +254,7 @@ public class LauncherAppsService extends SystemService {
	try {		try {
	IPackageManager pm = AppGlobals.getPackageManager();		IPackageManager pm = AppGlobals.getPackageManager();
	ActivityInfo info = pm.getActivityInfo(component, 0, user.getIdentifier());		ActivityInfo info = pm.getActivityInfo(component, 0, user.getIdentifier());
	return info != null && info.isEnabled();		return info != null;
	} finally {		} finally {
	Binder.restoreCallingIdentity(ident);		Binder.restoreCallingIdentity(ident);
	}		}