PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Limit btsnoop file size (4/8)" am: 7baae2a924

Browse Source 
am: 7469ff3e1c

Change-Id: I34175cce212bd5c291481bee5758501b741f197c
This commit is contained in:
Ajay Panicker
2017-04-27 17:08:48 +00:00
committed by android-build-merger
parent 4ccf08c6d4 7469ff3e1c
commit 2151ee9b86
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/android/settings/DevelopmentSettings.java
View File

@@ -204,6 +204,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";
@@ -738,8 +740,8 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
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 @@ 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 boolean writeWebViewProviderOptions(Object newValue) {