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

Merge "Fix a potential NPE" into sc-v2-dev am: 4b3ea38f9b

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

Change-Id: Iac4afaa1caaf0969346e2c2ada0445a7dbc74be7
This commit is contained in:
Mady Mellor
2021-12-15 18:21:15 +00:00
committed by Automerger Merge Worker
parent 05305a93c7 4b3ea38f9b
commit 6f120287c9
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/animation/ExpandedAnimationController.java
View File

@@ -346,6 +346,9 @@ public class ExpandedAnimationController
* bubble is dragged back into the row. * bubble is dragged back into the row.
*/ */
public void dragBubbleOut(View bubbleView, float x, float y) { public void dragBubbleOut(View bubbleView, float x, float y) {
if (mMagnetizedBubbleDraggingOut == null) {
return;
}
if (mSpringToTouchOnNextMotionEvent) { if (mSpringToTouchOnNextMotionEvent) {
springBubbleTo(mMagnetizedBubbleDraggingOut.getUnderlyingObject(), x, y); springBubbleTo(mMagnetizedBubbleDraggingOut.getUnderlyingObject(), x, y);
mSpringToTouchOnNextMotionEvent = false; mSpringToTouchOnNextMotionEvent = false;

14
libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/bubbles/animation/ExpandedAnimationControllerTest.java
View File

@@ -59,19 +59,21 @@ public class ExpandedAnimationControllerTest extends PhysicsAnimationLayoutTestC
private int mStackOffset; private int mStackOffset;
private PointF mExpansionPoint; private PointF mExpansionPoint;
private BubblePositioner mPositioner; private BubblePositioner mPositioner;
private BubbleStackView.StackViewState mStackViewState; private BubbleStackView.StackViewState mStackViewState = new BubbleStackView.StackViewState();
@SuppressLint("VisibleForTests") @SuppressLint("VisibleForTests")
@Before @Before
public void setUp() throws Exception { public void setUp() throws Exception {
super.setUp(); super.setUp();
BubbleStackView stackView = mock(BubbleStackView.class);
when(stackView.getState()).thenReturn(getStackViewState());
mPositioner = new BubblePositioner(getContext(), mock(WindowManager.class)); mPositioner = new BubblePositioner(getContext(), mock(WindowManager.class));
mPositioner.updateInternal(Configuration.ORIENTATION_PORTRAIT, mPositioner.updateInternal(Configuration.ORIENTATION_PORTRAIT,
Insets.of(0, 0, 0, 0), Insets.of(0, 0, 0, 0),
new Rect(0, 0, mDisplayWidth, mDisplayHeight)); new Rect(0, 0, mDisplayWidth, mDisplayHeight));
BubbleStackView stackView = mock(BubbleStackView.class);
when(stackView.getState()).thenReturn(getStackViewState());
mExpandedController = new ExpandedAnimationController(mPositioner, mExpandedController = new ExpandedAnimationController(mPositioner,
mOnBubbleAnimatedOutAction, mOnBubbleAnimatedOutAction,
stackView); stackView);
@@ -135,6 +137,12 @@ public class ExpandedAnimationControllerTest extends PhysicsAnimationLayoutTestC
testBubblesInCorrectExpandedPositions(); testBubblesInCorrectExpandedPositions();
} }
@Test
public void testDragBubbleOutDoesntNPE() throws InterruptedException {
mExpandedController.onGestureFinished();
mExpandedController.dragBubbleOut(mViews.get(0), 1, 1);
}
/** Expand the stack and wait for animations to finish. */ /** Expand the stack and wait for animations to finish. */
private void expand() throws InterruptedException { private void expand() throws InterruptedException {
mExpandedController.expandFromStack(mock(Runnable.class)); mExpandedController.expandFromStack(mock(Runnable.class));