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

Commit a1c8f9b0 authored by Inseob Kim's avatar Inseob Kim Committed by Android (Google) Code Review
Browse files

Merge "Remove sys.vdso property" into rvc-dev-plus-aosp

parents 360e6911 dfafe03c

core/java/android/provider/Settings.java

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

         */

        public static final String ALWAYS_ON_DISPLAY_CONSTANTS = "always_on_display_constants";

        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.







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











        * The following values are supported:







        * The following values are supported:

































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



+2
−7




























Original line number
Original line
Diff line number
Diff line








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









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







        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_percentage = 5 [ (android.privacy).dest = DEST_AUTOMATIC ];











        optional SettingProto storage_cache_max_bytes = 6 [ (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.







        // Used to be sys_vdso











        // The following values are supported:







        reserved 7;











        // 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 ];














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







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











        // The following values are supported:







        // The following values are supported:











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







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

































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



+0
−3




























Original line number
Original line
Diff line number
Diff line








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









        dumpSetting(s, p,







        dumpSetting(s, p,











                Settings.Global.SYS_STORAGE_CACHE_MAX_BYTES,







                Settings.Global.SYS_STORAGE_CACHE_MAX_BYTES,











                GlobalSettingsProto.Sys.STORAGE_CACHE_MAX_BYTES);







                GlobalSettingsProto.Sys.STORAGE_CACHE_MAX_BYTES);











        dumpSetting(s, p,














                Settings.Global.SYS_VDSO,














                GlobalSettingsProto.Sys.VDSO);














        dumpSetting(s, p,







        dumpSetting(s, p,











                Settings.Global.SYS_UIDCPUPOWER,







                Settings.Global.SYS_UIDCPUPOWER,











                GlobalSettingsProto.Sys.UIDCPUPOWER);







                GlobalSettingsProto.Sys.UIDCPUPOWER);

































packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java



+0
−1




























Original line number
Original line
Diff line number
Diff line








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









                    Settings.Global.SYS_STORAGE_FULL_THRESHOLD_BYTES,







                    Settings.Global.SYS_STORAGE_FULL_THRESHOLD_BYTES,











                    Settings.Global.SYS_STORAGE_THRESHOLD_MAX_BYTES,







                    Settings.Global.SYS_STORAGE_THRESHOLD_MAX_BYTES,











                    Settings.Global.SYS_STORAGE_THRESHOLD_PERCENTAGE,







                    Settings.Global.SYS_STORAGE_THRESHOLD_PERCENTAGE,











                    Settings.Global.SYS_VDSO,














                    Settings.Global.SYS_UIDCPUPOWER,







                    Settings.Global.SYS_UIDCPUPOWER,











                    Settings.Global.SYS_TRACED,







                    Settings.Global.SYS_TRACED,











                    Settings.Global.FPS_DEVISOR,







                    Settings.Global.FPS_DEVISOR,