Merge "Fix some test-specific bubbles issues" into tm-qpr-dev (d4c0f323) · Commits · e / os / android_frameworks_base

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

+18 −10

Original line number	Diff line number	Diff line
		@@ -126,18 +126,26 @@ class TransitionController {
		mTransitionTracer = transitionTracer;
		mTransitionPlayerDeath = () -> {
		synchronized (mAtm.mGlobalLock) {
		detachPlayer();
		}
		};
		}

		private void detachPlayer() {
		if (mTransitionPlayer == null) return;
		// Clean-up/finish any playing transitions.
		for (int i = 0; i < mPlayingTransitions.size(); ++i) {
		mPlayingTransitions.get(i).cleanUpOnFailure();
		}
		mPlayingTransitions.clear();
		if (mCollectingTransition != null) {
		mCollectingTransition.abort();
		}
		mTransitionPlayer = null;
		mTransitionPlayerProc = null;
		mRemotePlayer.clear();
		mRunningLock.doNotifyLocked();
		}
		};
		}

		/** @see #createTransition(int, int) */
		@NonNull
		@@ -193,7 +201,7 @@ class TransitionController {
		if (mTransitionPlayer.asBinder() != null) {
		mTransitionPlayer.asBinder().unlinkToDeath(mTransitionPlayerDeath, 0);
		}
		mTransitionPlayer = null;
		detachPlayer();
		}
		if (player.asBinder() != null) {
		player.asBinder().linkToDeath(mTransitionPlayerDeath, 0);

+5 −2

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

		launcherApps.startShortcut(caller.mUid, caller.mPid, callingPackage,
		hop.getShortcutInfo().getPackage(), null /* default featureId */,
		final boolean success = launcherApps.startShortcut(caller.mUid, caller.mPid,
		callingPackage, hop.getShortcutInfo().getPackage(), null /* featureId */,
		hop.getShortcutInfo().getId(), null /* sourceBounds */, launchOpts,
		hop.getShortcutInfo().getUserId());
		if (success) {
		effects \|= TRANSACT_EFFECTS_LIFECYCLE;
		}
		break;
		}
		case HIERARCHY_OP_TYPE_REPARENT_CHILDREN: {