Merge "Change allowed sound triggers to 1000" into pi-dev (1d107eae) · Commits · e / os / android_frameworks_base

packages/SettingsProvider/res/values/defaults.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -83,7 +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_max_sound_trigger_detection_service_ops_per_day" translatable="false">1000</integer>
		<integer name="def_sound_trigger_detection_service_op_timeout" translatable="false">15000</integer>

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

+19 −1

Original line number	Diff line number	Diff line
		@@ -2935,7 +2935,7 @@ public class SettingsProvider extends ContentProvider {
		}

		private final class UpgradeController {
		private static final int SETTINGS_VERSION = 163;
		private static final int SETTINGS_VERSION = 164;

		private final int mUserId;

		@@ -3724,6 +3724,24 @@ public class SettingsProvider extends ContentProvider {
		currentVersion = 163;
		}

		if (currentVersion == 163) {
		// Version 163: Update default value of
		// MAX_SOUND_TRIGGER_DETECTION_SERVICE_OPS_PER_DAY from old to new default
		final SettingsState settings = getGlobalSettingsLocked();
		final Setting currentSetting = settings.getSettingLocked(
		Global.MAX_SOUND_TRIGGER_DETECTION_SERVICE_OPS_PER_DAY);
		if (currentSetting.isDefaultFromSystem()) {
		settings.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);
		}

		currentVersion = 164;
		}

		// vXXX: Add new settings above this point.

		if (currentVersion != newVersion) {