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

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

am 6851f2bf: am b3a0be36: updateshare confirm logic missed cases like... 

am 6851f2bf: am b3a0be36: updateshare confirm logic missed cases like CONFIRMATION_DENIED, TIMEOUT. fix it

* commit '6851f2bf':
  updateshare confirm logic missed cases like CONFIRMATION_DENIED, TIMEOUT. fix it
parents 8021f0f1 6851f2bf

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

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

        info.mVisibility = newVisibility;





        if (info.mConfirm == BluetoothShare.USER_CONFIRMATION_PENDING

        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;

            confirmed = true;

        }

        }

        info.mConfirm = cursor.getInt(cursor

        info.mConfirm = cursor.getInt(cursor