diff options
| -rw-r--r-- | services/core/java/com/android/server/wm/ActivityClientController.java | 4 | ||||
| -rw-r--r-- | services/core/java/com/android/server/wm/Transition.java | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/services/core/java/com/android/server/wm/ActivityClientController.java b/services/core/java/com/android/server/wm/ActivityClientController.java index d430dda1b463..b823e7353a84 100644 --- a/services/core/java/com/android/server/wm/ActivityClientController.java +++ b/services/core/java/com/android/server/wm/ActivityClientController.java @@ -1170,9 +1170,7 @@ class ActivityClientController extends IActivityClientController.Stub { fullscreenRequest, r); reportMultiwindowFullscreenRequestValidatingResult(callback, validateResult); if (validateResult != RESULT_APPROVED) { - if (queued) { - transition.abort(); - } + transition.abort(); return; } transition.collect(topFocusedRootTask); diff --git a/services/core/java/com/android/server/wm/Transition.java b/services/core/java/com/android/server/wm/Transition.java index a6c64912edd3..843e6d154ecb 100644 --- a/services/core/java/com/android/server/wm/Transition.java +++ b/services/core/java/com/android/server/wm/Transition.java @@ -1487,6 +1487,11 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener { return; } + if (mState != STATE_STARTED) { + Slog.e(TAG, "Playing a Transition which hasn't started! #" + mSyncId + " This will " + + "likely cause an exception in Shell"); + } + mState = STATE_PLAYING; mStartTransaction = transaction; mFinishTransaction = mController.mAtm.mWindowManager.mTransactionFactory.get(); |