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

Commit 4d1fb218 authored by Ajay Panicker's avatar Ajay Panicker Committed by Android (Google) Code Review
Browse files

Merge "Limit btsnoop file size (3/9)" into oc-dev

parents af4bfcdb 4d714375

core/java/android/bluetooth/BluetoothAdapter.java

+0 −22
Original line number Diff line number Diff line
@@ -1023,28 +1023,6 @@ public final class BluetoothAdapter { 
        return null;

    }



    /**

     * enable or disable Bluetooth HCI snoop log.

     *

     * <p>Requires the {@link android.Manifest.permission#BLUETOOTH_ADMIN}

     * permission

     *

     * @return true to indicate configure HCI log successfully, or false on

     *         immediate error

     * @hide

     */

    public boolean configHciSnoopLog(boolean enable) {

        try {

            mServiceLock.readLock().lock();

            if (mService != null) return mService.configHciSnoopLog(enable);

        } catch (RemoteException e) {

            Log.e(TAG, "", e);

        } finally {

            mServiceLock.readLock().unlock();

        }

        return false;

    }



    /**

     * Factory reset bluetooth settings.

     *

core/java/android/bluetooth/IBluetooth.aidl

+0 −1
Original line number Diff line number Diff line
@@ -97,7 +97,6 @@ interface IBluetooth 
    ParcelFileDescriptor connectSocket(in BluetoothDevice device, int type, in ParcelUuid uuid, int port, int flag);

    ParcelFileDescriptor createSocketChannel(int type, in String serviceName, in ParcelUuid uuid, int port, int flag);



    boolean configHciSnoopLog(boolean enable);

    boolean factoryReset();



    boolean isMultiAdvertisementSupported();

core/java/android/provider/Settings.java

+0 −7
Original line number Diff line number Diff line
@@ -5175,13 +5175,6 @@ public final class Settings { 
        @TestApi

        public static final String AUTOFILL_SERVICE = "autofill_service";



        /**

         * bluetooth HCI snoop log configuration

         * @hide

         */

        public static final String BLUETOOTH_HCI_LOG =

                "bluetooth_hci_log";



        /**

         * @deprecated Use {@link android.provider.Settings.Global#DEVICE_PROVISIONED} instead

         */

core/tests/bluetoothtests/src/android/bluetooth/BluetoothInstrumentation.java

+0 −8
Original line number Diff line number Diff line
@@ -72,8 +72,6 @@ public class BluetoothInstrumentation extends Instrumentation { 
            getAddress();

        } else if ("getBondedDevices".equals(command)) {

            getBondedDevices();

        } else if ("enableBtSnoop".equals(command)) {

            enableBtSnoop();

        } else {

            finish(null);

        }
@@ -116,12 +114,6 @@ public class BluetoothInstrumentation extends Instrumentation { 
        finish(mSuccessResult);

    }



    public void enableBtSnoop() {

        Assert.assertTrue("failed to enable snoop log",

                getBluetoothAdapter().configHciSnoopLog(true));

        finish(mSuccessResult);

    }



    public void finish(Bundle result) {

        if (result == null) {

            result = new Bundle();

core/tests/coretests/src/android/provider/SettingsBackupTest.java

+0 −1
Original line number Diff line number Diff line
@@ -404,7 +404,6 @@ public class SettingsBackupTest { 
                 Settings.Secure.BACKUP_ENABLED,

                 Settings.Secure.BACKUP_PROVISIONED,

                 Settings.Secure.BACKUP_TRANSPORT,

                 Settings.Secure.BLUETOOTH_HCI_LOG,

                 Settings.Secure.CARRIER_APPS_HANDLED,

                 Settings.Secure.CMAS_ADDITIONAL_BROADCAST_PKG,

                 Settings.Secure.COMPLETED_CATEGORY_PREFIX,