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

Commit 1211e53c authored by William Escande's avatar William Escande Committed by Gerrit Code Review
Browse files

Merge changes Ia6b9d8cd,I1b5df5c4,Ibc6e21b7,I2fe53581,Iaba3c599, ... into main 

* changes:
  BluetoothAdapter: App exception aren't from SystemServer
  BluetoothDevice: App exception aren't from SystemServer
  DistanceMeasurement: App exception aren't from SystemServer
  PbapClient: App exception aren't from SystemServer
  HeadsetClient: App exception aren't from SystemServer
  MapClient: App exception aren't from SystemServer
  HapClient: App exception aren't from SystemServer
  LeBroadcastAssistant: App exception aren't from SystemServer
  LeBroadcast: App exception aren't from SystemServer
  VolumeControl: App exception aren't from SystemServer
parents 5da20d02 f383021e

framework/java/android/bluetooth/BluetoothAdapter.java

+17 −17
Original line number Diff line number Diff line
@@ -1902,7 +1902,7 @@ public final class BluetoothAdapter { 
        } catch (TimeoutException e) {

            Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

            throw e.rethrowAsRuntimeException();

        } finally {

            mServiceLock.readLock().unlock();

        }
@@ -1952,7 +1952,7 @@ public final class BluetoothAdapter { 
        } catch (TimeoutException e) {

            Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

            throw e.rethrowAsRuntimeException();

        } finally {

            mServiceLock.readLock().unlock();

        }
@@ -1981,7 +1981,7 @@ public final class BluetoothAdapter { 
        } catch (TimeoutException e) {

            Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

            throw e.rethrowAsRuntimeException();

        } finally {

            mServiceLock.readLock().unlock();

        }
@@ -2028,7 +2028,7 @@ public final class BluetoothAdapter { 
        } catch (TimeoutException e) {

            Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

            throw e.rethrowAsRuntimeException();

        } finally {

            mServiceLock.readLock().unlock();

        }
@@ -2620,7 +2620,7 @@ public final class BluetoothAdapter { 
        } catch (TimeoutException e) {

            Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));

        } catch (RemoteException e) {

            e.rethrowFromSystemServer();

            throw e.rethrowAsRuntimeException();

        } finally {

            mServiceLock.readLock().unlock();

        }
@@ -2654,7 +2654,7 @@ public final class BluetoothAdapter { 
        } catch (TimeoutException e) {

            Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));

        } catch (RemoteException e) {

            e.rethrowFromSystemServer();

            throw e.rethrowAsRuntimeException();

        } finally {

            mServiceLock.readLock().unlock();

        }
@@ -2689,7 +2689,7 @@ public final class BluetoothAdapter { 
        } catch (TimeoutException e) {

            Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));

        } catch (RemoteException e) {

            e.rethrowFromSystemServer();

            throw e.rethrowAsRuntimeException();

        } finally {

            mServiceLock.readLock().unlock();

        }
@@ -2727,7 +2727,7 @@ public final class BluetoothAdapter { 
        } catch (TimeoutException e) {

            Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));

        } catch (RemoteException e) {

            e.rethrowFromSystemServer();

            throw e.rethrowAsRuntimeException();

        } finally {

            mServiceLock.readLock().unlock();

        }
@@ -4252,14 +4252,14 @@ public final class BluetoothAdapter { 
                try {

                    sService = mManagerService.registerAdapter(sManagerCallback);

                } catch (RemoteException e) {

                    throw e.rethrowFromSystemServer();

                    throw e.rethrowAsRuntimeException();

                }

            } else {

                try {

                    mManagerService.unregisterAdapter(sManagerCallback);

                    sService = null;

                } catch (RemoteException e) {

                    throw e.rethrowFromSystemServer();

                    throw e.rethrowAsRuntimeException();

                }

            }

            sServiceRegistered = wantRegistered;
