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

Commit f8b9ffa1 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of [19039092, 19068701, 19032880] into tm-release. 

Change-Id: I1b0f0ec8220609517837acf8a68de53aabcfd226
parents 5862deea 655653f4

android/app/jni/com_android_bluetooth_gatt.cpp

+4 −16
Original line number Diff line number Diff line
@@ -312,14 +312,8 @@ void btgattc_write_characteristic_cb(int conn_id, int status, uint16_t handle, 
  if (!sCallbackEnv.valid()) return;



  ScopedLocalRef<jbyteArray> jb(sCallbackEnv.get(), NULL);

  if (status == 0) {  // Success

  jb.reset(sCallbackEnv->NewByteArray(len));

  sCallbackEnv->SetByteArrayRegion(jb.get(), 0, len, (jbyte*)value);

  } else {

    uint8_t value = 0;

    jb.reset(sCallbackEnv->NewByteArray(1));

    sCallbackEnv->SetByteArrayRegion(jb.get(), 0, 1, (jbyte*)&value);

  }

  sCallbackEnv->CallVoidMethod(mCallbacksObj, method_onWriteCharacteristic,

                               conn_id, status, handle, jb.get());

}
@@ -356,14 +350,8 @@ void btgattc_write_descriptor_cb(int conn_id, int status, uint16_t handle, 
  if (!sCallbackEnv.valid()) return;



  ScopedLocalRef<jbyteArray> jb(sCallbackEnv.get(), NULL);

  if (status == 0) {  // Success

  jb.reset(sCallbackEnv->NewByteArray(len));

  sCallbackEnv->SetByteArrayRegion(jb.get(), 0, len, (jbyte*)value);

  } else {

    uint8_t value = 0;

    jb.reset(sCallbackEnv->NewByteArray(1));

    sCallbackEnv->SetByteArrayRegion(jb.get(), 0, 1, (jbyte*)&value);

  }

  sCallbackEnv->CallVoidMethod(mCallbacksObj, method_onWriteDescriptor, conn_id,

                               status, handle, jb.get());

}

framework/java/android/bluetooth/BluetoothA2dp.java

