From 24ca1bb1bf91fb04e9cbd3c61c5ac38682de2047 Mon Sep 17 00:00:00 2001
From: Govinda Wasserman <gwasserman@google.com>
Date: Tue, 11 Jun 2019 18:21:38 -0400
Subject: [PATCH] Fixes bad merge in Assistant Handle logic

Test: atest AssistHandleBehaviorControllerTest
BUG:134572553
Change-Id: Ifdbaa45046f68f6af8708180abe97085ab70af0f
---
 .../systemui/assist/AssistHandleBehaviorController.java       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/SystemUI/src/com/android/systemui/assist/AssistHandleBehaviorController.java b/packages/SystemUI/src/com/android/systemui/assist/AssistHandleBehaviorController.java
index b747998514ede..002d4f34be113 100644
--- 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);
         }
     }