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

Merge "Limit btsnoop file size (3/9)" into oc-dev

Browse Source 
am: 4d1fb218f4

Change-Id: I587722c6408067b45331f10a7bfbb55c53c6317f
This commit is contained in:
Ajay Panicker
2017-05-04 23:22:30 +00:00
committed by android-build-merger
parent 7ff81553bd 4d1fb218f4
commit 06b8324d02
3 changed files with 0 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5175,13 +5175,6 @@ public final class Settings {
@TestApi
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
*/

1
core/tests/coretests/src/android/provider/SettingsBackupTest.java
View File

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

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

@@ -984,9 +984,6 @@ class SettingsProtoDumpUtil {
dumpSetting(s, p,
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);