Merge "Merge "[Bugfix]avoid NPE when getPreferredActivitiesInternal" am: 73218d881a am: 8130300dd5 am: 2729555205" into udc-dev-plus-aosp
This commit is contained in:
committed by
Android (Google) Code Review
commit
1115ec6d6d
@@ -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)) {
|
||||
|
||||
Reference in New Issue
Block a user