From 1db30b7749248bc91c0fb7ef2a70d58b4d876188 Mon Sep 17 00:00:00 2001
From: Kevin Chyn <kchyn@google.com>
Date: Fri, 30 Jun 2017 16:27:49 -0700
Subject: [PATCH] Assist gesture setting should not be available on unsupported
 devices

Fixes: 63176246

Test: manual
Change-Id: I17cd338eafd2e1a86d1e82d81bc9817eaf18d57b
---
 .../settings/gestures/AssistGesturePreferenceController.java     | 1 +
 1 file changed, 1 insertion(+)

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