Commit 66716216 authored Jun 28, 2023 by Automerger Merge Worker

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 am: f64564c2 am: 72f1f540

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

Change-Id: I6e7857df7ef6698d3caaae379719f62f3b45433a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -655,6 +655,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)) {