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

Commit 957f0a52 authored by Sarah Chin's avatar Sarah Chin
Browse files

Add Setting for NR screen off indications 

Test: build
Bug: 154241884
Change-Id: Ifa485230f6d27eaa7a665a396e3eac33e00feadb
Merged-In: Ifa485230f6d27eaa7a665a396e3eac33e00feadb
parent bdc57bef

core/java/android/provider/Settings.java

+15 −0
Original line number Diff line number Diff line
@@ -14952,6 +14952,21 @@ public final class Settings { 
         */

        public static final String POWER_BUTTON_SUPPRESSION_DELAY_AFTER_GESTURE_WAKE =

                "power_button_suppression_delay_after_gesture_wake";













        /**













         * For 5G NSA capable devices, determines whether NR tracking indications are on













         * when the screen is off.













         *













         * Values are:













         * 0: off - All 5G NSA tracking indications are off when the screen is off.













         * 1: extended - All 5G NSA tracking indications are on when the screen is off as long as













         *    the device is camped on 5G NSA (5G icon is showing in status bar).













         *    If the device is not camped on 5G NSA, tracking indications are off.













         * 2: always on - All 5G NSA tracking indications are on whether the screen is on or off.













         * @hide













         */













        public static final String NR_NSA_TRACKING_SCREEN_OFF_MODE =













                "nr_nsa_tracking_screen_off_mode";















    }





























    /**

























core/proto/android/providers/settings/global.proto



+3
−1




























Original line number
Diff line number
Diff line








@@ -693,6 +693,8 @@ message GlobalSettingsProto {













    }















    optional Notification notification = 82;





























    optional SettingProto nr_nsa_tracking_screen_off_mode = 153 [ (android.privacy).dest = DEST_AUTOMATIC ];





























    optional SettingProto nsd_on = 83 [ (android.privacy).dest = DEST_AUTOMATIC ];































    message Ntp {










@@ -1052,5 +1054,5 @@ message GlobalSettingsProto {





























    // Please insert fields in alphabetical order and group them into messages















    // if possible (to avoid reaching the method limit).













    // Next tag = 151;













    // Next tag = 154;















}
























core/tests/coretests/src/android/provider/SettingsBackupTest.java



+1
−0




























Original line number
Diff line number
Diff line








@@ -380,6 +380,7 @@ public class SettingsBackupTest {













                    Settings.Global.NITZ_UPDATE_DIFF,















                    Settings.Global.NITZ_UPDATE_SPACING,















                    Settings.Global.NOTIFICATION_SNOOZE_OPTIONS,













                    Settings.Global.NR_NSA_TRACKING_SCREEN_OFF_MODE,















                    Settings.Global.NSD_ON,















                    Settings.Global.NTP_SERVER,















                    Settings.Global.NTP_TIMEOUT,

































packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java



+4
−0




























Original line number
Diff line number
Diff line








@@ -1074,6 +1074,10 @@ class SettingsProtoDumpUtil {













                Settings.Global.NSD_ON,















                GlobalSettingsProto.NSD_ON);





























        dumpSetting(s, p,













                Settings.Global.NR_NSA_TRACKING_SCREEN_OFF_MODE,













                GlobalSettingsProto.NR_NSA_TRACKING_SCREEN_OFF_MODE);





























        final long ntpToken = p.start(GlobalSettingsProto.NTP);















        dumpSetting(s, p,















                Settings.Global.NTP_SERVER,