commit 9523d5f1034c094354bfdddafb736a1b62e070e7
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Oct 07 02:18:50 2022 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Oct 07 02:18:50 2022 +0000
tree 199e7920ac5b47bf10e27a730cdce209dff8cb18
parent b0bbc8ea6f860ff6773860449d03e66a020a1b0f
parent 64bac61e49f9c64f19a51e8416d271441a557a60

Merge cherrypicks of [19449016, 19745058] into security-aosp-qt-release.

Change-Id: I7d50b0507731aa52f3593fe3fba362a630ef63c6

src/com/android/settings/users/EditUserPhotoController.java

diff --git a/src/com/android/settings/users/EditUserPhotoController.java b/src/com/android/settings/users/EditUserPhotoController.java
index 71f4e78..f1831f7 100644
--- a/src/com/android/settings/users/EditUserPhotoController.java
+++ b/src/com/android/settings/users/EditUserPhotoController.java
@@ -23,6 +23,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;
@@ -280,13 +281,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;
     }