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

Commit 95b8d682 authored by Harshad Dhabu's avatar Harshad Dhabu Committed by Yeabkal Assegid Wubshit
Browse files

Add new key to System Content Provider for combined location 

Bug: 185927316
Test: tests run as part of topic thru the other CL; no extra tests for
this change alone.
Change-Id: I76e21b2f3731f4e556713ad86bc7bd29e467c583

Change-Id: I0bc606e9cf438705166f76872495f2e84dee55d3
(cherry picked from commit 0e20158cf7651d298af879209f81bfae115c253d)
parent d7935a53

core/java/android/provider/Settings.java

+6 −0
Original line number Diff line number Diff line
@@ -16770,6 +16770,12 @@ public final class Settings { 
             * @hide

             */

            public static final String BURN_IN_PROTECTION_ENABLED = "burn_in_protection";













            /**













             * Whether the device has combined location setting enabled.













             * @hide













             */













            public static final String COMBINED_LOCATION_ENABLED = "combined_location_enable";















        }















    }







































packages/SettingsProvider/src/android/provider/settings/validators/GlobalSettingsValidators.java



+1
−0




























Original line number
Diff line number
Diff line








@@ -311,6 +311,7 @@ public class GlobalSettingsValidators {













                Global.Wearable.WEAR_ACTIVITY_AUTO_RESUME_TIMEOUT_MS,















                NON_NEGATIVE_INTEGER_VALIDATOR);















        VALIDATORS.put(Global.Wearable.BURN_IN_PROTECTION_ENABLED, BOOLEAN_VALIDATOR);













        VALIDATORS.put(Global.Wearable.COMBINED_LOCATION_ENABLED, BOOLEAN_VALIDATOR);















    }















}