@@ -5058,7 +5058,7 @@ public final class BluetoothAdapter { 
            }

        } catch (RemoteException e) {

            Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));

            throw e.rethrowFromSystemServer();

            throw e.rethrowAsRuntimeException();

        } catch (TimeoutException e) {

            Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));

        } finally {
@@ -5123,7 +5123,7 @@ public final class BluetoothAdapter { 
            }

        } catch (RemoteException e) {

            Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));

            throw e.rethrowFromSystemServer();

            throw e.rethrowAsRuntimeException();

        } catch (TimeoutException e) {

            Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));

        } finally {
@@ -5186,7 +5186,7 @@ public final class BluetoothAdapter { 
            }

        } catch (RemoteException e) {

            Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));

            throw e.rethrowFromSystemServer();

            throw e.rethrowAsRuntimeException();

        } catch (TimeoutException e) {

            Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));

        } finally {
@@ -5271,7 +5271,7 @@ public final class BluetoothAdapter { 
                                .getValue(defaultValue);

                    }

                } catch (RemoteException e) {

                    throw e.rethrowFromSystemServer();

                    throw e.rethrowAsRuntimeException();

                } catch (TimeoutException e) {

                    Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));

                } finally {
@@ -5352,7 +5352,7 @@ public final class BluetoothAdapter { 
        } catch (TimeoutException e) {

            Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

            throw e.rethrowAsRuntimeException();

        } finally {

            mServiceLock.readLock().unlock();

        }
@@ -5470,7 +5470,7 @@ public final class BluetoothAdapter { 
                                .getValue(defaultValue);

                    }

                } catch (RemoteException e) {

                    throw e.rethrowFromSystemServer();

                    throw e.rethrowAsRuntimeException();

                } catch (TimeoutException e) {

                    Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));

                } finally {
@@ -5550,7 +5550,7 @@ public final class BluetoothAdapter { 
        } catch (TimeoutException e) {

            Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

            throw e.rethrowAsRuntimeException();

        } finally {

            mServiceLock.readLock().unlock();

        }

framework/java/android/bluetooth/BluetoothDevice.java

+4 −4
Original line number Diff line number Diff line
@@ -1765,7 +1765,7 @@ public final class BluetoothDevice implements Parcelable, Attributable { 
                Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));

            } catch (RemoteException e) {

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

                throw e.rethrowFromSystemServer();

                throw e.rethrowAsRuntimeException();

            }

        }

        return defaultValue;
@@ -2202,7 +2202,7 @@ public final class BluetoothDevice implements Parcelable, Attributable { 
                Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));

            } catch (RemoteException e) {

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

                throw e.rethrowFromSystemServer();

                throw e.rethrowAsRuntimeException();

            }

        }

        return defaultValue;
@@ -2249,7 +2249,7 @@ public final class BluetoothDevice implements Parcelable, Attributable { 
                Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));

            } catch (RemoteException e) {

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

                throw e.rethrowFromSystemServer();

                throw e.rethrowAsRuntimeException();

            }

        }

        return defaultValue;
@@ -3497,7 +3497,7 @@ public final class BluetoothDevice implements Parcelable, Attributable { 
                Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));

            } catch (RemoteException e) {

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

                throw e.rethrowFromSystemServer();

                throw e.rethrowAsRuntimeException();

            }

        }

        return defaultValue;

framework/java/android/bluetooth/BluetoothHapClient.java

+21 −21
Original line number Diff line number Diff line
@@ -591,7 +591,7 @@ public final class BluetoothHapClient implements BluetoothProfile, AutoCloseable 
                } catch (TimeoutException e) {

                    Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));

                } catch (RemoteException e) {

                    throw e.rethrowFromSystemServer();

                    throw e.rethrowAsRuntimeException();

                }

            }
@@ -644,7 +644,7 @@ public final class BluetoothHapClient implements BluetoothProfile, AutoCloseable 
            } catch (TimeoutException e) {

                Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));

            } catch (RemoteException e) {

                throw e.rethrowFromSystemServer();

                throw e.rethrowAsRuntimeException();

            }

        }

    }
@@ -686,7 +686,7 @@ public final class BluetoothHapClient implements BluetoothProfile, AutoCloseable 
            } catch (TimeoutException e) {

                Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));

            } catch (RemoteException e) {

                throw e.rethrowFromSystemServer();

                throw e.rethrowAsRuntimeException();

            }

        }

        return defaultValue;
