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

Commit d0200cf8 authored by Michael Groover's avatar Michael Groover Committed by Android (Google) Code Review
Browse files

Merge "Expose ActivityOptions#isShareIdentityEnabled API"

parents ebf76779 a1fba70f

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -4612,6 +4612,7 @@ package android.app { 
    method public boolean getLockTaskMode();

    method public int getSplashScreenStyle();

    method public boolean isPendingIntentBackgroundActivityLaunchAllowed();

    method public boolean isShareIdentityEnabled();

    method public static android.app.ActivityOptions makeBasic();

    method public static android.app.ActivityOptions makeClipRevealAnimation(android.view.View, int, int, int, int);

    method public static android.app.ActivityOptions makeCustomAnimation(android.content.Context, int, int);

core/java/android/app/ActivityOptions.java

+3 −3
Original line number Diff line number Diff line
@@ -1499,13 +1499,13 @@ public class ActivityOptions extends ComponentOptions { 
     * Returns whether the launching app has opted-in to sharing its identity with the launched

     * activity.

     *

     * @return {@code true} if the launching app has opted-in to sharing its identity

     *

     * @see #setShareIdentityEnabled(boolean)

     * @see Activity#getLaunchedFromUid()

     * @see Activity#getLaunchedFromPackage()

     *

     * @hide

     */

    public boolean getShareIdentity() {

    public boolean isShareIdentityEnabled() {

        return mShareIdentity;

    }

services/core/java/com/android/server/wm/ActivityRecord.java

+1 −1
Original line number Diff line number Diff line
@@ -2003,7 +2003,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 


            mOverrideTaskTransition = options.getOverrideTaskTransition();

            mDismissKeyguard = options.getDismissKeyguard();

            mShareIdentity = options.getShareIdentity();

            mShareIdentity = options.isShareIdentityEnabled();

        }



        ColorDisplayService.ColorDisplayServiceInternal cds = LocalServices.getService(