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

Commit 27295552 authored by Song Chun Fan's avatar Song Chun Fan Committed by Automerger Merge Worker
Browse files

Merge "[Bugfix]avoid NPE when getPreferredActivitiesInternal" am: 73218d88 am: 8130300d 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2635751



Change-Id: I2fcaf11632efa1a5d31a9adbde349040416319dd
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 52644bc4 8130300d

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

+1 −0
Original line number Diff line number Diff line
@@ -649,6 +649,7 @@ final class PreferredActivityHelper { 
            final Iterator<PreferredActivity> it = pir.filterIterator();

            while (it.hasNext()) {

                final PreferredActivity pa = it.next();

                if (pa == null) continue;

                final String prefPackageName = pa.mPref.mComponent.getPackageName();

                if (packageName == null

                        || (prefPackageName.equals(packageName) && pa.mPref.mAlways)) {