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

Commit ccc8c29a authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android (Google) Code Review
Browse files

Merge "Fix issue #17114392: android.com.phone crashes - PackageManager code" into lmp-dev

parents 0c3b4ad7 4a88bf99

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

+12 −10
Original line number Diff line number Diff line
@@ -11575,6 +11575,7 @@ public class PackageManagerService extends IPackageManager.Stub { 
                    }

                }













                if (existing != null) {















                    if (DEBUG_PREFERRED) {















                        Slog.i(TAG, existing.size() + " existing preferred matches for:");















                        filter.dump(new LogPrinter(Log.INFO, TAG), "  ");









@@ -11589,6 +11590,7 @@ public class PackageManagerService extends IPackageManager.Stub {













                        pir.removeFilter(pa);















                    }















                }













            }















            addPreferredActivityInternal(filter, match, set, activity, true, userId,















                    "Replacing preferred");















        }