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

Commit 6e7b0f06 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "SystemServer: Delete dead code isBleAppPresent" into main

parents c1c9d309 fe5368b8

service/aidl/android/bluetooth/IBluetoothManager.aidl

+0 −2
Original line number Original line Diff line number Diff line
@@ -55,8 +55,6 @@ interface IBluetoothManager 
    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)")

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)")

    boolean disableBle(in AttributionSource attributionSource, IBinder b);

    boolean disableBle(in AttributionSource attributionSource, IBinder b);

    @JavaPassthrough(annotation="@android.annotation.RequiresNoPermission")

    @JavaPassthrough(annotation="@android.annotation.RequiresNoPermission")

    boolean isBleAppPresent();

    @JavaPassthrough(annotation="@android.annotation.RequiresNoPermission")

    boolean isHearingAidProfileSupported();

    boolean isHearingAidProfileSupported();





    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED)")

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED)")

service/src/com/android/server/bluetooth/BluetoothManagerService.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -1065,7 +1065,7 @@ class BluetoothManagerService { 
        mBleApps.clear();

        mBleApps.clear();

    }

    }





    boolean isBleAppPresent() {

    private boolean isBleAppPresent() {

        Log.d(TAG, "isBleAppPresent(): Number of BLE app registered: " + mBleApps.size());

        Log.d(TAG, "isBleAppPresent(): Number of BLE app registered: " + mBleApps.size());

        return mBleApps.size() > 0;

        return mBleApps.size() > 0;

    }

    }

service/src/com/android/server/bluetooth/BluetoothServiceBinder.java

+0 −5
Original line number Original line Diff line number Diff line
@@ -283,11 +283,6 @@ class BluetoothServiceBinder extends IBluetoothManager.Stub { 
        return mBluetoothManagerService.disableBle(source.getPackageName(), token);

        return mBluetoothManagerService.disableBle(source.getPackageName(), token);

    }

    }





    @Override

    public boolean isBleAppPresent() {

        return mBluetoothManagerService.isBleAppPresent();

    }



    @Override

    @Override

    public boolean isHearingAidProfileSupported() {

    public boolean isHearingAidProfileSupported() {

        return mBluetoothManagerService.isHearingAidProfileSupported();

        return mBluetoothManagerService.isHearingAidProfileSupported();

service/tests/src/com/android/server/bluetooth/BluetoothServiceBinderTest.java

+0 −8
Original line number Original line Diff line number Diff line
@@ -328,14 +328,6 @@ public class BluetoothServiceBinderTest { 
        verifyMock();

        verifyMock();

    }

    }





    @Test

    public void isBleAppPresent() {

        // No permission needed for this call

        mBinder.isBleAppPresent();

        verify(mManagerService).isBleAppPresent();

        verifyMock();

    }



    @Test

    @Test

    public void isHearingAidProfileSupported() {

    public void isHearingAidProfileSupported() {

        // No permission needed for this call

        // No permission needed for this call