diff options
| author | 2016-03-30 23:41:10 -0600 | |
|---|---|---|
| committer | 2016-03-30 23:41:13 -0600 | |
| commit | 0436b1d5a21a2f42d77992a4429f01601676d3e8 (patch) | |
| tree | 6917299ba7d6aa89cdf188dfc45e72cb2227e068 | |
| parent | 70168dde6e1da06042818350fc6e258188d001ae (diff) | |
Make preferred activities direct-boot aware.
When matching a list of ResolveInfo against the preferred activity
list, we shouldn't mutate the preferred set based on activities that
might be hidden due to the user being locked.
Bug: 25578136
Change-Id: Ifecff4f11c7fddef3eed04325d396f7c43d6703a
| -rw-r--r-- | services/core/java/com/android/server/pm/PackageManagerService.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index 442643a976e2..d7d38d5c20e0 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -4944,8 +4944,10 @@ public class PackageManagerService extends IPackageManager.Stub { if (DEBUG_PREFERRED || debug) Slog.v(TAG, "Skipping mAlways=false entry"); continue; } - final ActivityInfo ai = getActivityInfo(pa.mPref.mComponent, - flags | MATCH_DISABLED_COMPONENTS, userId); + final ActivityInfo ai = getActivityInfo( + pa.mPref.mComponent, flags | MATCH_DISABLED_COMPONENTS + | MATCH_DIRECT_BOOT_AWARE | MATCH_DIRECT_BOOT_UNAWARE, + userId); if (DEBUG_PREFERRED || debug) { Slog.v(TAG, "Found preferred activity:"); if (ai != null) { |