diff options
3 files changed, 4 insertions, 13 deletions
diff --git a/core/java/com/android/internal/app/ResolverActivity.java b/core/java/com/android/internal/app/ResolverActivity.java index 4296784327b7..f076d09d18f7 100644 --- a/core/java/com/android/internal/app/ResolverActivity.java +++ b/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) { diff --git a/core/java/com/android/internal/app/chooser/DisplayResolveInfo.java b/core/java/com/android/internal/app/chooser/DisplayResolveInfo.java index dc53e77466ad..5ebc9154023c 100644 --- a/core/java/com/android/internal/app/chooser/DisplayResolveInfo.java +++ b/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 diff --git a/core/java/com/android/internal/app/chooser/SelectableTargetInfo.java b/core/java/com/android/internal/app/chooser/SelectableTargetInfo.java index 8a19f2d2aa4e..015336388b5d 100644 --- a/core/java/com/android/internal/app/chooser/SelectableTargetInfo.java +++ b/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 |