Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0436b1d5 authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

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
parent 70168dde

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

+4 −2
Original line number Diff line number Diff line
@@ -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) {