+17 −17
Original line number Diff line number Diff line
@@ -336,7 +336,7 @@ public final class BluetoothA2dp implements BluetoothProfile { 
            if (DBG) log(Log.getStackTraceString(new Throwable()));

        } else if (isEnabled() && isValidDevice(device)) {

            try {

                final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver();

                final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get();

                service.connectWithAttribution(device, mAttributionSource, recv);

                return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue);

            } catch (RemoteException | TimeoutException e) {
@@ -382,7 +382,7 @@ public final class BluetoothA2dp implements BluetoothProfile { 
            if (DBG) log(Log.getStackTraceString(new Throwable()));

        } else if (isEnabled() && isValidDevice(device)) {

            try {

                final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver();

                final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get();

                service.disconnectWithAttribution(device, mAttributionSource, recv);

                return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue);

            } catch (RemoteException | TimeoutException e) {
@@ -408,7 +408,7 @@ public final class BluetoothA2dp implements BluetoothProfile { 
        } else if (isEnabled()) {

            try {

                final SynchronousResultReceiver<List<BluetoothDevice>> recv =

                        new SynchronousResultReceiver();

                        SynchronousResultReceiver.get();

                service.getConnectedDevicesWithAttribution(mAttributionSource, recv);

                return Attributable.setAttributionSource(

                        recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue),
@@ -436,7 +436,7 @@ public final class BluetoothA2dp implements BluetoothProfile { 
        } else if (isEnabled()) {

            try {

                final SynchronousResultReceiver<List<BluetoothDevice>> recv =

                        new SynchronousResultReceiver();

                        SynchronousResultReceiver.get();

                service.getDevicesMatchingConnectionStatesWithAttribution(states,

                        mAttributionSource, recv);

                return Attributable.setAttributionSource(
@@ -464,7 +464,7 @@ public final class BluetoothA2dp implements BluetoothProfile { 
            if (DBG) log(Log.getStackTraceString(new Throwable()));

        } else if (isEnabled() && isValidDevice(device)) {

            try {

                final SynchronousResultReceiver<Integer> recv = new SynchronousResultReceiver();

                final SynchronousResultReceiver<Integer> recv = SynchronousResultReceiver.get();

                service.getConnectionStateWithAttribution(device, mAttributionSource, recv);

                return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue);

            } catch (RemoteException | TimeoutException e) {
@@ -506,7 +506,7 @@ public final class BluetoothA2dp implements BluetoothProfile { 
            if (DBG) log(Log.getStackTraceString(new Throwable()));

        } else if (isEnabled() && ((device == null) || isValidDevice(device))) {

            try {

                final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver();

                final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get();

                service.setActiveDevice(device, mAttributionSource, recv);

                return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue);

            } catch (RemoteException | TimeoutException e) {
@@ -538,7 +538,7 @@ public final class BluetoothA2dp implements BluetoothProfile { 
        } else if (isEnabled()) {

            try {

                final SynchronousResultReceiver<BluetoothDevice> recv =

                        new SynchronousResultReceiver();

                        SynchronousResultReceiver.get();

                service.getActiveDevice(mAttributionSource, recv);

                return Attributable.setAttributionSource(

                        recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue),
@@ -601,7 +601,7 @@ public final class BluetoothA2dp implements BluetoothProfile { 
                    && (connectionPolicy == BluetoothProfile.CONNECTION_POLICY_FORBIDDEN

                        || connectionPolicy == BluetoothProfile.CONNECTION_POLICY_ALLOWED)) {

            try {

                final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver();

                final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get();

                service.setConnectionPolicy(device, connectionPolicy, mAttributionSource, recv);

                return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue);

            } catch (RemoteException | TimeoutException e) {
@@ -656,7 +656,7 @@ public final class BluetoothA2dp implements BluetoothProfile { 
            if (DBG) log(Log.getStackTraceString(new Throwable()));

        } else if (isEnabled() && isValidDevice(device)) {

            try {

                final SynchronousResultReceiver<Integer> recv = new SynchronousResultReceiver();

                final SynchronousResultReceiver<Integer> recv = SynchronousResultReceiver.get();

                service.getConnectionPolicy(device, mAttributionSource, recv);

                return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue);

            } catch (RemoteException | TimeoutException e) {
@@ -682,7 +682,7 @@ public final class BluetoothA2dp implements BluetoothProfile { 
            if (DBG) log(Log.getStackTraceString(new Throwable()));

        } else if (isEnabled()) {

            try {

                final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver();

                final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get();

                service.isAvrcpAbsoluteVolumeSupported(recv);

                return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue);

            } catch (RemoteException | TimeoutException e) {
@@ -736,7 +736,7 @@ public final class BluetoothA2dp implements BluetoothProfile { 
            if (DBG) log(Log.getStackTraceString(new Throwable()));

        } else if (isEnabled() && isValidDevice(device)) {

            try {

                final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver();

                final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get();

                service.isA2dpPlaying(device, mAttributionSource, recv);

                return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue);

            } catch (RemoteException | TimeoutException e) {
@@ -795,7 +795,7 @@ public final class BluetoothA2dp implements BluetoothProfile { 
        } else if (isEnabled() && isValidDevice(device)) {

            try {

                final SynchronousResultReceiver<BluetoothCodecStatus> recv =

                        new SynchronousResultReceiver();

                        SynchronousResultReceiver.get();

                service.getCodecStatus(device, mAttributionSource, recv);

                return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue);

            } catch (RemoteException | TimeoutException e) {
@@ -952,7 +952,7 @@ public final class BluetoothA2dp implements BluetoothProfile { 
            if (DBG) log(Log.getStackTraceString(new Throwable()));

        } else if (isEnabled() && isValidDevice(device)) {

            try {

                final SynchronousResultReceiver<Integer> recv = new SynchronousResultReceiver();

                final SynchronousResultReceiver<Integer> recv = SynchronousResultReceiver.get();

                service.isOptionalCodecsSupported(device, mAttributionSource, recv);

                return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue);

            } catch (RemoteException | TimeoutException e) {
@@ -989,7 +989,7 @@ public final class BluetoothA2dp implements BluetoothProfile { 
            if (DBG) log(Log.getStackTraceString(new Throwable()));

        } else if (isEnabled() && isValidDevice(device)) {

            try {

                final SynchronousResultReceiver<Integer> recv = new SynchronousResultReceiver();

                final SynchronousResultReceiver<Integer> recv = SynchronousResultReceiver.get();

                service.isOptionalCodecsEnabled(device, mAttributionSource, recv);

                return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue);

            } catch (RemoteException | TimeoutException e) {
@@ -1065,7 +1065,7 @@ public final class BluetoothA2dp implements BluetoothProfile { 
            if (DBG) log(Log.getStackTraceString(new Throwable()));

        } else if (isEnabled()) {

            try {

                final SynchronousResultReceiver<Integer> recv = new SynchronousResultReceiver();

                final SynchronousResultReceiver<Integer> recv = SynchronousResultReceiver.get();

                service.getDynamicBufferSupport(mAttributionSource, recv);

                return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue);

            } catch (RemoteException | TimeoutException e) {
@@ -1101,7 +1101,7 @@ public final class BluetoothA2dp implements BluetoothProfile { 
        } else if (isEnabled()) {

            try {

                final SynchronousResultReceiver<BufferConstraints> recv =

                        new SynchronousResultReceiver();

                        SynchronousResultReceiver.get();

                service.getBufferConstraints(mAttributionSource, recv);

                return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue);

            } catch (RemoteException | TimeoutException e) {
@@ -1140,7 +1140,7 @@ public final class BluetoothA2dp implements BluetoothProfile { 
            if (DBG) log(Log.getStackTraceString(new Throwable()));

        } else if (isEnabled()) {

            try {

                final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver();

                final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get();

                service.setBufferLengthMillis(codec, value, mAttributionSource, recv);

                return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue);

            } catch (RemoteException | TimeoutException e) {

framework/java/android/bluetooth/BluetoothA2dpSink.java

+9 −9
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ public final class BluetoothA2dpSink implements BluetoothProfile { 
            if (DBG) log(Log.getStackTraceString(new Throwable()));

        } else if (isEnabled() && isValidDevice(device)) {

            try {

                final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver();

                final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get();

                service.connect(device, mAttributionSource, recv);

                return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue);

            } catch (RemoteException | TimeoutException e) {
@@ -195,7 +195,7 @@ public final class BluetoothA2dpSink implements BluetoothProfile { 
            if (DBG) log(Log.getStackTraceString(new Throwable()));

        } else if (isEnabled() && isValidDevice(device)) {

            try {

                final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver();

                final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get();

                service.disconnect(device, mAttributionSource, recv);

                return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue);

            } catch (RemoteException | TimeoutException e) {
@@ -223,7 +223,7 @@ public final class BluetoothA2dpSink implements BluetoothProfile { 
        } else if (isEnabled()) {

            try {

                final SynchronousResultReceiver<List<BluetoothDevice>> recv =

                        new SynchronousResultReceiver();

                        SynchronousResultReceiver.get();

                service.getConnectedDevices(mAttributionSource, recv);

                return Attributable.setAttributionSource(

                        recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue),
@@ -253,7 +253,7 @@ public final class BluetoothA2dpSink implements BluetoothProfile { 
        } else if (isEnabled()) {

            try {

                final SynchronousResultReceiver<List<BluetoothDevice>> recv =

                        new SynchronousResultReceiver();

                        SynchronousResultReceiver.get();

                service.getDevicesMatchingConnectionStates(states, mAttributionSource, recv);

                return Attributable.setAttributionSource(

                        recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue),
@@ -282,7 +282,7 @@ public final class BluetoothA2dpSink implements BluetoothProfile { 
            if (DBG) log(Log.getStackTraceString(new Throwable()));

        } else if (isEnabled() && isValidDevice(device)) {

            try {

                final SynchronousResultReceiver<Integer> recv = new SynchronousResultReceiver();

                final SynchronousResultReceiver<Integer> recv = SynchronousResultReceiver.get();

                service.getConnectionState(device, mAttributionSource, recv);

                return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue);

            } catch (RemoteException | TimeoutException e) {
@@ -316,7 +316,7 @@ public final class BluetoothA2dpSink implements BluetoothProfile { 
        } else if (isEnabled() && isValidDevice(device)) {

            try {

                final SynchronousResultReceiver<BluetoothAudioConfig> recv =

                        new SynchronousResultReceiver();

                        SynchronousResultReceiver.get();

                service.getAudioConfig(device, mAttributionSource, recv);

                return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue);

            } catch (RemoteException | TimeoutException e) {
@@ -377,7 +377,7 @@ public final class BluetoothA2dpSink implements BluetoothProfile { 
                && (connectionPolicy == BluetoothProfile.CONNECTION_POLICY_FORBIDDEN

                    || connectionPolicy == BluetoothProfile.CONNECTION_POLICY_ALLOWED)) {

            try {

                final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver();

                final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get();

                service.setConnectionPolicy(device, connectionPolicy, mAttributionSource, recv);

                return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue);

            } catch (RemoteException | TimeoutException e) {
@@ -433,7 +433,7 @@ public final class BluetoothA2dpSink implements BluetoothProfile { 
            if (DBG) log(Log.getStackTraceString(new Throwable()));

        } else if (isEnabled() && isValidDevice(device)) {

            try {

                final SynchronousResultReceiver<Integer> recv = new SynchronousResultReceiver();

                final SynchronousResultReceiver<Integer> recv = SynchronousResultReceiver.get();

                service.getConnectionPolicy(device, mAttributionSource, recv);

                return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue);

            } catch (RemoteException | TimeoutException e) {
@@ -466,7 +466,7 @@ public final class BluetoothA2dpSink implements BluetoothProfile { 
            if (DBG) log(Log.getStackTraceString(new Throwable()));

        } else if (isEnabled() && isValidDevice(device)) {

            try {

                final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver();

                final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get();

                service.isA2dpPlaying(device, mAttributionSource, recv);

                return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue);

            } catch (RemoteException | TimeoutException e) {

framework/java/android/bluetooth/BluetoothAdapter.java

+50 −50

File changed.

Preview size limit exceeded, changes collapsed.

framework/java/android/bluetooth/BluetoothAvrcpController.java

+6 −6
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ public final class BluetoothAvrcpController implements BluetoothProfile { 
        } else if (isEnabled()) {

            try {

                final SynchronousResultReceiver<List<BluetoothDevice>> recv =

                        new SynchronousResultReceiver();

                        SynchronousResultReceiver.get();

                service.getConnectedDevices(mAttributionSource, recv);

                return Attributable.setAttributionSource(

                        recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue),
@@ -169,7 +169,7 @@ public final class BluetoothAvrcpController implements BluetoothProfile { 
        } else if (isEnabled()) {

            try {

                final SynchronousResultReceiver<List<BluetoothDevice>> recv =

                        new SynchronousResultReceiver();

                        SynchronousResultReceiver.get();

                service.getDevicesMatchingConnectionStates(states, mAttributionSource, recv);

                return Attributable.setAttributionSource(

                        recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue),
@@ -196,7 +196,7 @@ public final class BluetoothAvrcpController implements BluetoothProfile { 
            if (DBG) log(Log.getStackTraceString(new Throwable()));

        } else if (isEnabled() && isValidDevice(device)) {

            try {

                final SynchronousResultReceiver<Integer> recv = new SynchronousResultReceiver();

                final SynchronousResultReceiver<Integer> recv = SynchronousResultReceiver.get();

                service.getConnectionState(device, mAttributionSource, recv);

                return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue);

            } catch (RemoteException | TimeoutException e) {
@@ -224,7 +224,7 @@ public final class BluetoothAvrcpController implements BluetoothProfile { 
        } else if (isEnabled()) {

            try {

                final SynchronousResultReceiver<BluetoothAvrcpPlayerSettings> recv =

                        new SynchronousResultReceiver();

                        SynchronousResultReceiver.get();

                service.getPlayerSettings(device, mAttributionSource, recv);

                settings = recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue);

            } catch (RemoteException | TimeoutException e) {
@@ -249,7 +249,7 @@ public final class BluetoothAvrcpController implements BluetoothProfile { 
            if (DBG) log(Log.getStackTraceString(new Throwable()));

        } else if (isEnabled()) {

            try {

                final SynchronousResultReceiver<Boolean> recv = new SynchronousResultReceiver();

                final SynchronousResultReceiver<Boolean> recv = SynchronousResultReceiver.get();

                service.setPlayerApplicationSetting(plAppSetting, mAttributionSource, recv);

                return recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(defaultValue);

            } catch (RemoteException | TimeoutException e) {
@@ -274,7 +274,7 @@ public final class BluetoothAvrcpController implements BluetoothProfile { 
            if (DBG) log(Log.getStackTraceString(new Throwable()));

        } else if (isEnabled()) {

            try {

                final SynchronousResultReceiver recv = new SynchronousResultReceiver();

                final SynchronousResultReceiver recv = SynchronousResultReceiver.get();

                service.sendGroupNavigationCmd(device, keyCode, keyState, mAttributionSource, recv);

                recv.awaitResultNoInterrupt(getSyncTimeout()).getValue(null);

                return;