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

Commit 6ac4e4c7 authored by The Android Open Source Project's avatar The Android Open Source Project
Browse files

merge from open-source master 

Change-Id: I1fd774738c01a2cdffac0d455c63d574131e6fb8
parents c19dade5 32d0d8fc

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();

    }
@@ -458,37 +468,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;

    }
@@ -526,10 +545,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;

    }
@@ -537,12 +560,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) {