Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 408bcef4 authored by Ajay Panicker's avatar Ajay Panicker Committed by android-build-merger
Browse files

Merge "Limit btsnoop file size (4/8)" am: 7baae2a9 am: 7469ff3e 

am: 2151ee9b

Change-Id: I5199a59ae071fa654477e0b5d8968cddc87cff5a
parents fc656da9 2151ee9b

src/com/android/settings/development/DevelopmentSettings.java

+6 −6
Original line number Diff line number Diff line
@@ -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() {