Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Forcefully convert to basic Intent before calling PM API." into tm-dev am: 4220511d7e am: 66dd9d37e4 am: cd9b9a84b5

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18232666

Change-Id: I782e1d3fd2949c64f2be0f077a368dbcde9c6e36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Alex Buynytskyy
2022-05-10 06:04:59 +00:00
committed by Automerger Merge Worker
parent ad1733bdef cd9b9a84b5
commit 2851ae7f58
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/com/android/internal/app/ChooserListAdapter.java
View File

@@ -144,7 +144,9 @@ public class ChooserListAdapter extends ResolverListAdapter {
}
}
if (ai == null) {
ri = packageManager.resolveActivity(ii, PackageManager.MATCH_DEFAULT_ONLY);
// Because of AIDL bug, resolveActivity can't accept subclasses of Intent.
final Intent rii = (ii.getClass() == Intent.class) ? ii : new Intent(ii);
ri = packageManager.resolveActivity(rii, PackageManager.MATCH_DEFAULT_ONLY);
ai = ri != null ? ri.activityInfo : null;
}
if (ai == null) {