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

Commit 32d0d8fc authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru Committed by Android Code Review
Browse files

Merge "Bluetooth:LCD wakeup during remote BT pairing request. This change... 

Merge "Bluetooth:LCD wakeup during remote BT pairing request. This change fixes the issue of LCD not coming up during remote initiated pairing request when android is in suspend"
parents e6c2b8d6 abf99437

core/java/android/server/BluetoothEventLoop.java

+30 −3
Original line number Diff line number Diff line
@@ -30,6 +30,8 @@ import android.util.Log; 


import java.util.HashMap;

import java.util.Set;

import android.os.PowerManager;





/**

 * TODO: Move this to
@@ -51,6 +53,9 @@ class BluetoothEventLoop { 
    private final BluetoothService mBluetoothService;

    private final BluetoothAdapter mAdapter;

    private final Context mContext;

    // The WakeLock is used for bringing up the LCD during a pairing request

    // from remote device when Android is in Suspend state.

    private PowerManager.WakeLock mWakeLock;



    private static final int EVENT_AUTO_PAIRING_FAILURE_ATTEMPT_DELAY = 1;

    private static final int EVENT_RESTART_BLUETOOTH = 2;
@@ -121,6 +126,11 @@ class BluetoothEventLoop { 
        mContext = context;

        mPasskeyAgentRequestData = new HashMap();

        mAdapter = adapter;

        //WakeLock instantiation in BluetoothEventLoop class

        PowerManager pm = (PowerManager)context.getSystemService(Context.POWER_SERVICE);

        mWakeLock = pm.newWakeLock(PowerManager.FULL_WAKE_LOCK | PowerManager.ACQUIRE_CAUSES_WAKEUP

                | PowerManager.ON_AFTER_RELEASE, TAG);

        mWakeLock.setReferenceCounted(false);

        initializeNativeDataNative();

    }
@@ -451,37 +461,46 @@ class BluetoothEventLoop { 
            mHandler.sendMessageDelayed(message, 1500);

            return;

        }



        // Acquire wakelock during PIN code request to bring up LCD display

        mWakeLock.acquire();

        Intent intent = new Intent(BluetoothDevice.ACTION_PAIRING_REQUEST);

        intent.putExtra(BluetoothDevice.EXTRA_DEVICE, mAdapter.getRemoteDevice(address));

        intent.putExtra(BluetoothDevice.EXTRA_PAIRING_VARIANT,

                        BluetoothDevice.PAIRING_VARIANT_CONSENT);

        mContext.sendBroadcast(intent, BLUETOOTH_ADMIN_PERM);

        // Release wakelock to allow the LCD to go off after the PIN popup notifcation.

        mWakeLock.release();

        return;

    }



    private void onRequestPasskeyConfirmation(String objectPath, int passkey, int nativeData) {

        String address = checkPairingRequestAndGetAddress(objectPath, nativeData);

        if (address == null) return;



        // Acquire wakelock during PIN code request to bring up LCD display

        mWakeLock.acquire();

        Intent intent = new Intent(BluetoothDevice.ACTION_PAIRING_REQUEST);

        intent.putExtra(BluetoothDevice.EXTRA_DEVICE, mAdapter.getRemoteDevice(address));

        intent.putExtra(BluetoothDevice.EXTRA_PASSKEY, passkey);

        intent.putExtra(BluetoothDevice.EXTRA_PAIRING_VARIANT,

                BluetoothDevice.PAIRING_VARIANT_PASSKEY_CONFIRMATION);

        mContext.sendBroadcast(intent, BLUETOOTH_ADMIN_PERM);

        // Release wakelock to allow the LCD to go off after the PIN popup notifcation.

        mWakeLock.release();

        return;

    }



    private void onRequestPasskey(String objectPath, int nativeData) {

        String address = checkPairingRequestAndGetAddress(objectPath, nativeData);

        if (address == null) return;



        // Acquire wakelock during PIN code request to bring up LCD display

        mWakeLock.acquire();

        Intent intent = new Intent(BluetoothDevice.ACTION_PAIRING_REQUEST);

        intent.putExtra(BluetoothDevice.EXTRA_DEVICE, mAdapter.getRemoteDevice(address));

        intent.putExtra(BluetoothDevice.EXTRA_PAIRING_VARIANT,

                BluetoothDevice.PAIRING_VARIANT_PASSKEY);

        mContext.sendBroadcast(intent, BLUETOOTH_ADMIN_PERM);

        // Release wakelock to allow the LCD to go off after the PIN popup notifcation.

        mWakeLock.release();

        return;

    }
@@ -519,10 +538,14 @@ class BluetoothEventLoop { 
                }

           }

        }

        // Acquire wakelock during PIN code request to bring up LCD display

        mWakeLock.acquire();

        Intent intent = new Intent(BluetoothDevice.ACTION_PAIRING_REQUEST);

        intent.putExtra(BluetoothDevice.EXTRA_DEVICE, mAdapter.getRemoteDevice(address));

        intent.putExtra(BluetoothDevice.EXTRA_PAIRING_VARIANT, BluetoothDevice.PAIRING_VARIANT_PIN);

        mContext.sendBroadcast(intent, BLUETOOTH_ADMIN_PERM);

        // Release wakelock to allow the LCD to go off after the PIN popup notifcation.

        mWakeLock.release();

        return;

    }
@@ -530,12 +553,16 @@ class BluetoothEventLoop { 
        String address = checkPairingRequestAndGetAddress(objectPath, nativeData);

        if (address == null) return;



        // Acquire wakelock during PIN code request to bring up LCD display

        mWakeLock.acquire();

        Intent intent = new Intent(BluetoothDevice.ACTION_PAIRING_REQUEST);

        intent.putExtra(BluetoothDevice.EXTRA_DEVICE, mAdapter.getRemoteDevice(address));

        intent.putExtra(BluetoothDevice.EXTRA_PASSKEY, passkey);

        intent.putExtra(BluetoothDevice.EXTRA_PAIRING_VARIANT,

                        BluetoothDevice.PAIRING_VARIANT_DISPLAY_PASSKEY);

        mContext.sendBroadcast(intent, BLUETOOTH_ADMIN_PERM);

        //Release wakelock to allow the LCD to go off after the PIN popup notifcation.

        mWakeLock.release();

    }



    private boolean onAgentAuthorize(String objectPath, String deviceUuid) {