From 28f176b9fc78581587074a1e3ac7b3fb51ee279e Mon Sep 17 00:00:00 2001
From: ryanlwlin <ryanlwlin@google.com>
Date: Wed, 16 Mar 2022 09:06:41 +0800
Subject: [PATCH 1/2] Add override for fingerprint sensor gesture support

Bug: 222019218
Test: atest AccessibilityFingerprintGestureTest
Change-Id: Ic36efe75a02cb707adc5c9aab10ec8916644c890
---
 cheetah/overlay/frameworks/base/core/res/res/values/config.xml | 3 +++
 panther/overlay/frameworks/base/core/res/res/values/config.xml | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/cheetah/overlay/frameworks/base/core/res/res/values/config.xml b/cheetah/overlay/frameworks/base/core/res/res/values/config.xml
index 889f348..48e3733 100644
--- a/cheetah/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/cheetah/overlay/frameworks/base/core/res/res/values/config.xml
@@ -233,4 +233,7 @@
         <item>200</item>
         <item>200</item>
     </integer-array>
+
+    <!-- UDFPS does not support gestures -->
+    <bool name="config_fingerprintSupportsGestures">false</bool>
 </resources>
diff --git a/panther/overlay/frameworks/base/core/res/res/values/config.xml b/panther/overlay/frameworks/base/core/res/res/values/config.xml
index 4a29d5a..09f3dc0 100644
--- a/panther/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/panther/overlay/frameworks/base/core/res/res/values/config.xml
@@ -232,4 +232,7 @@
         <item>200</item>
         <item>200</item>
     </integer-array>
+
+    <!-- UDFPS does not support gestures -->
+    <bool name="config_fingerprintSupportsGestures">false</bool>
 </resources>

From 8358d48714135e39616a7b1d92a249cb2266c036 Mon Sep 17 00:00:00 2001
From: Gary Jian <garyjian@google.com>
Date: Wed, 16 Mar 2022 17:53:01 +0800
Subject: [PATCH 2/2] Handle the network selection restoring in modem side

Bug: 222483102
Test: manual
Change-Id: I16b665f72aae3b7e82c7f46a608eed36bbddae7f
---
 .../overlay/frameworks/base/core/res/res/values/config.xml    | 4 ++++
 .../overlay/frameworks/base/core/res/res/values/config.xml    | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/cheetah/overlay/frameworks/base/core/res/res/values/config.xml b/cheetah/overlay/frameworks/base/core/res/res/values/config.xml
index 48e3733..d654dde 100644
--- a/cheetah/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/cheetah/overlay/frameworks/base/core/res/res/values/config.xml
@@ -236,4 +236,8 @@
 
     <!-- UDFPS does not support gestures -->
     <bool name="config_fingerprintSupportsGestures">false</bool>
+
+    <!-- Boolean indicating if restoring network selection should be skipped -->
+    <!-- The restoring is handled by modem if it is true -->
+    <bool translatable="false" name="skip_restoring_network_selection">true</bool>
 </resources>
diff --git a/panther/overlay/frameworks/base/core/res/res/values/config.xml b/panther/overlay/frameworks/base/core/res/res/values/config.xml
index 09f3dc0..5615368 100644
--- a/panther/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/panther/overlay/frameworks/base/core/res/res/values/config.xml
@@ -235,4 +235,8 @@
 
     <!-- UDFPS does not support gestures -->
     <bool name="config_fingerprintSupportsGestures">false</bool>
+
+    <!-- Boolean indicating if restoring network selection should be skipped -->
+    <!-- The restoring is handled by modem if it is true -->
+    <bool translatable="false" name="skip_restoring_network_selection">true</bool>
 </resources>