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

Commit 160f1abe authored by Andre Eisenbach's avatar Andre Eisenbach Committed by Android Git Automerger
Browse files

am 731f1c8b: am b23a4722: Merge "Prevent duplicate OPP permission request dialogs" into lmp-mr1-dev 

* commit '731f1c8b':
  Prevent duplicate OPP permission request dialogs
parents 8f4b20b1 731f1c8b

android/app/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;