From a253e1752fa2f9397883999fae2023cfd32db647 Mon Sep 17 00:00:00 2001 From: Ajay Panicker Date: Mon, 17 Apr 2017 20:46:29 -0700 Subject: [PATCH] Limit btsnoop file size (4/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 Merged-In: I94f8f6bc12ab3f7ff406c9392934ecb7209cd635 Change-Id: I94f8f6bc12ab3f7ff406c9392934ecb7209cd635 --- .../settings/development/DevelopmentSettings.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/com/android/settings/development/DevelopmentSettings.java b/src/com/android/settings/development/DevelopmentSettings.java index cf5d3a88fb4..e06c86990d5 100644 --- a/src/com/android/settings/development/DevelopmentSettings.java +++ b/src/com/android/settings/development/DevelopmentSettings.java @@ -205,6 +205,8 @@ public class DevelopmentSettings extends RestrictedSettingsFragment "persist.bluetooth.avrcpversion"; private static final String BLUETOOTH_ENABLE_INBAND_RINGING_PROPERTY = "persist.bluetooth.enableinbandringing"; + private static final String BLUETOOTH_BTSNOOP_ENABLE_PROPERTY = + "persist.bluetooth.btsnoopenable"; private static final String BLUETOOTH_ENABLE_INBAND_RINGING_KEY = "bluetooth_enable_inband_ringing"; private static final String BLUETOOTH_SELECT_AVRCP_VERSION_KEY = "bluetooth_select_avrcp_version"; @@ -758,8 +760,8 @@ public class DevelopmentSettings extends RestrictedSettingsFragment mHaveDebugSettings |= mTelephonyMonitorController.updatePreference(); updateSwitchPreference(mKeepScreenOn, Settings.Global.getInt(cr, Settings.Global.STAY_ON_WHILE_PLUGGED_IN, 0) != 0); - updateSwitchPreference(mBtHciSnoopLog, Settings.Secure.getInt(cr, - Settings.Secure.BLUETOOTH_HCI_LOG, 0) != 0); + updateSwitchPreference(mBtHciSnoopLog, SystemProperties.getBoolean( + BLUETOOTH_BTSNOOP_ENABLE_PROPERTY, false)); updateSwitchPreference(mDebugViewAttributes, Settings.Global.getInt(cr, Settings.Global.DEBUG_VIEW_ATTRIBUTES, 0) != 0); updateSwitchPreference(mForceAllowOnExternal, Settings.Global.getInt(cr, @@ -872,10 +874,8 @@ public class DevelopmentSettings extends RestrictedSettingsFragment private void writeBtHciSnoopLogOptions() { BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter(); - adapter.configHciSnoopLog(mBtHciSnoopLog.isChecked()); - Settings.Secure.putInt(getActivity().getContentResolver(), - Settings.Secure.BLUETOOTH_HCI_LOG, - mBtHciSnoopLog.isChecked() ? 1 : 0); + SystemProperties.set(BLUETOOTH_BTSNOOP_ENABLE_PROPERTY, + Boolean.toString(mBtHciSnoopLog.isChecked())); } private void writeDebuggerOptions() {