drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add a SettingsProvider key for Adaptive connectivity" into rvc-qpr-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-08-24 15:47:38 +00:00
committed by Android (Google) Code Review
parent b28236132d d631c648b3
commit b0df580193
6 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8965,6 +8965,13 @@ public final class Settings {
*/ */
public static final int ACCESSIBILITY_MAGNIFICATION_MODE_WINDOW = 0x2; public static final int ACCESSIBILITY_MAGNIFICATION_MODE_WINDOW = 0x2;
/**
* Whether the Adaptive connectivity option is enabled.
*
* @hide
*/
public static final String ADAPTIVE_CONNECTIVITY_ENABLED = "adaptive_connectivity_enabled";
/** /**
* Keys we no longer back up under the current schema, but want to continue to * Keys we no longer back up under the current schema, but want to continue to
* process when restoring historical backup datasets. * process when restoring historical backup datasets.

5
core/proto/android/app/settings_enums.proto
View File

@ -2683,4 +2683,9 @@ enum PageId {
// CATEGORY: SETTINGS // CATEGORY: SETTINGS
// OS: R // OS: R
MEDIA_CONTROLS_SETTINGS = 1845; MEDIA_CONTROLS_SETTINGS = 1845;
// OPEN: Settings > Network & internet > Adaptive connectivity
// CATEGORY: SETTINGS
// OS: R QPR
ADAPTIVE_CONNECTIVITY_CATEGORY = 1850;
} }

3
core/proto/android/providers/settings/secure.proto
View File

@ -180,6 +180,7 @@ message SecureSettingsProto {
optional SettingProto cmas_additional_broadcast_pkg = 14 [ (android.privacy).dest = DEST_AUTOMATIC ]; optional SettingProto cmas_additional_broadcast_pkg = 14 [ (android.privacy).dest = DEST_AUTOMATIC ];
repeated SettingProto completed_categories = 15; repeated SettingProto completed_categories = 15;
optional SettingProto connectivity_release_pending_intent_delay_ms = 16 [ (android.privacy).dest = DEST_AUTOMATIC ]; optional SettingProto connectivity_release_pending_intent_delay_ms = 16 [ (android.privacy).dest = DEST_AUTOMATIC ];
optional SettingProto adaptive_connectivity_enabled = 84 [ (android.privacy).dest = DEST_AUTOMATIC ];
message Controls { message Controls {
option (android.msg_privacy).dest = DEST_EXPLICIT; option (android.msg_privacy).dest = DEST_EXPLICIT;
@ -595,5 +596,5 @@ message SecureSettingsProto {
// Please insert fields in alphabetical order and group them into messages // Please insert fields in alphabetical order and group them into messages
// if possible (to avoid reaching the method limit). // if possible (to avoid reaching the method limit).
// Next tag = 82; // Next tag = 85;
} }

3
packages/SettingsProvider/src/android/provider/settings/backup/SecureSettings.java
View File

@ -167,6 +167,7 @@ public class SecureSettings {
Settings.Secure.MEDIA_CONTROLS_RESUME, Settings.Secure.MEDIA_CONTROLS_RESUME,
Settings.Secure.MEDIA_CONTROLS_RESUME_BLOCKED, Settings.Secure.MEDIA_CONTROLS_RESUME_BLOCKED,
Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MODE, Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MODE,
Settings.Secure.ACCESSIBILITY_BUTTON_TARGETS Settings.Secure.ACCESSIBILITY_BUTTON_TARGETS,
Settings.Secure.ADAPTIVE_CONNECTIVITY_ENABLED
}; };
} }

1
packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java
View File

@ -253,5 +253,6 @@ public class SecureSettingsValidators {
VALIDATORS.put( VALIDATORS.put(
Secure.ACCESSIBILITY_BUTTON_TARGETS, Secure.ACCESSIBILITY_BUTTON_TARGETS,
ACCESSIBILITY_SHORTCUT_TARGET_LIST_VALIDATOR); ACCESSIBILITY_SHORTCUT_TARGET_LIST_VALIDATOR);
VALIDATORS.put(Secure.ADAPTIVE_CONNECTIVITY_ENABLED, BOOLEAN_VALIDATOR);
} }
} }

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

@ -1979,6 +1979,9 @@ class SettingsProtoDumpUtil {
dumpSetting(s, p, dumpSetting(s, p,
Settings.Secure.CONNECTIVITY_RELEASE_PENDING_INTENT_DELAY_MS, Settings.Secure.CONNECTIVITY_RELEASE_PENDING_INTENT_DELAY_MS,
SecureSettingsProto.CONNECTIVITY_RELEASE_PENDING_INTENT_DELAY_MS); SecureSettingsProto.CONNECTIVITY_RELEASE_PENDING_INTENT_DELAY_MS);
dumpSetting(s, p,
Settings.Secure.ADAPTIVE_CONNECTIVITY_ENABLED,
SecureSettingsProto.ADAPTIVE_CONNECTIVITY_ENABLED);
final long controlsToken = p.start(SecureSettingsProto.CONTROLS); final long controlsToken = p.start(SecureSettingsProto.CONTROLS);
dumpSetting(s, p, dumpSetting(s, p,