From 4f2a6a2405239156945da46a30ef54a6d0599b7f Mon Sep 17 00:00:00 2001 From: Inseob Kim Date: Mon, 11 May 2020 16:06:19 +0900 Subject: [PATCH] Remove sys.vdso property This is an experimental property on Q and doesn't need anymore. Exempt-From-Owner-Approval: cherry-pick Bug: 154885206 Test: N/A Change-Id: Ibb09e17703fbc95fe41542d335311b68553502a0 Merged-In: Ibb09e17703fbc95fe41542d335311b68553502a0 (cherry picked from commit dfafe03cb45b249ecdab38cb8015156453820a3c) --- core/java/android/provider/Settings.java | 11 ----------- core/proto/android/providers/settings/global.proto | 9 ++------- .../src/android/provider/SettingsBackupTest.java | 1 - .../providers/settings/SettingsProtoDumpUtil.java | 3 --- 4 files changed, 2 insertions(+), 22 deletions(-) diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 7923b586ada52..cadae5cecc6da 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -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: diff --git a/core/proto/android/providers/settings/global.proto b/core/proto/android/providers/settings/global.proto index 3d99b726e6fe0..829e1f7d0d964 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 802b106a107ca..cb91db1934a4a 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, diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java index 21129f9278735..65f68cc5c5b5a 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java @@ -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);