Remove 'startAsCallerImpl' refactoring relic

Change-Id: Ica2a2dc2bf1bc758349f02d685738c2c844b566f

core/java/com/android/internal/app/ResolverActivity.java

@@ -1458,15 +1458,6 @@ public class ResolverActivity extends Activity implements
                 .write();
     }
 
-
-    public boolean startAsCallerImpl(Intent intent, Bundle options, boolean ignoreTargetSecurity,
-            int userId) {
-        // Note: this method will be overridden in the delegate implementation to use the passed-in
-        // permission token.
-        startActivityAsCaller(intent, options, false, userId);
-        return true;
-    }
-
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
         switch (requestCode) {

core/java/com/android/internal/app/chooser/DisplayResolveInfo.java

@@ -173,9 +173,8 @@ public class DisplayResolveInfo implements TargetInfo, Parcelable {
 
     @Override
     public boolean startAsCaller(ResolverActivity activity, Bundle options, int userId) {
-        // TODO: if the start-as-caller API no longer requires a permission token, this can go back
-        // to inlining the real activity-start call, and we can remove startAsCallerImpl.
-        return activity.startAsCallerImpl(mResolvedIntent, options, false, userId);
+        activity.startActivityAsCaller(mResolvedIntent, options, false, userId);
+        return true;
     }
 
     @Override

core/java/com/android/internal/app/chooser/SelectableTargetInfo.java

@@ -241,7 +241,8 @@ public final class SelectableTargetInfo implements ChooserTargetInfo {
         final boolean ignoreTargetSecurity = mSourceInfo != null
                 && mSourceInfo.getResolvedComponentName().getPackageName()
                 .equals(mChooserTarget.getComponentName().getPackageName());
-        return activity.startAsCallerImpl(intent, options, ignoreTargetSecurity, userId);
+        activity.startActivityAsCaller(intent, options, ignoreTargetSecurity, userId);
+        return true;
     }
 
     @Override