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

Commit c3c1287f authored by Matthew Xie's avatar Matthew Xie Committed by Android Git Automerger
Browse files

am 6298ab70: am 3d6c47e0: am 21d6d980: am 6851f2bf: am b3a0be36: updateshare... 

am 6298ab70: am 3d6c47e0: am 21d6d980: am 6851f2bf: am b3a0be36: updateshare confirm logic missed cases like CONFIRMATION_DENIED, TIMEOUT. fix it

* commit '6298ab70':
  updateshare confirm logic missed cases like CONFIRMATION_DENIED, TIMEOUT. fix it
parents 1c730df3 6298ab70

android/app/src/com/android/bluetooth/opp/BluetoothOppService.java

+3 −1
Original line number Diff line number Diff line
@@ -717,7 +717,9 @@ public class BluetoothOppService extends Service { 
        info.mVisibility = newVisibility;



        if (info.mConfirm == BluetoothShare.USER_CONFIRMATION_PENDING

                && newConfirm != BluetoothShare.USER_CONFIRMATION_PENDING) {

            && (newConfirm == BluetoothShare.USER_CONFIRMATION_CONFIRMED ||

                newConfirm == BluetoothShare.USER_CONFIRMATION_AUTO_CONFIRMED ||

                newConfirm == BluetoothShare.USER_CONFIRMATION_HANDOVER_CONFIRMED)) {

            confirmed = true;

        }

        info.mConfirm = cursor.getInt(cursor