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

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

am 174c693c: am cf19a4f1: am d4f4c6ee: Merge "updateshare confirm logic missed... 

am 174c693c: am cf19a4f1: am d4f4c6ee: Merge "updateshare confirm logic missed cases like CONFIRMATION_DENIED, TIMEOUT. fix it" into lmp-mr1-dev

* commit '174c693c':
  updateshare confirm logic missed cases like CONFIRMATION_DENIED, TIMEOUT. fix it
parents cc3c5e24 174c693c

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