Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove sys.vdso property" into rvc-dev-plus-aosp am: a1c8f9b024 am: f053544154

Browse Source 
Change-Id: Ib9f1f8a5ff8231439b91f00cf9629b7d34f57e12
This commit is contained in:
Inseob Kim
2020-05-13 03:04:08 +00:00
committed by Automerger Merge Worker
parent 4cdc0695cc f053544154
commit 0df43165b6
4 changed files with 2 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/java/android/provider/Settings.java
View File

@@ -11577,17 +11577,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:

9
core/proto/android/providers/settings/global.proto
View File

@@ -908,13 +908,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

3
packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java
View File

@@ -1408,9 +1408,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);

1
packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java
View File

@@ -464,7 +464,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,