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

Commit 0eee3402 authored by Evan Rosky's avatar Evan Rosky Committed by Automerger Merge Worker
Browse files

Merge "Fix some test-specific bubbles issues" into tm-qpr-dev am: d4c0f323 

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



Change-Id: I042a1bec60e245fc7ae4496580ee127e9e9e42d8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1ad918f4 d4c0f323

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

+18 −10
Original line number Original line Diff line number Diff line
@@ -126,18 +126,26 @@ class TransitionController { 
        mTransitionTracer = transitionTracer;

        mTransitionTracer = transitionTracer;

        mTransitionPlayerDeath = () -> {

        mTransitionPlayerDeath = () -> {

            synchronized (mAtm.mGlobalLock) {

            synchronized (mAtm.mGlobalLock) {

                detachPlayer();

            }

        };

    }



    private void detachPlayer() {

        if (mTransitionPlayer == null) return;

        // Clean-up/finish any playing transitions.

        // Clean-up/finish any playing transitions.

        for (int i = 0; i < mPlayingTransitions.size(); ++i) {

        for (int i = 0; i < mPlayingTransitions.size(); ++i) {

            mPlayingTransitions.get(i).cleanUpOnFailure();

            mPlayingTransitions.get(i).cleanUpOnFailure();

        }

        }

        mPlayingTransitions.clear();

        mPlayingTransitions.clear();

        if (mCollectingTransition != null) {

            mCollectingTransition.abort();

        }

        mTransitionPlayer = null;

        mTransitionPlayer = null;

        mTransitionPlayerProc = null;

        mTransitionPlayerProc = null;

        mRemotePlayer.clear();

        mRemotePlayer.clear();

        mRunningLock.doNotifyLocked();

        mRunningLock.doNotifyLocked();

    }

    }

        };

    }





    /** @see #createTransition(int, int) */

    /** @see #createTransition(int, int) */

    @NonNull

    @NonNull
@@ -193,7 +201,7 @@ class TransitionController { 
                if (mTransitionPlayer.asBinder() != null) {

                if (mTransitionPlayer.asBinder() != null) {

                    mTransitionPlayer.asBinder().unlinkToDeath(mTransitionPlayerDeath, 0);

                    mTransitionPlayer.asBinder().unlinkToDeath(mTransitionPlayerDeath, 0);

                }

                }

                mTransitionPlayer = null;

                detachPlayer();

            }

            }

            if (player.asBinder() != null) {

            if (player.asBinder() != null) {

                player.asBinder().linkToDeath(mTransitionPlayerDeath, 0);

                player.asBinder().linkToDeath(mTransitionPlayerDeath, 0);

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

+5 −2
Original line number Original line Diff line number Diff line
@@ -1136,10 +1136,13 @@ class WindowOrganizerController extends IWindowOrganizerController.Stub 
                final LauncherAppsServiceInternal launcherApps = LocalServices.getService(

                final LauncherAppsServiceInternal launcherApps = LocalServices.getService(

                        LauncherAppsServiceInternal.class);

                        LauncherAppsServiceInternal.class);





                launcherApps.startShortcut(caller.mUid, caller.mPid, callingPackage,

                final boolean success = launcherApps.startShortcut(caller.mUid, caller.mPid,

                        hop.getShortcutInfo().getPackage(), null /* default featureId */,

                        callingPackage, hop.getShortcutInfo().getPackage(), null /* featureId */,

                        hop.getShortcutInfo().getId(), null /* sourceBounds */, launchOpts,

                        hop.getShortcutInfo().getId(), null /* sourceBounds */, launchOpts,

                        hop.getShortcutInfo().getUserId());

                        hop.getShortcutInfo().getUserId());

                if (success) {

                    effects |= TRANSACT_EFFECTS_LIFECYCLE;

                }

                break;

                break;

            }

            }

            case HIERARCHY_OP_TYPE_REPARENT_CHILDREN: {

            case HIERARCHY_OP_TYPE_REPARENT_CHILDREN: {