Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5696b4de authored by Aleks Todorov's avatar Aleks Todorov Committed by Jonathan Scott
Browse files

Expose Activity#startActivityForResultAsUser as a System API. 

Test: atest cts/tests/devicepolicy/src/android/devicepolicy/cts/ActivityTest.java
Bug: 216087958
Change-Id: I683b0b7c7416d0432f81d80392c9f65cf9a13611
parent c50b959b

core/api/system-current.txt

+4 −0
Original line number Diff line number Diff line
@@ -469,6 +469,10 @@ package android.app { 
    method public boolean convertToTranslucent(android.app.Activity.TranslucentConversionListener, android.app.ActivityOptions);

    method @Deprecated public boolean isBackgroundVisibleBehind();

    method @Deprecated public void onBackgroundVisibleBehindChanged(boolean);

    method @RequiresPermission(anyOf={android.Manifest.permission.INTERACT_ACROSS_USERS, android.Manifest.permission.INTERACT_ACROSS_USERS_FULL}) public void startActivityAsUser(@NonNull android.content.Intent, @Nullable android.os.Bundle, @NonNull android.os.UserHandle);

    method @RequiresPermission(anyOf={android.Manifest.permission.INTERACT_ACROSS_USERS, android.Manifest.permission.INTERACT_ACROSS_USERS_FULL}) public void startActivityForResultAsUser(@NonNull android.content.Intent, int, @NonNull android.os.UserHandle);

    method @RequiresPermission(anyOf={android.Manifest.permission.INTERACT_ACROSS_USERS, android.Manifest.permission.INTERACT_ACROSS_USERS_FULL}) public void startActivityForResultAsUser(@NonNull android.content.Intent, int, @Nullable android.os.Bundle, @NonNull android.os.UserHandle);

    method @RequiresPermission(anyOf={android.Manifest.permission.INTERACT_ACROSS_USERS, android.Manifest.permission.INTERACT_ACROSS_USERS_FULL}) public void startActivityForResultAsUser(@NonNull android.content.Intent, @NonNull String, int, @Nullable android.os.Bundle, @NonNull android.os.UserHandle);

  }















  public static interface Activity.TranslucentConversionListener {

























core/java/android/app/Activity.java



+115
−9




























Original line number
Diff line number
Diff line








@@ -17,6 +17,8 @@













package android.app;































import static android.Manifest.permission.CONTROL_REMOTE_APP_TRANSITION_ANIMATIONS;













import static android.Manifest.permission.INTERACT_ACROSS_USERS;













import static android.Manifest.permission.INTERACT_ACROSS_USERS_FULL;















import static android.app.WindowConfiguration.WINDOWING_MODE_PINNED;















import static android.app.WindowConfiguration.inMultiWindowMode;















import static android.os.Process.myUid;










@@ -44,6 +46,7 @@ import android.app.compat.CompatChanges;













import android.compat.annotation.ChangeId;















import android.compat.annotation.EnabledSince;















import android.compat.annotation.UnsupportedAppUsage;













import android.content.ActivityNotFoundException;















import android.content.ComponentCallbacks2;















import android.content.ComponentName;















import android.content.ContentResolver;










@@ -5435,26 +5438,115 @@ public class Activity extends ContextThemeWrapper













    }































    /**













     * Launch an activity for which you would like a result when it finished.













     * When this activity exits, your













     * onActivityResult() method will be called with the given requestCode.













     * Using a negative requestCode is the same as calling













     * {@link #startActivity} (the activity is not launched as a sub-activity).













     *













     * <p>Note that this method should only be used with Intent protocols













     * that are defined to return a result.  In other protocols (such as













     * {@link Intent#ACTION_MAIN} or {@link Intent#ACTION_VIEW}), you may













     * not get the result when you expect.  For example, if the activity you













     * are launching uses {@link Intent#FLAG_ACTIVITY_NEW_TASK}, it will not













     * run in your task and thus you will immediately receive a cancel result.













     *













     * <p>As a special case, if you call startActivityForResult() with a requestCode













     * >= 0 during the initial onCreate(Bundle savedInstanceState)/onResume() of your













     * activity, then your window will not be displayed until a result is













     * returned back from the started activity.  This is to avoid visible













     * flickering when redirecting to another activity.













     *













     * <p>This method throws {@link android.content.ActivityNotFoundException}













     * if there was no Activity found to run the given Intent.













     *













     * @param intent      The intent to start.













     * @param requestCode If >= 0, this code will be returned in













     *                    onActivityResult() when the activity exits.













     * @param user        The user to start the intent as.















     * @hide Implement to provide correct calling token.















     */













    @UnsupportedAppUsage













    public void startActivityForResultAsUser(Intent intent, int requestCode, UserHandle user) {













    @SystemApi













    @RequiresPermission(anyOf = {INTERACT_ACROSS_USERS, INTERACT_ACROSS_USERS_FULL})













    public void startActivityForResultAsUser(@NonNull Intent intent, int requestCode,













            @NonNull UserHandle user) {















        startActivityForResultAsUser(intent, requestCode, null, user);















    }































    /**













     * Launch an activity for which you would like a result when it finished.













     * When this activity exits, your













     * onActivityResult() method will be called with the given requestCode.













     * Using a negative requestCode is the same as calling













     * {@link #startActivity} (the activity is not launched as a sub-activity).













     *













     * <p>Note that this method should only be used with Intent protocols













     * that are defined to return a result.  In other protocols (such as













     * {@link Intent#ACTION_MAIN} or {@link Intent#ACTION_VIEW}), you may













     * not get the result when you expect.  For example, if the activity you













     * are launching uses {@link Intent#FLAG_ACTIVITY_NEW_TASK}, it will not













     * run in your task and thus you will immediately receive a cancel result.













     *













     * <p>As a special case, if you call startActivityForResult() with a requestCode













     * >= 0 during the initial onCreate(Bundle savedInstanceState)/onResume() of your













     * activity, then your window will not be displayed until a result is













     * returned back from the started activity.  This is to avoid visible













     * flickering when redirecting to another activity.













     *













     * <p>This method throws {@link android.content.ActivityNotFoundException}













     * if there was no Activity found to run the given Intent.













     *













     * @param intent      The intent to start.













     * @param requestCode If >= 0, this code will be returned in













     *                    onActivityResult() when the activity exits.













     * @param options     Additional options for how the Activity should be started. See {@link













     *                    android.content.Context#startActivity(Intent, Bundle)} for more details.













     * @param user        The user to start the intent as.















     * @hide Implement to provide correct calling token.















     */













    public void startActivityForResultAsUser(Intent intent, int requestCode,













            @Nullable Bundle options, UserHandle user) {













    @SystemApi













    @RequiresPermission(anyOf = {INTERACT_ACROSS_USERS, INTERACT_ACROSS_USERS_FULL})













    public void startActivityForResultAsUser(@NonNull Intent intent, int requestCode,













            @Nullable Bundle options, @NonNull UserHandle user) {















        startActivityForResultAsUser(intent, mEmbeddedID, requestCode, options, user);















    }































    /**













     * Launch an activity for which you would like a result when it finished.













     * When this activity exits, your













     * onActivityResult() method will be called with the given requestCode.













     * Using a negative requestCode is the same as calling













     * {@link #startActivity} (the activity is not launched as a sub-activity).













     *













     * <p>Note that this method should only be used with Intent protocols













     * that are defined to return a result.  In other protocols (such as













     * {@link Intent#ACTION_MAIN} or {@link Intent#ACTION_VIEW}), you may













     * not get the result when you expect.  For example, if the activity you













     * are launching uses {@link Intent#FLAG_ACTIVITY_NEW_TASK}, it will not













     * run in your task and thus you will immediately receive a cancel result.













     *













     * <p>As a special case, if you call startActivityForResult() with a requestCode













     * >= 0 during the initial onCreate(Bundle savedInstanceState)/onResume() of your













     * activity, then your window will not be displayed until a result is













     * returned back from the started activity.  This is to avoid visible













     * flickering when redirecting to another activity.













     *













     * <p>This method throws {@link android.content.ActivityNotFoundException}













     * if there was no Activity found to run the given Intent.













     *













     * @param intent      The intent to start.













     * @param requestCode If >= 0, this code will be returned in













     *                    onActivityResult() when the activity exits.













     * @param options     Additional options for how the Activity should be started. See {@link













     *                    android.content.Context#startActivity(Intent, Bundle)} for more details.













     * @param user        The user to start the intent as.















     * @hide Implement to provide correct calling token.















     */













    public void startActivityForResultAsUser(Intent intent, String resultWho, int requestCode,













            @Nullable Bundle options, UserHandle user) {













    @SystemApi













    @RequiresPermission(anyOf = {INTERACT_ACROSS_USERS, INTERACT_ACROSS_USERS_FULL})













    public void startActivityForResultAsUser(@NonNull Intent intent, @NonNull String resultWho,













            int requestCode,













            @Nullable Bundle options, @NonNull UserHandle user) {















        if (mParent != null) {















            throw new RuntimeException("Can't be called from a child");















        }










@@ -5489,9 +5581,23 @@ public class Activity extends ContextThemeWrapper













    }































    /**













     * @hide Implement to provide correct calling token.













     * Version of {@link #startActivity(Intent, Bundle)} that allows you to specify the













     * user the activity will be started for.  This is not available to applications













     * that are not pre-installed on the system image.













     * @param intent The description of the activity to start.













     *













     * @param user The UserHandle of the user to start this activity for.













     * @param options Additional options for how the Activity should be started.













     *          May be null if there are no options.  See {@link android.app.ActivityOptions}













     *          for how to build the Bundle supplied here; there are no supported definitions













     *          for building it manually.













     * @throws ActivityNotFoundException &nbsp;













     * @hide















     */













    public void startActivityAsUser(Intent intent, Bundle options, UserHandle user) {













    @SystemApi













    @RequiresPermission(anyOf = {INTERACT_ACROSS_USERS, INTERACT_ACROSS_USERS_FULL})













    public void startActivityAsUser(@NonNull Intent intent,













            @Nullable Bundle options, @NonNull UserHandle user) {















        if (mParent != null) {















            throw new RuntimeException("Can't be called from a child");















        }