diff options
| author | Jakub Pawłowski <jpawlowski@google.com> | 2021-12-30 14:39:52 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-30 14:39:52 +0000 |
| commit | 351ebee5bab471ae6fdad84fc6f7da21a6ba4918 (patch) | |
| tree | 92b9f84af2cd07e4a180c276dc04be772cf723bd /core | |
| parent | f1cd6678f58e9eb9f860bb037e587e47e8c35840 (diff) | |
| parent | 16dcbdc0b8686592657820b121433f640f133f6e (diff) | |
Merge "Bluetooth: ensure adapter name and address can't be read from 3p apps" into sc-qpr1-dev am: 16dcbdc0b8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15924163
Change-Id: I6bc239671d7c399588707472149f4131237a0575
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/provider/Settings.java | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 07feb44efea9..54952fc2dc39 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -6364,6 +6364,27 @@ public final class Settings { public static final String ALLOW_MOCK_LOCATION = "mock_location"; /** + * This is used by Bluetooth Manager to store adapter name + * @hide + */ + @Readable(maxTargetSdk = Build.VERSION_CODES.S) + public static final String BLUETOOTH_NAME = "bluetooth_name"; + + /** + * This is used by Bluetooth Manager to store adapter address + * @hide + */ + @Readable(maxTargetSdk = Build.VERSION_CODES.S) + public static final String BLUETOOTH_ADDRESS = "bluetooth_address"; + + /** + * This is used by Bluetooth Manager to store whether adapter address is valid + * @hide + */ + @Readable(maxTargetSdk = Build.VERSION_CODES.S) + public static final String BLUETOOTH_ADDR_VALID = "bluetooth_addr_valid"; + + /** * Setting to indicate that on device captions are enabled. * * @hide |