@@ -725,7 +725,7 @@ public final class BluetoothHapClient implements BluetoothProfile, AutoCloseable 
            } catch (TimeoutException e) {

                Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));

            } catch (RemoteException e) {

                throw e.rethrowFromSystemServer();

                throw e.rethrowAsRuntimeException();

            }

        }

        return defaultValue;
@@ -759,7 +759,7 @@ public final class BluetoothHapClient implements BluetoothProfile, AutoCloseable 
            } catch (TimeoutException e) {

                Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));

            } catch (RemoteException e) {

                throw e.rethrowFromSystemServer();

                throw e.rethrowAsRuntimeException();

            }

        }

        return defaultValue;
@@ -794,7 +794,7 @@ public final class BluetoothHapClient implements BluetoothProfile, AutoCloseable 
            } catch (TimeoutException e) {

                Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));

            } catch (RemoteException e) {

                throw e.rethrowFromSystemServer();

                throw e.rethrowAsRuntimeException();

            }

        }

        return defaultValue;
@@ -827,7 +827,7 @@ public final class BluetoothHapClient implements BluetoothProfile, AutoCloseable 
            } catch (TimeoutException e) {

                Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));

            } catch (RemoteException e) {

                throw e.rethrowFromSystemServer();

                throw e.rethrowAsRuntimeException();

            }

        }

        return defaultValue;
@@ -869,7 +869,7 @@ public final class BluetoothHapClient implements BluetoothProfile, AutoCloseable 
            } catch (TimeoutException e) {

                Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));

            } catch (RemoteException e) {

                throw e.rethrowFromSystemServer();

                throw e.rethrowAsRuntimeException();

            }

        }

        return defaultValue;
@@ -901,7 +901,7 @@ public final class BluetoothHapClient implements BluetoothProfile, AutoCloseable 
            } catch (TimeoutException e) {

                Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));

            } catch (RemoteException e) {

                throw e.rethrowFromSystemServer();

                throw e.rethrowAsRuntimeException();

            }

        }

        return defaultValue;
@@ -936,7 +936,7 @@ public final class BluetoothHapClient implements BluetoothProfile, AutoCloseable 
            } catch (TimeoutException e) {

                Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));

            } catch (RemoteException e) {

                throw e.rethrowFromSystemServer();

                throw e.rethrowAsRuntimeException();

            }

        }
@@ -969,7 +969,7 @@ public final class BluetoothHapClient implements BluetoothProfile, AutoCloseable 
            try {

                service.selectPreset(device, presetIndex, mAttributionSource);

            } catch (RemoteException e) {

                throw e.rethrowFromSystemServer();

                throw e.rethrowAsRuntimeException();

            }

        }

    }
@@ -1005,7 +1005,7 @@ public final class BluetoothHapClient implements BluetoothProfile, AutoCloseable 
            try {

                service.selectPresetForGroup(groupId, presetIndex, mAttributionSource);

            } catch (RemoteException e) {

                throw e.rethrowFromSystemServer();

                throw e.rethrowAsRuntimeException();

            }

        }

    }
@@ -1033,7 +1033,7 @@ public final class BluetoothHapClient implements BluetoothProfile, AutoCloseable 
            try {

                service.switchToNextPreset(device, mAttributionSource);

            } catch (RemoteException e) {

                throw e.rethrowFromSystemServer();

                throw e.rethrowAsRuntimeException();

            }

        }

    }
@@ -1063,7 +1063,7 @@ public final class BluetoothHapClient implements BluetoothProfile, AutoCloseable 
            try {

                service.switchToNextPresetForGroup(groupId, mAttributionSource);

            } catch (RemoteException e) {

                throw e.rethrowFromSystemServer();

                throw e.rethrowAsRuntimeException();

            }

        }

    }
@@ -1091,7 +1091,7 @@ public final class BluetoothHapClient implements BluetoothProfile, AutoCloseable 
            try {

                service.switchToPreviousPreset(device, mAttributionSource);

            } catch (RemoteException e) {

                throw e.rethrowFromSystemServer();

                throw e.rethrowAsRuntimeException();

            }

        }

    }
