Merge changes from topic "SoundTriggerJobService-steps" into pi-dev am: 6ed6340e3c (15032dbf) · Commits · e / os / android_frameworks_base

core/proto/android/providers/settings.proto

+2 −1

Original line number	Diff line number	Diff line
		@@ -469,6 +469,7 @@ message GlobalSettingsProto {
		optional SettingProto autofill_compat_allowed_packages = 357 [ (android.privacy).dest = DEST_AUTOMATIC ];
		optional SettingProto hidden_api_blacklist_exemptions = 358 [ (android.privacy).dest = DEST_AUTOMATIC ];
		optional SettingProto sound_trigger_detection_service_op_timeout = 387 [ (android.privacy).dest = DEST_AUTOMATIC ];
		optional SettingProto max_sound_trigger_detection_service_ops_per_day = 388 [ (android.privacy).dest = DEST_AUTOMATIC ];
		// Subscription to be used for voice call on a multi sim device. The
		// supported values are 0 = SUB1, 1 = SUB2 and etc.
		optional SettingProto multi_sim_voice_call_subscription = 359 [ (android.privacy).dest = DEST_AUTOMATIC ];
		@@ -506,7 +507,7 @@ message GlobalSettingsProto {
		optional SettingsProto backup_agent_timeout_parameters = 386;
		// Please insert fields in the same order as in
		// frameworks/base/core/java/android/provider/Settings.java.
		// Next tag = 388;
		// Next tag = 389;
		}

		message SecureSettingsProto {

+1 −0

Original line number	Diff line number	Diff line
		@@ -268,6 +268,7 @@ public class SettingsBackupTest {
		Settings.Global.LOW_POWER_MODE_TRIGGER_LEVEL_MAX,
		Settings.Global.LTE_SERVICE_FORCED,
		Settings.Global.MAX_NOTIFICATION_ENQUEUE_RATE,
		Settings.Global.MAX_SOUND_TRIGGER_DETECTION_SERVICE_OPS_PER_DAY,
		Settings.Global.MDC_INITIAL_MAX_RETRY,
		Settings.Global.MHL_INPUT_SWITCHING_ENABLED,
		Settings.Global.MHL_POWER_CHARGE_ENABLED,

+1 −0

Original line number	Diff line number	Diff line
		@@ -83,6 +83,7 @@
		<string name="def_charging_started_sound" translatable="false">/system/media/audio/ui/ChargingStarted.ogg</string>

		<!-- sound trigger detection service default values -->
		<integer name="def_max_sound_trigger_detection_service_ops_per_day" translatable="false">200</integer>
		<integer name="def_sound_trigger_detection_service_op_timeout" translatable="false">15000</integer>

		<bool name="def_lockscreen_disabled">false</bool>

+3 −0

Original line number	Diff line number	Diff line
		@@ -1166,6 +1166,9 @@ class SettingsProtoDumpUtil {
		dumpSetting(s, p,
		Global.SOUND_TRIGGER_DETECTION_SERVICE_OP_TIMEOUT,
		GlobalSettingsProto.SOUND_TRIGGER_DETECTION_SERVICE_OP_TIMEOUT);
		dumpSetting(s, p,
		Global.MAX_SOUND_TRIGGER_DETECTION_SERVICE_OPS_PER_DAY,
		GlobalSettingsProto.MAX_SOUND_TRIGGER_DETECTION_SERVICE_OPS_PER_DAY);
		dumpSetting(s, p,
		Settings.Global.MULTI_SIM_VOICE_CALL_SUBSCRIPTION,
		GlobalSettingsProto.MULTI_SIM_VOICE_CALL_SUBSCRIPTION);

+11 −0

Original line number	Diff line number	Diff line
		@@ -3671,10 +3671,21 @@ public class SettingsProvider extends ContentProvider {

		if (currentVersion == 160) {
		// Version 161: Set the default value for
		// MAX_SOUND_TRIGGER_DETECTION_SERVICE_OPS_PER_DAY and
		// SOUND_TRIGGER_DETECTION_SERVICE_OP_TIMEOUT
		final SettingsState globalSettings = getGlobalSettingsLocked();

		String oldValue = globalSettings.getSettingLocked(
		Global.MAX_SOUND_TRIGGER_DETECTION_SERVICE_OPS_PER_DAY).getValue();
		if (TextUtils.equals(null, oldValue)) {
		globalSettings.insertSettingLocked(
		Settings.Global.MAX_SOUND_TRIGGER_DETECTION_SERVICE_OPS_PER_DAY,
		Integer.toString(getContext().getResources().getInteger(
		R.integer.def_max_sound_trigger_detection_service_ops_per_day)),
		null, true, SettingsState.SYSTEM_PACKAGE_NAME);
		}

		oldValue = globalSettings.getSettingLocked(
		Global.SOUND_TRIGGER_DETECTION_SERVICE_OP_TIMEOUT).getValue();
		if (TextUtils.equals(null, oldValue)) {
		globalSettings.insertSettingLocked(