From 08941a5f3efd7def6e840fc04ae407f64be7adc1 Mon Sep 17 00:00:00 2001
From: Cassie <xih@google.com>
Date: Wed, 21 Feb 2018 15:28:29 -0800
Subject: [PATCH] Cherrypick "Add device config to decide which Auto Selection
 Network UI to use."

This change added the config because the HAL V_1_2 only supports Pixel 3, and the new Auto
Selection Network UI is based on HAL V_1_2. So we set the flag to decide which Auto Selection
Network UI should be used based in the device type.

Bug: 63718613
Test: Basic telephony sanity
Merged-In: I6b54db63b318564983ae11cffaf7fc27df71b060
---
 core/res/res/values/config.xml  | 3 +++
 core/res/res/values/symbols.xml | 1 +
 2 files changed, 4 insertions(+)

diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index 23159f7b2fdc7..a9bddffaee841 100644
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -2093,6 +2093,9 @@
     <!-- Whether UI for multi user should be shown -->
     <bool name="config_enableMultiUserUI">false</bool>
 
+    <!-- Whether the new Auto Selection Network UI should be shown -->
+    <bool name="config_enableNewAutoSelectNetworkUI">false</bool>
+
     <!-- If true, then we do not ask user for permission for apps to connect to USB devices.
          Do not set this to true for production devices. Doing so will cause you to fail CTS. -->
     <bool name="config_disableUsbPermissionDialogs">false</bool>
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index ad5af95d462e4..f089ff0ddb6d2 100644
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -311,6 +311,7 @@
   <java-symbol type="bool" name="config_forceDefaultOrientation" />
   <java-symbol type="bool" name="config_wifi_batched_scan_supported" />
   <java-symbol type="bool" name="config_enableMultiUserUI"/>
+  <java-symbol type="bool" name="config_enableNewAutoSelectNetworkUI"/>
   <java-symbol type="bool" name="config_disableUsbPermissionDialogs"/>
   <java-symbol type="bool" name="config_hasRecents" />
   <java-symbol type="bool" name="config_windowShowCircularMask" />