Merge "Limit btsnoop file size (3/8)" am: 37cad12cb1 (c1da2a03) · Commits · e / os / android_frameworks_base

core/java/android/bluetooth/BluetoothAdapter.java

+0 −22

Original line number	Diff line number	Diff line
		@@ -1031,28 +1031,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.
		*

+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();

+0 −7

Original line number	Diff line number	Diff line
		@@ -4719,13 +4719,6 @@ public final class Settings {
		@TestApi
		public static final String VOICE_INTERACTION_SERVICE = "voice_interaction_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
		*/

+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();

+0 −10

Original line number	Diff line number	Diff line
		@@ -1496,16 +1496,6 @@ class BluetoothManagerService extends IBluetoothManager.Stub {
		if (mGetNameAddressOnly) return;
		}

		try {
		boolean enableHciSnoopLog = (Settings.Secure.getInt(mContentResolver,
		Settings.Secure.BLUETOOTH_HCI_LOG, 0) == 1);
		if (!mBluetooth.configHciSnoopLog(enableHciSnoopLog)) {
		Slog.e(TAG,"IBluetooth.configHciSnoopLog return false");
		}
		} catch (RemoteException e) {
		Slog.e(TAG,"Unable to call configHciSnoopLog", e);
		}

		//Register callback object
		try {
		mBluetooth.registerCallback(mBluetoothCallback);