diff options
| author | 2017-05-04 23:22:30 +0000 | |
|---|---|---|
| committer | 2017-05-04 23:22:30 +0000 | |
| commit | 06b8324d02a593a56a34d34ef93d576c6f0d1402 (patch) | |
| tree | 12fe658afe4d79b47395d2d14a8dac9cd9a41b51 | |
| parent | 7ff81553bdcc5fe02e2f40acd0b9eadac8e94cd1 (diff) | |
| parent | 4d1fb218f48a5170bfb01d9bc32dda6a7c1d2e80 (diff) | |
Merge "Limit btsnoop file size (3/9)" into oc-dev
am: 4d1fb218f4
Change-Id: I587722c6408067b45331f10a7bfbb55c53c6317f
3 files changed, 0 insertions, 11 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 1f423ea66063..0840549987a3 100755 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -5176,13 +5176,6 @@ public final class Settings { public static final String AUTOFILL_SERVICE = "autofill_service"; /** - * bluetooth HCI snoop log configuration - * @hide - */ - public static final String BLUETOOTH_HCI_LOG = - "bluetooth_hci_log"; - - /** * @deprecated Use {@link android.provider.Settings.Global#DEVICE_PROVISIONED} instead */ @Deprecated diff --git a/core/tests/coretests/src/android/provider/SettingsBackupTest.java b/core/tests/coretests/src/android/provider/SettingsBackupTest.java index aeed20e211a2..120fe8f8256c 100644 --- a/core/tests/coretests/src/android/provider/SettingsBackupTest.java +++ b/core/tests/coretests/src/android/provider/SettingsBackupTest.java @@ -404,7 +404,6 @@ public class SettingsBackupTest { Settings.Secure.BACKUP_ENABLED, Settings.Secure.BACKUP_PROVISIONED, Settings.Secure.BACKUP_TRANSPORT, - Settings.Secure.BLUETOOTH_HCI_LOG, Settings.Secure.CARRIER_APPS_HANDLED, Settings.Secure.CMAS_ADDITIONAL_BROADCAST_PKG, Settings.Secure.COMPLETED_CATEGORY_PREFIX, diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java index c7c2222f8230..f475361b9b22 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java @@ -985,9 +985,6 @@ class SettingsProtoDumpUtil { Settings.Secure.AUTOFILL_SERVICE, SecureSettingsProto.AUTOFILL_SERVICE); dumpSetting(s, p, - Settings.Secure.BLUETOOTH_HCI_LOG, - SecureSettingsProto.BLUETOOTH_HCI_LOG); - dumpSetting(s, p, Settings.Secure.USER_SETUP_COMPLETE, SecureSettingsProto.USER_SETUP_COMPLETE); dumpSetting(s, p, |