Merge "Fixes bad merge in Assistant Handle logic" into qt-dev

am: b349bcf5a5 Change-Id: Ie9eab942ea837e8ec9f6cea2a9ccd1718452ed23
2019-06-11 17:23:35 -07:00
parent e43cea0622 b349bcf5a5
commit 09e5a56100
1 changed files with 2 additions and 2 deletions
--- a/packages/SystemUI/src/com/android/systemui/assist/AssistHandleBehaviorController.java
+++ b/packages/SystemUI/src/com/android/systemui/assist/AssistHandleBehaviorController.java
@@ -243,12 +243,12 @@ public final class AssistHandleBehaviorController implements AssistHandleCallbac
            return;
        }

-        mHandlesShowing = false;
-        mHandlesLastHiddenAt = SystemClock.elapsedRealtime();
        ScreenDecorations screenDecorations = mScreenDecorationsSupplier.get();
        if (screenDecorations == null) {
            Log.w(TAG, "Couldn't hide handles, ScreenDecorations unavailable");
        } else {
+            mHandlesShowing = false;
+            mHandlesLastHiddenAt = SystemClock.elapsedRealtime();
            screenDecorations.setAssistHintVisible(false);
        }
    }