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

Commit ff125cce authored by Andre Eisenbach's avatar Andre Eisenbach Committed by Android (Google) Code Review
Browse files

Merge "Prevent duplicate OPP permission request dialogs" into lmp-mr1-dev

parents 79606a97 01b3991f

src/com/android/bluetooth/opp/BluetoothOppObexServerSession.java

+2 −1
Original line number Diff line number Diff line
@@ -276,7 +276,8 @@ public class BluetoothOppObexServerSession extends ServerRequestHandler implemen 


        boolean needConfirm = true;

        /** It's not first put if !serverBlocking, so we auto accept it */

        if (!mServerBlocking && mAccepted == BluetoothShare.USER_CONFIRMATION_CONFIRMED) {

        if (!mServerBlocking && (mAccepted == BluetoothShare.USER_CONFIRMATION_CONFIRMED ||

                mAccepted == BluetoothShare.USER_CONFIRMATION_AUTO_CONFIRMED)) {

            values.put(BluetoothShare.USER_CONFIRMATION,

                    BluetoothShare.USER_CONFIRMATION_AUTO_CONFIRMED);

            needConfirm = false;