commit 9090f85a1252a21cc80ab9ba3c1dd984a596d7e0
author Ajay Panicker <apanicke@google.com> Mon Apr 17 20:46:29 2017 -0700
committer Ajay Panicker <apanicke@google.com> Thu Apr 27 00:15:16 2017 +0000
tree eb7688f39172d344d0258da44fe04c8918d604e0
parent 6c142b35b4b601da9e0fda3bb0600075307fe166

Limit btsnoop file size (4/8)

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

src/com/android/settings/DevelopmentSettings.java

diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java
index c3d2689..796b53f 100644
--- a/src/com/android/settings/DevelopmentSettings.java
+++ b/src/com/android/settings/DevelopmentSettings.java
@@ -204,6 +204,8 @@
                                     "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";
@@ -738,8 +740,8 @@
                 Settings.Global.BUGREPORT_IN_POWER_MENU, 0) != 0);
         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,
@@ -902,10 +904,8 @@
 
     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 boolean writeWebViewProviderOptions(Object newValue) {