Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a5799128 authored by Varun Somani's avatar Varun Somani Committed by Android (Google) Code Review
Browse files

Merge changes from topic "cherrypicker-L33700000962584268:N96700001396822390" into main 

* changes:
  ARC: Follow-up fix AndroidLint error
  ARC: Show location services setting in ARC-T
parents ced0c1d0 a36612c0

res/values/config.xml

+3 −0
Original line number Diff line number Diff line
@@ -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>

src/com/android/settings/location/LocationServicesPreferenceController.java

+1 −1
Original line number Diff line number Diff line
@@ -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;

    }

tests/robotests/res/values-mcc999/config.xml

+1 −0
Original line number Diff line number Diff line
@@ -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>

tests/robotests/res/values/config.xml

+1 −0
Original line number Diff line number Diff line
@@ -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>