diff options
| -rwxr-xr-x | services/core/java/com/android/server/am/ActivityManagerService.java | 10 | ||||
| -rw-r--r-- | services/core/java/com/android/server/pm/LauncherAppsService.java | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index e482273cae7e..93f4d34dd682 100755 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -2031,7 +2031,7 @@ public final class ActivityManagerService extends ActivityManagerNative @Override public void onPackageModified(String packageName) { final int eventUserId = getChangingUserId(); - final PackageManager pm = mContext.getPackageManager(); + final IPackageManager pm = AppGlobals.getPackageManager(); final ArrayList<Pair<Intent, Integer>> recentTaskIntents = new ArrayList<Pair<Intent, Integer>>(); final HashSet<ComponentName> componentsKnownToExist = new HashSet<ComponentName>(); @@ -2056,13 +2056,15 @@ public final class ActivityManagerService extends ActivityManagerNative continue; } try { - ActivityInfo info = pm.getActivityInfo(cn, eventUserId); - if (info != null && info.isEnabled()) { + ActivityInfo info = pm.getActivityInfo(cn, 0, eventUserId); + if (info != null) { componentsKnownToExist.add(cn); } else { 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 diff --git a/services/core/java/com/android/server/pm/LauncherAppsService.java b/services/core/java/com/android/server/pm/LauncherAppsService.java index dcc4f8d18c36..d787919b01ab 100644 --- a/services/core/java/com/android/server/pm/LauncherAppsService.java +++ b/services/core/java/com/android/server/pm/LauncherAppsService.java @@ -254,7 +254,7 @@ public class LauncherAppsService extends SystemService { try { IPackageManager pm = AppGlobals.getPackageManager(); ActivityInfo info = pm.getActivityInfo(component, 0, user.getIdentifier()); - return info != null && info.isEnabled(); + return info != null; } finally { Binder.restoreCallingIdentity(ident); } |