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

Merge "[DO NOT MERGE] Bail early if mToken.asBinder() not found" into rvc-qpr-dev

Browse Source
This commit is contained in:
Hongwei Wang
2020-09-23 21:47:22 +00:00
committed by Android (Google) Code Review
parent 63276b9b70 3de034371b
commit c4f7aa4577
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/SystemUI/src/com/android/systemui/pip/PipTaskOrganizer.java
View File

@@ -303,15 +303,20 @@ public class PipTaskOrganizer extends TaskOrganizer implements
* @param animationDurationMs duration in millisecond for the exiting PiP transition * @param animationDurationMs duration in millisecond for the exiting PiP transition
*/ */
public void exitPip(int animationDurationMs) { public void exitPip(int animationDurationMs) {
if (!mState.isInPip() || mState == State.EXITING_PIP || mToken == null) { if (!mState.isInPip() || mToken == null) {
Log.wtf(TAG, "Not allowed to exitPip in current state" Log.wtf(TAG, "Not allowed to exitPip in current state"
+ " mState=" + mState + " mToken=" + mToken); + " mState=" + mState + " mToken=" + mToken);
return; return;
} }
final PipWindowConfigurationCompact config = mCompactState.remove(mToken.asBinder());
if (config == null) {
Log.wtf(TAG, "Token not in record, this should not happen mToken=" + mToken);
return;
}
mPipUiEventLoggerLogger.log( mPipUiEventLoggerLogger.log(
PipUiEventLogger.PipUiEventEnum.PICTURE_IN_PICTURE_EXPAND_TO_FULLSCREEN); PipUiEventLogger.PipUiEventEnum.PICTURE_IN_PICTURE_EXPAND_TO_FULLSCREEN);
final PipWindowConfigurationCompact config = mCompactState.remove(mToken.asBinder());
config.syncWithScreenOrientation(mRequestedOrientation, config.syncWithScreenOrientation(mRequestedOrientation,
mPipBoundsHandler.getDisplayRotation()); mPipBoundsHandler.getDisplayRotation());
final boolean orientationDiffers = config.getRotation() final boolean orientationDiffers = config.getRotation()