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

Commit 37a7c8e8 authored by Presubmit Automerger Backend's avatar Presubmit Automerger Backend
Browse files

[automerge] Allowing launch cookies to be passed via pending activity starts 2p: 30362a07 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16968731


Change-Id: I68cd8b86e54bd5e3521724fdd5f21db28da38c3d
Merged-In: I339ea827836fa53ab5bb1617a72f9e0e5ae0f5ec
parents aed366dc 30362a07

core/java/android/app/IActivityTaskManager.aidl

+1 −1
Original line number Diff line number Diff line
@@ -293,7 +293,7 @@ interface IActivityTaskManager { 
     * a short predefined amount of time.

     */

    void registerRemoteAnimationForNextActivityStart(in String packageName,

           in RemoteAnimationAdapter adapter);

            in RemoteAnimationAdapter adapter, in IBinder launchCookie);



    /**

     * Registers remote animations for a display.

packages/SystemUI/animation/src/com/android/systemui/animation/ActivityLaunchAnimator.kt

+1 −1
Original line number Diff line number Diff line
@@ -151,7 +151,7 @@ class ActivityLaunchAnimator( 
        if (packageName != null && animationAdapter != null) {

            try {

                ActivityTaskManager.getService().registerRemoteAnimationForNextActivityStart(

                    packageName, animationAdapter)

                    packageName, animationAdapter, null /* launchCookie */)

            } catch (e: RemoteException) {

                Log.w(TAG, "Unable to register the remote animation", e)

            }

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

+2 −2
Original line number Diff line number Diff line
@@ -517,8 +517,8 @@ public class ActivityStartController { 
    }



    void registerRemoteAnimationForNextActivityStart(String packageName,

            RemoteAnimationAdapter adapter) {

        mPendingRemoteAnimationRegistry.addPendingAnimation(packageName, adapter);

            RemoteAnimationAdapter adapter, @Nullable IBinder launchCookie) {

        mPendingRemoteAnimationRegistry.addPendingAnimation(packageName, adapter, launchCookie);

    }



    PendingRemoteAnimationRegistry getPendingRemoteAnimationRegistry() {

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

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


    @Override

    public void registerRemoteAnimationForNextActivityStart(String packageName,

            RemoteAnimationAdapter adapter) {

            RemoteAnimationAdapter adapter, IBinder launchCookie) {

        mAmInternal.enforceCallingPermission(CONTROL_REMOTE_APP_TRANSITION_ANIMATIONS,

                "registerRemoteAnimationForNextActivityStart");

        adapter.setCallingPidUid(Binder.getCallingPid(), Binder.getCallingUid());
@@ -3626,7 +3626,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { 
            final long origId = Binder.clearCallingIdentity();

            try {

                getActivityStartController().registerRemoteAnimationForNextActivityStart(

                        packageName, adapter);

                        packageName, adapter, launchCookie);

            } finally {

                Binder.restoreCallingIdentity(origId);

            }

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

+12 −3
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.server.wm; 
import android.annotation.Nullable;

import android.app.ActivityOptions;

import android.os.Handler;

import android.os.IBinder;

import android.util.ArrayMap;

import android.view.RemoteAnimationAdapter;
@@ -43,8 +44,9 @@ class PendingRemoteAnimationRegistry { 
    /**

     * Adds a remote animation to be run for all activity starts originating from a certain package.

     */

    void addPendingAnimation(String packageName, RemoteAnimationAdapter adapter) {

        mEntries.put(packageName, new Entry(packageName, adapter));

    void addPendingAnimation(String packageName, RemoteAnimationAdapter adapter,

            @Nullable IBinder launchCookie) {

        mEntries.put(packageName, new Entry(packageName, adapter, launchCookie));

    }



    /**
@@ -62,6 +64,10 @@ class PendingRemoteAnimationRegistry { 
        } else {

            options.setRemoteAnimationAdapter(entry.adapter);

        }

        IBinder launchCookie = entry.launchCookie;

        if (launchCookie != null) {

            options.setLaunchCookie(launchCookie);

        }

        mEntries.remove(callingPackage);

        return options;

    }
@@ -69,10 +75,13 @@ class PendingRemoteAnimationRegistry { 
    private class Entry {

        final String packageName;

        final RemoteAnimationAdapter adapter;

        @Nullable

        final IBinder launchCookie;



        Entry(String packageName, RemoteAnimationAdapter adapter) {

        Entry(String packageName, RemoteAnimationAdapter adapter, @Nullable IBinder launchCookie) {

            this.packageName = packageName;

            this.adapter = adapter;

            this.launchCookie = launchCookie;

            mHandler.postDelayed(() -> {

                synchronized (mLock) {

                    final Entry entry = mEntries.get(packageName);