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

Commit df62e349 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 8698871 from 1656ca70 to tm-qpr1-release 

Change-Id: I5d7fb1410aa57f0b0c08723dfd9ee3ae82bb9b5b
parents 9b51f50e 1656ca70

core/api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -3400,6 +3400,7 @@ package android.window { 
    method @NonNull public android.window.WindowContainerTransaction scheduleFinishEnterPip(@NonNull android.window.WindowContainerToken, @NonNull android.graphics.Rect);

    method @NonNull public android.window.WindowContainerTransaction setActivityWindowingMode(@NonNull android.window.WindowContainerToken, int);

    method @NonNull public android.window.WindowContainerTransaction setAdjacentRoots(@NonNull android.window.WindowContainerToken, @NonNull android.window.WindowContainerToken);

    method @Deprecated @NonNull public android.window.WindowContainerTransaction setAdjacentRoots(@NonNull android.window.WindowContainerToken, @NonNull android.window.WindowContainerToken, boolean);

    method @NonNull public android.window.WindowContainerTransaction setAdjacentTaskFragments(@NonNull android.os.IBinder, @Nullable android.os.IBinder, @Nullable android.window.WindowContainerTransaction.TaskFragmentAdjacentParams);

    method @NonNull public android.window.WindowContainerTransaction setAppBounds(@NonNull android.window.WindowContainerToken, @NonNull android.graphics.Rect);

    method @NonNull public android.window.WindowContainerTransaction setBounds(@NonNull android.window.WindowContainerToken, @NonNull android.graphics.Rect);

core/java/android/app/Activity.java

+14 −0
Original line number Diff line number Diff line
@@ -6432,6 +6432,20 @@ public class Activity extends ContextThemeWrapper 
        }

    }



    /**

     * Ensures the activity's result is immediately returned to the caller when {@link #finish()}

     * is invoked

     *

     * <p>Should be invoked alongside {@link #setResult(int, Intent)}, so the provided results are

     * in place before finishing. Must only be invoked during MediaProjection setup.

     *

     * @hide

     */

    @RequiresPermission(android.Manifest.permission.MANAGE_MEDIA_PROJECTION)

    public final void setForceSendResultForMediaProjection() {

        ActivityClient.getInstance().setForceSendResultForMediaProjection(mToken);

    }



    /**

     * Call this to set the result that your activity will return to its

     * caller.

core/java/android/app/ActivityClient.java

+10 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package android.app;



import android.annotation.Nullable;

import android.annotation.RequiresPermission;

import android.content.ComponentName;

import android.content.Intent;

import android.content.res.Configuration;
@@ -184,6 +185,15 @@ public class ActivityClient { 
        }

    }



    @RequiresPermission(android.Manifest.permission.MANAGE_MEDIA_PROJECTION)

    void setForceSendResultForMediaProjection(IBinder token) {

        try {

            getActivityClientController().setForceSendResultForMediaProjection(token);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }



    public boolean isTopOfTask(IBinder token) {

        try {

            return getActivityClientController().isTopOfTask(token);

core/java/android/app/ApplicationExitInfo.java

+27 −0
Original line number Diff line number Diff line
@@ -524,6 +524,13 @@ public final class ApplicationExitInfo implements Parcelable { 
     */

    private boolean mLoggedInStatsd;



    /**

     * Whether or not this process hosts one or more foreground services.

     *

     * for system internal use only, will not retain across processes.

     */

    private boolean mHasForegroundServices;



    /** @hide */

    @IntDef(prefix = { "REASON_" }, value = {

        REASON_UNKNOWN,
@@ -996,6 +1003,24 @@ public final class ApplicationExitInfo implements Parcelable { 
        mLoggedInStatsd = loggedInStatsd;

    }



    /**

     * @see #mHasForegroundServices

     *

     * @hide

     */

    public boolean hasForegroundServices() {

        return mHasForegroundServices;

    }



    /**

     * @see #mHasForegroundServices

     *

     * @hide

     */

    public void setHasForegroundServices(boolean hasForegroundServices) {

        mHasForegroundServices = hasForegroundServices;

    }



    @Override

    public int describeContents() {

        return 0;
@@ -1060,6 +1085,8 @@ public final class ApplicationExitInfo implements Parcelable { 
        mTraceFile = other.mTraceFile;

        mAppTraceRetriever = other.mAppTraceRetriever;

        mNativeTombstoneRetriever = other.mNativeTombstoneRetriever;

        mLoggedInStatsd = other.mLoggedInStatsd;

        mHasForegroundServices = other.mHasForegroundServices;

    }



    private ApplicationExitInfo(@NonNull Parcel in) {

core/java/android/app/IActivityClientController.aidl

+6 −0
Original line number Diff line number Diff line
@@ -67,6 +67,12 @@ interface IActivityClientController { 
    boolean finishActivityAffinity(in IBinder token);

    /** Finish all activities that were started for result from the specified activity. */

    void finishSubActivity(in IBinder token, in String resultWho, int requestCode);

    /**

     * Indicates that when the activity finsihes, the result should be immediately sent to the

     * originating activity. Must only be invoked during MediaProjection setup.

     */

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.MANAGE_MEDIA_PROJECTION)")

    void setForceSendResultForMediaProjection(in IBinder token);



    boolean isTopOfTask(in IBinder token);

    boolean willActivityBeVisible(in IBinder token);