From 4d71437598026627af85c576dd53a4247455b34a Mon Sep 17 00:00:00 2001 From: Ajay Panicker Date: Mon, 17 Apr 2017 20:42:22 -0700 Subject: Limit btsnoop file size (3/9) Limit btsnoop file size by rotating between snoop files. The rotation occurrs when a fixed number of packets have been logged and will start overwriting the older file. Bug: 35998031 Test: Enable snoop logs from developer options and let logs get large Change-Id: I40d5da4c1b1c9b45908e5790d130f1c5e804c773 --- core/java/android/bluetooth/BluetoothAdapter.java | 22 ---------------------- core/java/android/bluetooth/IBluetooth.aidl | 1 - core/java/android/provider/Settings.java | 7 ------- .../bluetooth/BluetoothInstrumentation.java | 8 -------- .../src/android/provider/SettingsBackupTest.java | 1 - .../providers/settings/SettingsProtoDumpUtil.java | 3 --- .../android/server/BluetoothManagerService.java | 10 ---------- 7 files changed, 52 deletions(-) diff --git a/core/java/android/bluetooth/BluetoothAdapter.java b/core/java/android/bluetooth/BluetoothAdapter.java index d60d4db1cab1..64c0f31de723 100644 --- a/core/java/android/bluetooth/BluetoothAdapter.java +++ b/core/java/android/bluetooth/BluetoothAdapter.java @@ -1023,28 +1023,6 @@ public final class BluetoothAdapter { return null; } - /** - * enable or disable Bluetooth HCI snoop log. - * - *

Requires the {@link android.Manifest.permission#BLUETOOTH_ADMIN} - * permission - * - * @return true to indicate configure HCI log successfully, or false on - * immediate error - * @hide - */ - public boolean configHciSnoopLog(boolean enable) { - try { - mServiceLock.readLock().lock(); - if (mService != null) return mService.configHciSnoopLog(enable); - } catch (RemoteException e) { - Log.e(TAG, "", e); - } finally { - mServiceLock.readLock().unlock(); - } - return false; - } - /** * Factory reset bluetooth settings. * diff --git a/core/java/android/bluetooth/IBluetooth.aidl b/core/java/android/bluetooth/IBluetooth.aidl index b33781729b62..43c5ae4407c9 100644 --- a/core/java/android/bluetooth/IBluetooth.aidl +++ b/core/java/android/bluetooth/IBluetooth.aidl @@ -97,7 +97,6 @@ interface IBluetooth ParcelFileDescriptor connectSocket(in BluetoothDevice device, int type, in ParcelUuid uuid, int port, int flag); ParcelFileDescriptor createSocketChannel(int type, in String serviceName, in ParcelUuid uuid, int port, int flag); - boolean configHciSnoopLog(boolean enable); boolean factoryReset(); boolean isMultiAdvertisementSupported(); diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 024738a50d81..c7e72cfe6171 100755 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -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 */ diff --git a/core/tests/bluetoothtests/src/android/bluetooth/BluetoothInstrumentation.java b/core/tests/bluetoothtests/src/android/bluetooth/BluetoothInstrumentation.java index 411a3f894965..37b2a50ed670 100644 --- a/core/tests/bluetoothtests/src/android/bluetooth/BluetoothInstrumentation.java +++ b/core/tests/bluetoothtests/src/android/bluetooth/BluetoothInstrumentation.java @@ -72,8 +72,6 @@ public class BluetoothInstrumentation extends Instrumentation { getAddress(); } else if ("getBondedDevices".equals(command)) { getBondedDevices(); - } else if ("enableBtSnoop".equals(command)) { - enableBtSnoop(); } else { finish(null); } @@ -116,12 +114,6 @@ public class BluetoothInstrumentation extends Instrumentation { finish(mSuccessResult); } - public void enableBtSnoop() { - Assert.assertTrue("failed to enable snoop log", - getBluetoothAdapter().configHciSnoopLog(true)); - finish(mSuccessResult); - } - public void finish(Bundle result) { if (result == null) { result = new Bundle(); diff --git a/core/tests/coretests/src/android/provider/SettingsBackupTest.java b/core/tests/coretests/src/android/provider/SettingsBackupTest.java index 99909acb9c0a..689749e55e5c 100644 --- a/core/tests/coretests/src/android/provider/SettingsBackupTest.java +++ b/core/tests/coretests/src/android/provider/SettingsBackupTest.java @@ -402,7 +402,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 885573e86ac6..27e84e0c2814 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java @@ -978,9 +978,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); diff --git a/services/core/java/com/android/server/BluetoothManagerService.java b/services/core/java/com/android/server/BluetoothManagerService.java index 18b4571ca3ea..c785fb91e8ff 100644 --- a/services/core/java/com/android/server/BluetoothManagerService.java +++ b/services/core/java/com/android/server/BluetoothManagerService.java @@ -1494,16 +1494,6 @@ class BluetoothManagerService extends IBluetoothManager.Stub { if (mGetNameAddressOnly) return; } - try { - boolean enableHciSnoopLog = (Settings.Secure.getInt(mContentResolver, - Settings.Secure.BLUETOOTH_HCI_LOG, 0) == 1); - if (!mBluetooth.configHciSnoopLog(enableHciSnoopLog)) { - Slog.e(TAG,"IBluetooth.configHciSnoopLog return false"); - } - } catch (RemoteException e) { - Slog.e(TAG,"Unable to call configHciSnoopLog", e); - } - //Register callback object try { mBluetooth.registerCallback(mBluetoothCallback); -- cgit v1.2.3-59-g8ed1b