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

Commit a7ad6f25 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes I7bce5ca0,I0774ac8d,I3ab9d5f0 into main am: abe0a103 am: 84278dd9 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/3315797



Change-Id: Ie95f0a551f525aff8d4648ad06cb249e0038159d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c1f0025b 84278dd9

framework/java/android/bluetooth/BluetoothAdapter.java

+11 −23
Original line number Diff line number Diff line
@@ -1403,9 +1403,8 @@ public final class BluetoothAdapter { 
        try {

            return mManagerService.disableBle(mAttributionSource, mToken);

        } catch (RemoteException e) {

            Log.e(TAG, "", e);

            throw e.rethrowFromSystemServer();

        }

        return false;

    }



    /**
@@ -1447,10 +1446,8 @@ public final class BluetoothAdapter { 
        try {

            return mManagerService.enableBle(mAttributionSource, mToken);

        } catch (RemoteException e) {

            Log.e(TAG, "", e);

            throw e.rethrowFromSystemServer();

        }



        return false;

    }



    /**
@@ -1686,9 +1683,8 @@ public final class BluetoothAdapter { 
        try {

            return mManagerService.enable(mAttributionSource);

        } catch (RemoteException e) {

            Log.e(TAG, "", e);

            throw e.rethrowFromSystemServer();

        }

        return false;

    }



    /**
@@ -1751,9 +1747,8 @@ public final class BluetoothAdapter { 
        try {

            return mManagerService.disable(mAttributionSource, persist);

        } catch (RemoteException e) {

            Log.e(TAG, "", e);

            throw e.rethrowFromSystemServer();

        }

        return false;

    }



    /**
@@ -1770,9 +1765,8 @@ public final class BluetoothAdapter { 
        try {

            return mManagerService.getAddress(mAttributionSource);

        } catch (RemoteException e) {

            Log.e(TAG, "", e);

            throw e.rethrowFromSystemServer();

        }

        return null;

    }



    /**
@@ -1789,9 +1783,8 @@ public final class BluetoothAdapter { 
        try {

            return mManagerService.getName(mAttributionSource);

        } catch (RemoteException e) {

            Log.e(TAG, "", e);

            throw e.rethrowFromSystemServer();

        }

        return null;

    }



    /** @hide */
@@ -2396,8 +2389,7 @@ public final class BluetoothAdapter { 
        try {

            return mManagerService.isBleScanAvailable();

        } catch (RemoteException e) {

            Log.e(TAG, "remote exception when calling isBleScanAvailable", e);

            return false;

            throw e.rethrowFromSystemServer();

        }

    }
@@ -2744,8 +2736,7 @@ public final class BluetoothAdapter { 
        try {

            return mManagerService.isHearingAidProfileSupported();

        } catch (RemoteException e) {

            Log.e(TAG, "remote exception when calling isHearingAidProfileSupported", e);

            return false;

            throw e.rethrowFromSystemServer();

        }

    }
@@ -3924,9 +3915,8 @@ public final class BluetoothAdapter { 
        try {

            return mManagerService.enableNoAutoConnect(mAttributionSource);

        } catch (RemoteException e) {

            Log.e(TAG, "", e);

            throw e.rethrowFromSystemServer();

        }

        return false;

    }



    /** @hide */
@@ -5375,9 +5365,8 @@ public final class BluetoothAdapter { 
        try {

            return mManagerService.setBtHciSnoopLogMode(mode);

        } catch (RemoteException e) {

            Log.e(TAG, "", e);

            throw e.rethrowFromSystemServer();

        }

        return BluetoothStatusCodes.ERROR_UNKNOWN;

    }



    /**
@@ -5393,9 +5382,8 @@ public final class BluetoothAdapter { 
        try {

            return mManagerService.getBtHciSnoopLogMode();

        } catch (RemoteException e) {

            Log.e(TAG, "", e);

            throw e.rethrowFromSystemServer();

        }

        return BT_SNOOP_LOG_MODE_DISABLED;

    }



    /**

framework/java/android/bluetooth/BluetoothHapClient.java

+142 −208

File changed.

Preview size limit exceeded, changes collapsed.

framework/java/android/bluetooth/BluetoothUtils.java

+84 −0

File changed.

Preview size limit exceeded, changes collapsed.