Merge "Limit btsnoop file size (4/8)"
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) {