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

Commit ea54167c authored Jan 31, 2018 by Myles Watson Committed by Jack He Feb 02, 2018

ProfileServices: Remove getName() overrides

Remove the overrides and make getName() public so that it
can be used in tests.

Bug: 70585142
Test: runtest bluetooth \
         -c com.android.bluetooth.btservice.ProfileServiceTest
Change-Id: Ic6005d7a33be144a7fdf9ad520c03e754abff401

parent b2c8b9b3

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

+0 −5

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

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

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

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

+0 −5

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

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

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

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

+0 −5

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

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

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

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

+1 −1

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

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

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

+0 −5

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

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

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