diff options
| author | Inseob Kim <inseob@google.com> | 2020-05-13 05:02:51 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-13 05:02:51 +0000 |
| commit | eb2de8cdeaddcdfa2dd20d248aef252368f3943f (patch) | |
| tree | 6185c3b0ae03e563a71cf90d8e3b5795b3984323 /core | |
| parent | 2e789841a4f377a56e1e9444ae9c5bb1befa39d7 (diff) | |
| parent | bb11b35c0321a2c9ed8318fd2ff3b58906d87e47 (diff) | |
Merge "Remove sys.vdso property" am: bb11b35c03
Change-Id: I91cfdbbcbd02a2b6c3ff0278d129a6daf2a43807
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/provider/Settings.java | 11 | ||||
| -rw-r--r-- | core/proto/android/providers/settings/global.proto | 9 | ||||
| -rw-r--r-- | core/tests/coretests/src/android/provider/SettingsBackupTest.java | 1 |
3 files changed, 2 insertions, 19 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 7923b586ada5..cadae5cecc6d 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -12061,17 +12061,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: * 0 -> /proc/uid_cpupower/* are disabled diff --git a/core/proto/android/providers/settings/global.proto b/core/proto/android/providers/settings/global.proto index 3d99b726e6fe..829e1f7d0d96 100644 --- a/core/proto/android/providers/settings/global.proto +++ b/core/proto/android/providers/settings/global.proto @@ -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 diff --git a/core/tests/coretests/src/android/provider/SettingsBackupTest.java b/core/tests/coretests/src/android/provider/SettingsBackupTest.java index 802b106a107c..cb91db1934a4 100644 --- a/core/tests/coretests/src/android/provider/SettingsBackupTest.java +++ b/core/tests/coretests/src/android/provider/SettingsBackupTest.java @@ -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, |