From 8b2304f2325f85b73af0b2c0fc3bc586073947a3 Mon Sep 17 00:00:00 2001
From: Kevin Chyn <kchyn@google.com>
Date: Fri, 30 Jun 2017 22:33:05 -0700
Subject: [PATCH] Fix Assist Gesture settings check

Fixes: 63181412

Test: manual
Change-Id: Ie51cc4bb62c68722e4613850bfdb4dc67ae15e77
---
 .../settings/gestures/AssistGesturePreferenceController.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/com/android/settings/gestures/AssistGesturePreferenceController.java b/src/com/android/settings/gestures/AssistGesturePreferenceController.java
index ede20c28f6b..a3d4ec1d59a 100644
--- a/src/com/android/settings/gestures/AssistGesturePreferenceController.java
+++ b/src/com/android/settings/gestures/AssistGesturePreferenceController.java
@@ -65,9 +65,12 @@ public class AssistGesturePreferenceController extends GesturePreferenceControll
     public void displayPreference(PreferenceScreen screen) {
         mScreen = screen;
         mPreference = screen.findPreference(getPreferenceKey());
+        if (!mFeatureProvider.isSensorAvailable(mContext)) {
+            removePreference(mScreen, getPreferenceKey());
+            return;
+        }
         if (!mFeatureProvider.isSupported(mContext)) {
             mScreen.removePreference(mPreference);
-            removePreference(mScreen, getPreferenceKey());
             return;
         }
         // Call super last or AbstractPreferenceController might remove the preference from the