From d0978dbb675f633c5024807fe3a873d6b9fe0e4d Mon Sep 17 00:00:00 2001
From: Mark Renouf <mrenouf@google.com>
Date: Wed, 6 Apr 2022 14:10:21 -0400
Subject: [PATCH] Fix potential StrictMode crash with miniresolver

configureMiniResolverContent incorrectly calls directly
into safelyStartActivityInternal, which bypasses calls to
StrictMode#disableDeathOnFileUriExposure.

Change-Id: I1c66f659b7d5276caf892b15b942bee5c6f7ead7
---
 core/java/com/android/internal/app/ResolverActivity.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/java/com/android/internal/app/ResolverActivity.java b/core/java/com/android/internal/app/ResolverActivity.java
index bfd8ff923dc18..17c2dc09140e9 100644
--- a/core/java/com/android/internal/app/ResolverActivity.java
+++ b/core/java/com/android/internal/app/ResolverActivity.java
@@ -1480,7 +1480,7 @@ public class ResolverActivity extends Activity implements
             if (intent != null) {
                 prepareIntentForCrossProfileLaunch(intent);
             }
-            safelyStartActivityInternal(otherProfileResolveInfo,
+            safelyStartActivityAsUser(otherProfileResolveInfo,
                     mMultiProfilePagerAdapter.getInactiveListAdapter().mResolverListController
                             .getUserHandle());
         });