Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I042a1bec60e245fc7ae4496580ee127e9e9e42d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Evan Rosky
2022-10-13 17:07:03 +00:00
committed by Automerger Merge Worker
parent 1ad918f422 d4c0f3234d
commit 0eee340253
2 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
services/core/java/com/android/server/wm/TransitionController.java
View File

@@ -126,19 +126,27 @@ class TransitionController {
mTransitionTracer = transitionTracer;
mTransitionPlayerDeath = () -> {
synchronized (mAtm.mGlobalLock) {
// Clean-up/finish any playing transitions.
for (int i = 0; i < mPlayingTransitions.size(); ++i) {
mPlayingTransitions.get(i).cleanUpOnFailure();
}
mPlayingTransitions.clear();
mTransitionPlayer = null;
mTransitionPlayerProc = null;
mRemotePlayer.clear();
mRunningLock.doNotifyLocked();
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
Transition createTransition(int type) {
@@ -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);

7
services/core/java/com/android/server/wm/WindowOrganizerController.java
View File

@@ -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: {