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

Commit eb96000d authored by William Escande's avatar William Escande Committed by Automerger Merge Worker
Browse files

Merge changes Id89076ad,Idfb7ae66,I617c2868,Ie2ed38e5,Ia75654e3 into main am: 1a036731 

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



Change-Id: Iec2ec4f3d41f7d25d18288fac755fda3c218ecaf
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5fdf72e6 1a036731

framework/java/android/bluetooth/BluetoothCsipSetCoordinator.java

+9 −9
Original line number Diff line number Diff line
@@ -285,7 +285,7 @@ public final class BluetoothCsipSetCoordinator implements BluetoothProfile, Auto 
            } catch (TimeoutException e) {

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

            } catch (RemoteException e) {

                e.rethrowFromSystemServer();

                throw e.rethrowAsRuntimeException();

            }

        }

        return defaultValue;
@@ -318,7 +318,7 @@ public final class BluetoothCsipSetCoordinator implements BluetoothProfile, Auto 
            } catch (TimeoutException e) {

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

            } catch (RemoteException e) {

                e.rethrowFromSystemServer();

                throw e.rethrowAsRuntimeException();

            }

        }

        return defaultValue;
@@ -349,7 +349,7 @@ public final class BluetoothCsipSetCoordinator implements BluetoothProfile, Auto 
            } catch (TimeoutException e) {

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

            } catch (RemoteException e) {

                e.rethrowFromSystemServer();

                throw e.rethrowAsRuntimeException();

            }

        }

        return defaultValue;
@@ -380,7 +380,7 @@ public final class BluetoothCsipSetCoordinator implements BluetoothProfile, Auto 
            } catch (TimeoutException e) {

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

            } catch (RemoteException e) {

                e.rethrowFromSystemServer();

                throw e.rethrowAsRuntimeException();

            }

        }

        return defaultValue;
@@ -406,7 +406,7 @@ public final class BluetoothCsipSetCoordinator implements BluetoothProfile, Auto 
            } catch (TimeoutException e) {

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

            } catch (RemoteException e) {

                e.rethrowFromSystemServer();

                throw e.rethrowAsRuntimeException();

            }

        }

        return defaultValue;
@@ -433,7 +433,7 @@ public final class BluetoothCsipSetCoordinator implements BluetoothProfile, Auto 
            } catch (TimeoutException e) {

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

            } catch (RemoteException e) {

                e.rethrowFromSystemServer();

                throw e.rethrowAsRuntimeException();

            }

        }

        return defaultValue;
@@ -459,7 +459,7 @@ public final class BluetoothCsipSetCoordinator implements BluetoothProfile, Auto 
            } catch (TimeoutException e) {

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

            } catch (RemoteException e) {

                e.rethrowFromSystemServer();

                throw e.rethrowAsRuntimeException();

            }

        }

        return defaultValue;
@@ -498,7 +498,7 @@ public final class BluetoothCsipSetCoordinator implements BluetoothProfile, Auto 
            } catch (TimeoutException e) {

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

            } catch (RemoteException e) {

                e.rethrowFromSystemServer();

                throw e.rethrowAsRuntimeException();

            }

        }

        return defaultValue;
@@ -533,7 +533,7 @@ public final class BluetoothCsipSetCoordinator implements BluetoothProfile, Auto 
            } catch (TimeoutException e) {

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

            } catch (RemoteException e) {

                e.rethrowFromSystemServer();

                throw e.rethrowAsRuntimeException();

            }

        }

        return defaultValue;

framework/java/android/bluetooth/BluetoothGatt.java

+2 −2
Original line number Diff line number Diff line
@@ -1498,7 +1498,7 @@ public final class BluetoothGatt implements BluetoothProfile { 
            synchronized (mDeviceBusyLock) {

                mDeviceBusy = false;

            }

            throw e.rethrowFromSystemServer();

            throw e.rethrowAsRuntimeException();

        }



        return requestStatus;
@@ -1641,7 +1641,7 @@ public final class BluetoothGatt implements BluetoothProfile { 
            synchronized (mDeviceBusyLock) {

                mDeviceBusy = false;

            }

            e.rethrowFromSystemServer();

            throw e.rethrowAsRuntimeException();

        }

        return BluetoothStatusCodes.ERROR_UNKNOWN;

    }

framework/java/android/bluetooth/BluetoothGattServer.java

+1 −1
Original line number Diff line number Diff line
@@ -855,7 +855,7 @@ public final class BluetoothGattServer implements BluetoothProfile { 
            return BluetoothStatusCodes.ERROR_PROFILE_SERVICE_NOT_BOUND;

        } catch (RemoteException e) {

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

            throw e.rethrowFromSystemServer();

            throw e.rethrowAsRuntimeException();

        }

    }

framework/java/android/bluetooth/BluetoothHeadset.java

+5 −5
Original line number Diff line number Diff line
@@ -852,7 +852,7 @@ public final class BluetoothHeadset implements BluetoothProfile { 
                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()));

                return BluetoothStatusCodes.ERROR_TIMEOUT;
@@ -919,7 +919,7 @@ public final class BluetoothHeadset implements BluetoothProfile { 
                return BluetoothStatusCodes.ERROR_TIMEOUT;

            } catch (RemoteException e) {

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

                e.rethrowFromSystemServer();

                throw e.rethrowAsRuntimeException();

            }

        }
@@ -959,7 +959,7 @@ public final class BluetoothHeadset implements BluetoothProfile { 
                return BluetoothStatusCodes.ERROR_TIMEOUT;

            } catch (RemoteException e) {

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

                e.rethrowFromSystemServer();

                throw e.rethrowAsRuntimeException();

            }

        }
@@ -1044,7 +1044,7 @@ public final class BluetoothHeadset implements BluetoothProfile { 
                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()));

                return BluetoothStatusCodes.ERROR_TIMEOUT;
@@ -1099,7 +1099,7 @@ public final class BluetoothHeadset implements BluetoothProfile { 
                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()));

                return BluetoothStatusCodes.ERROR_TIMEOUT;

framework/java/android/bluetooth/BluetoothLeAudio.java

+5 −5
Original line number Diff line number Diff line
@@ -961,7 +961,7 @@ public final class BluetoothLeAudio 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();

                }

            }
@@ -1013,7 +1013,7 @@ public final class BluetoothLeAudio 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();

            }

        }

    }
@@ -1281,7 +1281,7 @@ public final class BluetoothLeAudio implements BluetoothProfile, AutoCloseable { 
                Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));

            } catch (RemoteException e) {

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

                e.rethrowFromSystemServer();

                throw e.rethrowAsRuntimeException();

            }

        }

        return defaultValue;
@@ -1432,7 +1432,7 @@ public final class BluetoothLeAudio implements BluetoothProfile, AutoCloseable { 
                Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));

            } catch (RemoteException e) {

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

                e.rethrowFromSystemServer();

                throw e.rethrowAsRuntimeException();

            }

        }

        return defaultValue;
@@ -1474,7 +1474,7 @@ public final class BluetoothLeAudio implements BluetoothProfile, AutoCloseable { 
                                        mAttributionSource);

            } catch (RemoteException e) {

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

                e.rethrowFromSystemServer();

                throw e.rethrowAsRuntimeException();

            }

        }

    }