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

Commit 2e99ad12 authored by Marco Ballesio's avatar Marco Ballesio Committed by Automerger Merge Worker
Browse files

Merge changes from topic "developer option for app freezer" into rvc-dev am: ce9b4785 

Change-Id: I832531415af55965540693583b02e587189ffca9
parents 4b87fd07 ce9b4785

core/java/android/app/IActivityManager.aidl

+5 −0
Original line number Diff line number Diff line
@@ -673,4 +673,9 @@ interface IActivityManager { 
     * @param state The customized state data

     */

    void setProcessStateSummary(in byte[] state);



    /**

     * Return whether the app freezer is supported (true) or not (false) by this system.

     */

    boolean isAppFreezerSupported();

}

core/java/android/provider/Settings.java

+8 −0
Original line number Diff line number Diff line
@@ -14032,6 +14032,14 @@ public final class Settings { 
        public static final String ZRAM_ENABLED =

                "zram_enabled";













        /**













         * Whether the app freezer is enabled on this device.













         * The value of "enabled" enables the app freezer, "disabled" disables it and













         * "device_default" will let the system decide whether to enable the freezer or not













         * @hide













         */













        public static final String CACHED_APPS_FREEZER_ENABLED = "cached_apps_freezer";



























        /**















         * Configuration flags for smart replies in notifications.















         * This is encoded as a key=value list, separated by commas. Ex:

























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



+2
−1




























Original line number
Diff line number
Diff line








@@ -169,6 +169,7 @@ message GlobalSettingsProto {





























    optional SettingProto boot_count = 22 [ (android.privacy).dest = DEST_AUTOMATIC ];















    optional SettingProto bugreport_in_power_menu = 23 [ (android.privacy).dest = DEST_AUTOMATIC ];













    optional SettingProto cached_apps_freezer_enabled = 152 [ (android.privacy).dest = DEST_AUTOMATIC ];















    optional SettingProto call_auto_retry = 24 [ (android.privacy).dest = DEST_AUTOMATIC ];































    message CaptivePortal {










@@ -1059,5 +1060,5 @@ message GlobalSettingsProto {





























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















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













    // Next tag = 152;













    // Next tag = 153;















}
























packages/SettingsLib/res/values/arrays.xml



+14
−0




























Original line number
Diff line number
Diff line








@@ -633,4 +633,18 @@













        <item>@color/bt_color_bg_7</item>















    </integer-array>





























    <!-- Cached apps freezer modes -->













    <array name="cached_apps_freezer_entries">













        <item>@string/cached_apps_freezer_device_default</item>













        <item>@string/cached_apps_freezer_enabled</item>













        <item>@string/cached_apps_freezer_disabled</item>













    </array>



























    <!-- Values for cached apps freezer modes -->













    <array name="cached_apps_freezer_values">













        <item>device_default</item>













        <item>enabled</item>













        <item>disabled</item>













    </array>





























</resources>
























packages/SettingsLib/res/values/strings.xml



+8
−0




























Original line number
Diff line number
Diff line








@@ -1365,4 +1365,12 @@













    <!-- Name for the guest user [CHAR LIMIT=35] -->















    <string name="guest_nickname">Guest</string>





























    <!-- List entry in developer settings to choose default device/system behavior for the app freezer [CHAR LIMIT=30]-->













    <string name="cached_apps_freezer_device_default">Device default</string>













    <!-- List entry in developer settings to disable the app freezer in developer settings [CHAR LIMIT=30]-->













    <string name="cached_apps_freezer_disabled">Disabled</string>













    <!-- List entry in developer settings to enable the app freezer in developer settings [CHAR LIMIT=30]-->













    <string name="cached_apps_freezer_enabled">Enabled</string>













    <!-- Developer setting dialog prompting the user to reboot after changing the app freezer setting [CHAR LIMIT=NONE]-->













    <string name="cached_apps_freezer_reboot_dialog_text">Your device must be rebooted for this change to apply. Reboot now or cancel.</string>















</resources>