From 41ffe5fe53545467eb47989fd8617505d3543da4 Mon Sep 17 00:00:00 2001
From: Mark Renouf <mrenouf@google.com>
Date: Wed, 9 Mar 2022 12:51:02 -0500
Subject: Remove startAsCallerImpl from ChooserActivity

Change-Id: I8dd4e30b18cbddea47357cf7f9aa21792e5c9972
---
 java/src/com/android/intentresolver/ChooserActivity.java | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'java')

diff --git a/java/src/com/android/intentresolver/ChooserActivity.java b/java/src/com/android/intentresolver/ChooserActivity.java
index d221c491..4c96f7a7 100644
--- a/java/src/com/android/intentresolver/ChooserActivity.java
+++ b/java/src/com/android/intentresolver/ChooserActivity.java
@@ -20,24 +20,23 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.os.StrictMode;
 
+import androidx.annotation.Nullable;
+
 /**
  * Activity for selecting which application ought to handle an ACTION_SEND intent.
  */
 public class ChooserActivity extends com.android.internal.app.ChooserActivity {
-    private static final String TAG = "ChooserActivity";
 
     @Override
-    public boolean startAsCallerImpl(Intent intent, Bundle options, boolean ignoreTargetSecurity,
-            int userId) {
-
+    public void startActivityAsCaller(Intent intent, @Nullable Bundle options,
+            boolean ignoreTargetSecurity, int userId) {
         // We're dispatching intents that might be coming from legacy apps, so
         // (as in com.android.internal.app.ResolverActivity) exempt ourselves from death.
         StrictMode.disableDeathOnFileUriExposure();
         try {
-            startActivityAsCaller(intent, options, ignoreTargetSecurity, userId);
+            super.startActivityAsCaller(intent, options, ignoreTargetSecurity, userId);
         } finally {
             StrictMode.enableDeathOnFileUriExposure();
         }
-        return true;
     }
 }
-- 
cgit v1.2.3-59-g8ed1b