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

Commit f64564c2 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Merge "[Bugfix]avoid NPE when getPreferredActivitiesInternal" am:... 

Merge "Merge "[Bugfix]avoid NPE when getPreferredActivitiesInternal" am: 73218d88 am: 8130300d am: 27295552" into udc-dev-plus-aosp am: 1115ec6d

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



Change-Id: I8f7f57a6526753e36501ced3a70df599ce708d9c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 636f9f64 1115ec6d

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

+1 −0
Original line number Diff line number Diff line
@@ -661,6 +661,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)) {