Merge "Merge "Add Setting for NR screen off indications" into rvc-dev am:... (b1efbe58) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+15 −0

Original line number	Diff line number	Diff line
		@@ -14394,6 +14394,21 @@ public final class Settings {
		* @hide
		*/
		public static final String ADVANCED_BATTERY_USAGE_AMOUNT = "advanced_battery_usage_amount";

		/**
		* 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";
		}

		/**

+3 −1

Original line number	Diff line number	Diff line
		@@ -695,6 +695,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 {
		@@ -1055,5 +1057,5 @@ message GlobalSettingsProto {

		// Please insert fields in alphabetical order and group them into messages
		// if possible (to avoid reaching the method limit).
		// Next tag = 153;
		// Next tag = 154;
		}

+4 −0

Original line number	Diff line number	Diff line
		@@ -1131,6 +1131,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,

+1 −0

Original line number	Diff line number	Diff line
		@@ -391,6 +391,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,