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

Commit 418c3175 authored by Shreerag Jayakrishnan's avatar Shreerag Jayakrishnan Committed by Android (Google) Code Review
Browse files

Merge "Add right annotation to IActivityTaskManager#onSplashScreenViewCopyFinished" into main

parents e413b044 d84c8796

core/java/android/app/IActivityTaskManager.aidl

+1 −1
Original line number Original line Diff line number Diff line
@@ -328,7 +328,7 @@ interface IActivityTaskManager { 
     * A splash screen view has copied.

     * A splash screen view has copied.

     */

     */

    void onSplashScreenViewCopyFinished(int taskId,

    void onSplashScreenViewCopyFinished(int taskId,

            in SplashScreenView.SplashScreenViewParcelable material);

            in @nullable SplashScreenView.SplashScreenViewParcelable material);





    /**

    /**

     * When the Picture-in-picture state has changed.

     * When the Picture-in-picture state has changed.

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -2731,7 +2731,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
     * Receive the splash screen data from shell, sending to client.

     * Receive the splash screen data from shell, sending to client.

     * @param parcelable The data to reconstruct the splash screen view, null mean unable to copy.

     * @param parcelable The data to reconstruct the splash screen view, null mean unable to copy.

     */

     */

    void onCopySplashScreenFinish(SplashScreenViewParcelable parcelable) {

    void onCopySplashScreenFinish(@Nullable SplashScreenViewParcelable parcelable) {

        removeTransferSplashScreenTimeout();

        removeTransferSplashScreenTimeout();

        final SurfaceControl windowAnimationLeash = (parcelable == null

        final SurfaceControl windowAnimationLeash = (parcelable == null

                || mTransferringSplashScreenState != TRANSFER_SPLASH_SCREEN_COPYING

                || mTransferringSplashScreenState != TRANSFER_SPLASH_SCREEN_COPYING

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

+3 −2
Original line number Original line Diff line number Diff line
@@ -3618,7 +3618,8 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { 
     * @hide

     * @hide

     */

     */

    @Override

    @Override

    public void onSplashScreenViewCopyFinished(int taskId, SplashScreenViewParcelable parcelable)

    public void onSplashScreenViewCopyFinished(int taskId,

            @Nullable SplashScreenViewParcelable parcelable)

                throws RemoteException {

                throws RemoteException {

        mAmInternal.enforceCallingPermission(MANAGE_ACTIVITY_TASKS,

        mAmInternal.enforceCallingPermission(MANAGE_ACTIVITY_TASKS,

                "copySplashScreenViewFinish()");

                "copySplashScreenViewFinish()");