From 45711dccb4524889f50abb2fcb89f03d44484137 Mon Sep 17 00:00:00 2001
From: Varun Somani <vsomani@google.com>
Date: Fri, 11 Aug 2023 19:08:47 +0000
Subject: [PATCH 1/2] ARC: Show location services setting in ARC-T

Add a new flag that controls location services setting. The current flag
controls location services as well as wifi and bluetooth scanning.
Seperating these flag will help show GLA setting to the user.

UI: go/screen-recording-location-setting-arc-t

Bug: 295397004
Test: atest SettingsRoboTests and manual
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:37a14be139542f0d6dbc4b75863368279e8053ba)
Merged-In: I3fc377fb118fea031b0ca7dca84f645998486304
Change-Id: I3fc377fb118fea031b0ca7dca84f645998486304
---
 res/values/config.xml                                          | 3 +++
 .../location/LocationServicesPreferenceController.java         | 2 +-
 tests/robotests/res/values-mcc999/config.xml                   | 1 +
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/res/values/config.xml b/res/values/config.xml
index d0cd96b8e1b..00e5c99fde6 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -784,4 +784,7 @@
 
     <!-- Package responsible for updating Mainline Modules -->
     <string name="config_mainline_module_update_package" translatable="false">com.android.vending</string>
+
+    <!-- Whether location services setting is available or not. -->
+    <bool name="config_show_location_services">true</bool>
 </resources>
diff --git a/src/com/android/settings/location/LocationServicesPreferenceController.java b/src/com/android/settings/location/LocationServicesPreferenceController.java
index 53150a827b3..bab8bc8d62d 100644
--- a/src/com/android/settings/location/LocationServicesPreferenceController.java
+++ b/src/com/android/settings/location/LocationServicesPreferenceController.java
@@ -32,7 +32,7 @@ public class LocationServicesPreferenceController extends BasePreferenceControll
 
     @AvailabilityStatus
     public int getAvailabilityStatus() {
-        return mContext.getResources().getBoolean(R.bool.config_show_location_scanning)
+        return mContext.getResources().getBoolean(R.bool.config_show_location_services)
                 ? AVAILABLE
                 : UNSUPPORTED_ON_DEVICE;
     }
diff --git a/tests/robotests/res/values-mcc999/config.xml b/tests/robotests/res/values-mcc999/config.xml
index a5767e40907..2183b47a37a 100644
--- a/tests/robotests/res/values-mcc999/config.xml
+++ b/tests/robotests/res/values-mcc999/config.xml
@@ -38,6 +38,7 @@
     <bool name="config_show_enabled_vr_listeners">false</bool>
     <bool name="config_location_mode_available">false</bool>
     <bool name="config_show_location_scanning">false</bool>
+    <bool name="config_show_location_services">false</bool>
     <bool name="config_show_manage_device_admin">false</bool>
     <bool name="config_show_unlock_set_or_change">false</bool>
     <bool name="config_show_screen_pinning_settings">false</bool>

From a36612c003683dd137287ad9f2b2c6c0f0c142bf Mon Sep 17 00:00:00 2001
From: Varun Somani <vsomani@google.com>
Date: Wed, 20 Dec 2023 23:00:10 +0000
Subject: [PATCH 2/2] ARC: Follow-up fix AndroidLint error

Add missing default resource value to fix AndroidLint failure.

Bug: 295397004
Test: Presubmit
Change-Id: If7ff54c527f48b5260a9f8f8bdddcbf410ac8931
---
 tests/robotests/res/values/config.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/robotests/res/values/config.xml b/tests/robotests/res/values/config.xml
index 323e742a481..312d31d1c5c 100644
--- a/tests/robotests/res/values/config.xml
+++ b/tests/robotests/res/values/config.xml
@@ -20,4 +20,5 @@
     <bool name="config_show_camera_laser_sensor">true</bool>
     <bool name="config_show_connectivity_monitor">true</bool>
     <bool name="config_show_smooth_display">true</bool>
+    <bool name="config_show_location_services">true</bool>
 </resources>