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

Merge "Attempted fix for IllegalStateException" into tm-qpr-dev am: c143f762de

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

Change-Id: I1638749759427dfb8c7934971dc452995520ad79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
William Leshner
2023-03-03 01:26:44 +00:00
committed by Automerger Merge Worker
parent 53c1f02cf2 c143f762de
commit 279774f6bb
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/SystemUI/src/com/android/systemui/dreams/touch/BouncerSwipeTouchHandler.java
View File

@@ -254,7 +254,10 @@ public class BouncerSwipeTouchHandler implements DreamTouchHandler {
mCurrentScrimController = mScrimManager.getCurrentController(); mCurrentScrimController = mScrimManager.getCurrentController();
session.registerCallback(() -> { session.registerCallback(() -> {
mVelocityTracker.recycle(); if (mVelocityTracker != null) {
mVelocityTracker.recycle();
mVelocityTracker = null;
}
mScrimManager.removeCallback(mScrimManagerCallback); mScrimManager.removeCallback(mScrimManagerCallback);
mCapture = null; mCapture = null;
mNotificationShadeWindowController.setForcePluginOpen(false, this); mNotificationShadeWindowController.setForcePluginOpen(false, this);

9
packages/SystemUI/tests/src/com/android/systemui/dreams/touch/BouncerSwipeTouchHandlerTest.java
View File

@@ -450,6 +450,15 @@ public class BouncerSwipeTouchHandlerTest extends SysuiTestCase {
swipeToPosition(0f, Direction.DOWN, 0); swipeToPosition(0f, Direction.DOWN, 0);
} }
@Test
public void testTouchSessionOnRemovedCalledTwice() {
mTouchHandler.onSessionStart(mTouchSession);
ArgumentCaptor<DreamTouchHandler.TouchSession.Callback> onRemovedCallbackCaptor =
ArgumentCaptor.forClass(DreamTouchHandler.TouchSession.Callback.class);
verify(mTouchSession).registerCallback(onRemovedCallbackCaptor.capture());
onRemovedCallbackCaptor.getValue().onRemoved();
onRemovedCallbackCaptor.getValue().onRemoved();
}
private void swipeToPosition(float percent, Direction direction, float velocityY) { private void swipeToPosition(float percent, Direction direction, float velocityY) {
Mockito.clearInvocations(mTouchSession); Mockito.clearInvocations(mTouchSession);