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

Commit 0115fe3b authored Feb 02, 2018 by Treehugger Robot Committed by Gerrit Code Review Feb 02, 2018

Merge "ProfileServices: Remove getName() overrides"

parents 23069485 42c9d3c5

src/com/android/bluetooth/a2dp/A2dpService.java

+0 −5

Original line number	Original line	Diff line number	Diff line
	@@ -91,11 +91,6 @@ public class A2dpService extends ProfileService {
	BluetoothUuid.AudioSource, BluetoothUuid.AudioSink		BluetoothUuid.AudioSource, BluetoothUuid.AudioSink
	};		};

	@Override
	protected String getName() {
	return TAG;
	}

	@Override		@Override
	protected IProfileServiceBinder initBinder() {		protected IProfileServiceBinder initBinder() {
	return new BluetoothA2dpBinder(this);		return new BluetoothA2dpBinder(this);

src/com/android/bluetooth/a2dpsink/A2dpSinkService.java

+0 −5

Original line number	Original line	Diff line number	Diff line
	@@ -43,11 +43,6 @@ public class A2dpSinkService extends ProfileService {
	private A2dpSinkStateMachine mStateMachine;		private A2dpSinkStateMachine mStateMachine;
	private static A2dpSinkService sA2dpSinkService;		private static A2dpSinkService sA2dpSinkService;

	@Override
	protected String getName() {
	return TAG;
	}

	@Override		@Override
	protected IProfileServiceBinder initBinder() {		protected IProfileServiceBinder initBinder() {
	return new BluetoothA2dpSinkBinder(this);		return new BluetoothA2dpSinkBinder(this);

src/com/android/bluetooth/avrcpcontroller/AvrcpControllerService.java

+0 −5

Original line number	Original line	Diff line number	Diff line
	@@ -204,11 +204,6 @@ public class AvrcpControllerService extends ProfileService {
	initNative();		initNative();
	}		}

	@Override
	protected String getName() {
	return TAG;
	}

	@Override		@Override
	protected IProfileServiceBinder initBinder() {		protected IProfileServiceBinder initBinder() {
	return new BluetoothAvrcpControllerBinder(this);		return new BluetoothAvrcpControllerBinder(this);

src/com/android/bluetooth/btservice/ProfileService.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -60,7 +60,7 @@ public abstract class ProfileService extends Service {
	private BroadcastReceiver mUserSwitchedReceiver;		private BroadcastReceiver mUserSwitchedReceiver;
	private boolean mProfileStarted = false;		private boolean mProfileStarted = false;

	protected String getName() {		public String getName() {
	return getClass().getSimpleName();		return getClass().getSimpleName();
	}		}

src/com/android/bluetooth/gatt/GattService.java

+0 −5

Original line number	Original line	Diff line number	Diff line
	@@ -180,11 +180,6 @@ public class GattService extends ProfileService {
	classInitNative();		classInitNative();
	}		}

	@Override
	protected String getName() {
	return TAG;
	}

	@Override		@Override
	protected IProfileServiceBinder initBinder() {		protected IProfileServiceBinder initBinder() {
	return new BluetoothGattBinder(this);		return new BluetoothGattBinder(this);