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

2019-06-12 00:15:36 +00:00
parent 0ebf0252e0 24ca1bb1bf
commit b349bcf5a5
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);
        }
    }