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

Commit bb11b35c authored by Inseob Kim's avatar Inseob Kim Committed by Gerrit Code Review
Browse files

Merge "Remove sys.vdso property"

parents 3fd2c5c4 4f2a6a24

core/java/android/provider/Settings.java

+0 −11
Original line number Diff line number Diff line
@@ -12060,17 +12060,6 @@ public final class Settings { 
         */

        public static final String ALWAYS_ON_DISPLAY_CONSTANTS = "always_on_display_constants";













        /**













        * System VDSO global setting. This links to the "sys.vdso" system property.













        * The following values are supported:













        * false  -> both 32 and 64 bit vdso disabled













        * 32     -> 32 bit vdso enabled













        * 64     -> 64 bit vdso enabled













        * Any other value defaults to both 32 bit and 64 bit true.













        * @hide













        */













        public static final String SYS_VDSO = "sys_vdso";



























        /**















        * UidCpuPower global setting. This links the sys.uidcpupower system property.















        * The following values are supported:

































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



+2
−7




























Original line number
Diff line number
Diff line








@@ -905,13 +905,8 @@ message GlobalSettingsProto {













        optional SettingProto storage_full_threshold_bytes = 4 [ (android.privacy).dest = DEST_AUTOMATIC ];















        optional SettingProto storage_cache_percentage = 5 [ (android.privacy).dest = DEST_AUTOMATIC ];















        optional SettingProto storage_cache_max_bytes = 6 [ (android.privacy).dest = DEST_AUTOMATIC ];













        // System VDSO global setting. This links to the "sys.vdso" system property.













        // The following values are supported:













        // false  -> both 32 and 64 bit vdso disabled













        // 32     -> 32 bit vdso enabled













        // 64     -> 64 bit vdso enabled













        // Any other value defaults to both 32 bit and 64 bit true.













        optional SettingProto vdso = 7 [ (android.privacy).dest = DEST_AUTOMATIC ];













        // Used to be sys_vdso













        reserved 7;















        // UidCpuPower global setting. This links the sys.uidcpupower system property.















        // The following values are supported:















        // 0 -> /proc/uid_cpupower/* are disabled

































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



+0
−1




























Original line number
Diff line number
Diff line








@@ -454,7 +454,6 @@ public class SettingsBackupTest {













                    Settings.Global.SYS_STORAGE_FULL_THRESHOLD_BYTES,















                    Settings.Global.SYS_STORAGE_THRESHOLD_MAX_BYTES,















                    Settings.Global.SYS_STORAGE_THRESHOLD_PERCENTAGE,













                    Settings.Global.SYS_VDSO,















                    Settings.Global.SYS_UIDCPUPOWER,















                    Settings.Global.SYS_TRACED,















                    Settings.Global.FPS_DEVISOR,

































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



+0
−3




























Original line number
Diff line number
Diff line








@@ -1351,9 +1351,6 @@ class SettingsProtoDumpUtil {













        dumpSetting(s, p,















                Settings.Global.SYS_STORAGE_CACHE_MAX_BYTES,















                GlobalSettingsProto.Sys.STORAGE_CACHE_MAX_BYTES);













        dumpSetting(s, p,













                Settings.Global.SYS_VDSO,













                GlobalSettingsProto.Sys.VDSO);















        dumpSetting(s, p,















                Settings.Global.SYS_UIDCPUPOWER,















                GlobalSettingsProto.Sys.UIDCPUPOWER);