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

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

Merge "Broadcast ACTION_PAIRING_REQUEST to everyone again" am: 241ac1af 

am: c2516db2

Change-Id: Ia3c6b483cfda058832c8070407a9a1f52a003114
parents 7b7b0097 c2516db2

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

+1 −2
Original line number Original line Diff line number Diff line
@@ -167,7 +167,6 @@ final class BondStateMachine extends StateMachine { 




        @Override

        @Override

        public boolean processMessage(Message msg) {

        public boolean processMessage(Message msg) {



            BluetoothDevice dev = (BluetoothDevice)msg.obj;

            BluetoothDevice dev = (BluetoothDevice)msg.obj;

            DeviceProperties devProp = mRemoteDevices.getDeviceProperties(dev);

            DeviceProperties devProp = mRemoteDevices.getDeviceProperties(dev);

            boolean result = false;

            boolean result = false;
@@ -325,7 +324,7 @@ final class BondStateMachine extends StateMachine { 
        }

        }

        intent.putExtra(BluetoothDevice.EXTRA_PAIRING_VARIANT, variant);

        intent.putExtra(BluetoothDevice.EXTRA_PAIRING_VARIANT, variant);

        intent.setFlags(Intent.FLAG_RECEIVER_FOREGROUND);

        intent.setFlags(Intent.FLAG_RECEIVER_FOREGROUND);

        intent.setPackage(mAdapterService.getString(R.string.pairing_ui_package));

        intent.setFlags(Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND);

        mAdapterService.sendOrderedBroadcast(intent, mAdapterService.BLUETOOTH_ADMIN_PERM);

        mAdapterService.sendOrderedBroadcast(intent, mAdapterService.BLUETOOTH_ADMIN_PERM);

    }

    }