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

Commit 78137209 authored by Myles Watson's avatar Myles Watson Committed by android-build-merger
Browse files

Merge "ProfileServices: Remove getName() overrides" am: 7d1e581b 

am: b0c8cd00

Change-Id: I760d3dbd3cd586571b0fa52df708f88719d9e93d
parents 2a70cd3a b0c8cd00

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