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

Commit 30362a07 authored by Selim Cinek's avatar Selim Cinek
Browse files

Allowing launch cookies to be passed via pending activity starts 

When overriding pending activity starts using remote animations,
we're now also allowing the passage of a launch cookie to associate
the task with the launched app. This allows us to return to the
right widgets for certain apps using broadcast trampolines.

Fixes: 220290671
Test: add Photos widget, return properly to widget
Merged-In: I339ea827836fa53ab5bb1617a72f9e0e5ae0f5ec
Change-Id: I339ea827836fa53ab5bb1617a72f9e0e5ae0f5ec
parent 7ac3a069

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);