commit 34917bb39bd9ff8c59a905161e87e59bfcd084ff
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Tue Oct 18 07:24:15 2022 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Tue Oct 18 07:24:15 2022 +0000
tree 0c46450d87fc796f106469948fd62c4ff68e5dd0
parent f00593ec9f22c24b83f8c7b142718ddfaf4eec51
parent f01bc2e704cc765c3847e21354db90424b52bf5f

Merge cherrypicks of [19430798, 19755176] into rvc-platform-release.

Change-Id: Ibdaeaad09254a8dfd8aeecf41518d253db99c9c3

src/com/android/emergency/preferences/EditUserPhotoController.java

diff --git a/src/com/android/emergency/preferences/EditUserPhotoController.java b/src/com/android/emergency/preferences/EditUserPhotoController.java
index cd6641d..8a8cc9e 100644
--- a/src/com/android/emergency/preferences/EditUserPhotoController.java
+++ b/src/com/android/emergency/preferences/EditUserPhotoController.java
@@ -24,6 +24,7 @@
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
 import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
 import android.database.Cursor;
 import android.graphics.Bitmap;
 import android.graphics.Bitmap.Config;
@@ -264,13 +265,13 @@
     }
 
     private boolean startSystemActivityForResult(Intent intent, int code) {
-        ActivityInfo info = intent.resolveActivityInfo(mContext.getPackageManager(),
-                PackageManager.MATCH_SYSTEM_ONLY);
-        if (info == null) {
+        List<ResolveInfo> resolveInfos = mContext.getPackageManager()
+                .queryIntentActivities(intent, PackageManager.MATCH_SYSTEM_ONLY);
+        if (resolveInfos.isEmpty()) {
             Log.w(TAG, "No system package activity could be found for code " + code);
             return false;
         }
-        intent.setPackage(info.packageName);
+        intent.setPackage(resolveInfos.get(0).activityInfo.packageName);
         mFragment.startActivityForResult(intent, code);
         return true;
     }