@@ -1121,7 +1121,7 @@ public final class BluetoothHapClient implements BluetoothProfile, AutoCloseable 
            try {

                service.switchToPreviousPresetForGroup(groupId, mAttributionSource);

            } catch (RemoteException e) {

                throw e.rethrowFromSystemServer();

                throw e.rethrowAsRuntimeException();

            }

        }

    }
@@ -1155,7 +1155,7 @@ public final class BluetoothHapClient implements BluetoothProfile, AutoCloseable 
            } catch (TimeoutException e) {

                Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));

            } catch (RemoteException e) {

                throw e.rethrowFromSystemServer();

                throw e.rethrowAsRuntimeException();

            }

        }

        return defaultValue;
@@ -1189,7 +1189,7 @@ public final class BluetoothHapClient implements BluetoothProfile, AutoCloseable 
            } catch (TimeoutException e) {

                Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));

            } catch (RemoteException e) {

                throw e.rethrowFromSystemServer();

                throw e.rethrowAsRuntimeException();

            }

        }

        return defaultValue;
@@ -1221,7 +1221,7 @@ public final class BluetoothHapClient implements BluetoothProfile, AutoCloseable 
            } catch (TimeoutException e) {

                Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));

            } catch (RemoteException e) {

                throw e.rethrowFromSystemServer();

                throw e.rethrowAsRuntimeException();

            }

        }

        return defaultValue;
@@ -1348,7 +1348,7 @@ public final class BluetoothHapClient implements BluetoothProfile, AutoCloseable 
            try {

                service.setPresetName(device, presetIndex, name, mAttributionSource);

            } catch (RemoteException e) {

                throw e.rethrowFromSystemServer();

                throw e.rethrowAsRuntimeException();

            }

        }

    }
@@ -1383,7 +1383,7 @@ public final class BluetoothHapClient implements BluetoothProfile, AutoCloseable 
            try {

                service.setPresetNameForGroup(groupId, presetIndex, name, mAttributionSource);

            } catch (RemoteException e) {

                throw e.rethrowFromSystemServer();

                throw e.rethrowAsRuntimeException();

            }

        }

    }

framework/java/android/bluetooth/BluetoothHeadsetClient.java

+5 −5
Original line number Diff line number Diff line
@@ -873,7 +873,7 @@ public final class BluetoothHeadsetClient implements BluetoothProfile, AutoClose 
                        mAttributionSource);

            } catch (RemoteException e) {

                Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));

                throw e.rethrowFromSystemServer();

                throw e.rethrowAsRuntimeException();

            } catch (TimeoutException e) {

                Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));

            }
@@ -910,7 +910,7 @@ public final class BluetoothHeadsetClient implements BluetoothProfile, AutoClose 
                        mAttributionSource);

            } catch (RemoteException e) {

                Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));

                throw e.rethrowFromSystemServer();

                throw e.rethrowAsRuntimeException();

            } catch (TimeoutException e) {

                Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));

            }
@@ -943,7 +943,7 @@ public final class BluetoothHeadsetClient implements BluetoothProfile, AutoClose 
                return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue);

            } catch (RemoteException e) {

                Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));

                throw e.rethrowFromSystemServer();

                throw e.rethrowAsRuntimeException();

            } catch (TimeoutException e) {

                Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));

            }
@@ -1004,7 +1004,7 @@ public final class BluetoothHeadsetClient implements BluetoothProfile, AutoClose 
                return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue);

            } catch (RemoteException e) {

                Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));

                throw e.rethrowFromSystemServer();

                throw e.rethrowAsRuntimeException();

            } catch (TimeoutException e) {

                Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));

            }
@@ -1062,7 +1062,7 @@ public final class BluetoothHeadsetClient implements BluetoothProfile, AutoClose 
                return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue);

            } catch (RemoteException e) {

                Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));

                throw e.rethrowFromSystemServer();

                throw e.rethrowAsRuntimeException();

            } catch (TimeoutException e) {

                Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));

            }

framework/java/android/bluetooth/BluetoothLeBroadcast.java

