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

Commit 4e6ac48c authored by Matthew Xie's avatar Matthew Xie Committed by Android (Google) Code Review
Browse files

Merge "updateshare confirm logic missed cases like CONFIRMATION_DENIED,... 

Merge "updateshare confirm logic missed cases like CONFIRMATION_DENIED, TIMEOUT. fix it" into lmp-mr1-dev
parents 9b95221e 70743aa4

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