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

Commit cb43fca7 authored by Marie Janssen's avatar Marie Janssen Committed by android-build-merger
Browse files

Merge "Fix setFlags/addFlags typo" am: 45e4dbf4 am: 8c69c22d am: b21c190e 

am: f87ce5cf

Change-Id: I580afda625d1a64bac5ce4c587e65bbf35da1b0e
parents 0cec382a f87ce5cf

android/app/src/com/android/bluetooth/btservice/BondStateMachine.java

+2 −1
Original line number Diff line number Diff line
@@ -324,7 +324,8 @@ final class BondStateMachine extends StateMachine { 
        }

        intent.putExtra(BluetoothDevice.EXTRA_PAIRING_VARIANT, variant);

        intent.setFlags(Intent.FLAG_RECEIVER_FOREGROUND);

        intent.setFlags(Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND);

        // Workaround for Android Auto until pre-accepting pairing requests is added.

        intent.addFlags(Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND);

        mAdapterService.sendOrderedBroadcast(intent, mAdapterService.BLUETOOTH_ADMIN_PERM);

    }