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

Commit 7e25b3d9 authored by Philip P. Moltmann's avatar Philip P. Moltmann
Browse files

Throttle number of sound trigger operations / day 

It is not clear when the day should start. Further a day might have
25 hours in the case of daylight savings time.
Hence a day in this case is the last 24 hours, not a calendar day.

Keeping track of the time of each operation might waste memory as we
don't need that much precision.

Hence keep track how many operations were performed in the last 24
hours in buckets of hours. If the total count reaches a maximum suppress
any further operations.

The maximum is configurable via global settings. It can be updated
by apps that have the appropriate permissions. Hence if the default
value turns out to be incorrect, it can be adjusted after release.

This does not throttle based on battery state as it is better to
completely unload the sound model to not even have a detection event.

Test: atest SoundTriggerDetectionServiceTests (separate CL)
      atest android.provider.SettingsBackupTest
Bug: 73829108
Change-Id: Ied8570b60b61b6a055bd2576d1502c1b36424efa
parent 18e3eb81

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 {

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

+1 −0
Original line number Diff line number Diff line
@@ -267,6 +267,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,

packages/SettingsProvider/res/values/defaults.xml

+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>

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

+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);

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

+11 −0
Original line number Diff line number Diff line
@@ -3673,10 +3673,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(