summaryrefslogtreecommitdiff
path: root/core/proto
diff options
context:
space:
mode:
authorInseob Kim <inseob@google.com>2020-05-13 05:02:51 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-05-13 05:02:51 +0000
commiteb2de8cdeaddcdfa2dd20d248aef252368f3943f (patch)
tree6185c3b0ae03e563a71cf90d8e3b5795b3984323 /core/proto
parent2e789841a4f377a56e1e9444ae9c5bb1befa39d7 (diff)
parentbb11b35c0321a2c9ed8318fd2ff3b58906d87e47 (diff)
Merge "Remove sys.vdso property" am: bb11b35c03
Change-Id: I91cfdbbcbd02a2b6c3ff0278d129a6daf2a43807
Diffstat (limited to 'core/proto')
-rw-r--r--core/proto/android/providers/settings/global.proto9
1 files changed, 2 insertions, 7 deletions
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