+12 −12
Original line number Diff line number Diff line
@@ -449,7 +449,7 @@ public final class BluetoothLeBroadcast implements AutoCloseable, BluetoothProfi 
                } catch (TimeoutException e) {

                    Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));

                } catch (RemoteException e) {

                    throw e.rethrowFromSystemServer();

                    throw e.rethrowAsRuntimeException();

                }

            }
@@ -502,7 +502,7 @@ public final class BluetoothLeBroadcast implements AutoCloseable, BluetoothProfi 
            } catch (TimeoutException | IllegalStateException e) {

                Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));

            } catch (RemoteException e) {

                throw e.rethrowFromSystemServer();

                throw e.rethrowAsRuntimeException();

            }

        }

    }
@@ -574,7 +574,7 @@ public final class BluetoothLeBroadcast implements AutoCloseable, BluetoothProfi 
            } catch (TimeoutException e) {

                Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));

            } catch (RemoteException e) {

                throw e.rethrowFromSystemServer();

                throw e.rethrowAsRuntimeException();

            } catch (SecurityException e) {

                throw e;

            }
@@ -614,7 +614,7 @@ public final class BluetoothLeBroadcast implements AutoCloseable, BluetoothProfi 
            } catch (TimeoutException e) {

                Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));

            } catch (RemoteException e) {

                throw e.rethrowFromSystemServer();

                throw e.rethrowAsRuntimeException();

            } catch (SecurityException e) {

                throw e;

            }
@@ -663,7 +663,7 @@ public final class BluetoothLeBroadcast implements AutoCloseable, BluetoothProfi 
            } catch (TimeoutException e) {

                Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));

            } catch (RemoteException e) {

                throw e.rethrowFromSystemServer();

                throw e.rethrowAsRuntimeException();

            } catch (SecurityException e) {

                throw e;

            }
@@ -709,7 +709,7 @@ public final class BluetoothLeBroadcast implements AutoCloseable, BluetoothProfi 
            } catch (TimeoutException e) {

                Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));

            } catch (RemoteException e) {

                throw e.rethrowFromSystemServer();

                throw e.rethrowAsRuntimeException();

            } catch (SecurityException e) {

                throw e;

            }
@@ -751,7 +751,7 @@ public final class BluetoothLeBroadcast implements AutoCloseable, BluetoothProfi 
            } catch (TimeoutException e) {

                Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));

            } catch (RemoteException e) {

                throw e.rethrowFromSystemServer();

                throw e.rethrowAsRuntimeException();

            } catch (SecurityException e) {

                throw e;

            }
@@ -786,7 +786,7 @@ public final class BluetoothLeBroadcast implements AutoCloseable, BluetoothProfi 
            } catch (TimeoutException e) {

                Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));

            } catch (RemoteException e) {

                throw e.rethrowFromSystemServer();

                throw e.rethrowAsRuntimeException();

            }

        }

        return defaultValue;
@@ -820,7 +820,7 @@ public final class BluetoothLeBroadcast implements AutoCloseable, BluetoothProfi 
            } catch (TimeoutException e) {

                Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));

            } catch (RemoteException e) {

                throw e.rethrowFromSystemServer();

                throw e.rethrowAsRuntimeException();

            }

        }

        return defaultValue;
@@ -848,7 +848,7 @@ public final class BluetoothLeBroadcast implements AutoCloseable, BluetoothProfi 
            } catch (TimeoutException e) {

                Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));

            } catch (RemoteException e) {

                throw e.rethrowFromSystemServer();

                throw e.rethrowAsRuntimeException();

            }

        }

        return defaultValue;
@@ -877,7 +877,7 @@ public final class BluetoothLeBroadcast implements AutoCloseable, BluetoothProfi 
            } catch (TimeoutException e) {

                Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));

            } catch (RemoteException e) {

                throw e.rethrowFromSystemServer();

                throw e.rethrowAsRuntimeException();

            }

        }

        return defaultValue;
@@ -909,7 +909,7 @@ public final class BluetoothLeBroadcast implements AutoCloseable, BluetoothProfi 
            } catch (TimeoutException e) {

                Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));

            } catch (RemoteException e) {

                throw e.rethrowFromSystemServer();

                throw e.rethrowAsRuntimeException();

            }

        }

        return defaultValue;