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

Commit 6b4968bf authored by Etan Cohen's avatar Etan Cohen
Browse files

Merge commit '43c66e29' into merge2

parents 781292b4 43c66e29

framework/java/android/bluetooth/BluetoothAdapter.java

+34 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package android.bluetooth; 


import android.annotation.SdkConstant;

import android.annotation.SdkConstant.SdkConstantType;

import android.annotation.SystemApi;

import android.bluetooth.le.BluetoothLeAdvertiser;

import android.bluetooth.le.BluetoothLeScanner;

import android.bluetooth.le.ScanCallback;
@@ -205,6 +206,23 @@ public final class BluetoothAdapter { 
    public static final String ACTION_REQUEST_ENABLE =

            "android.bluetooth.adapter.action.REQUEST_ENABLE";



    /**

     * Activity Action: Show a system activity that allows user to enable BLE scans even when

     * Bluetooth is turned off.<p>

     *

     * Notification of result of this activity is posted using

     * {@link android.app.Activity#onActivityResult}. The <code>resultCode</code> will be

     * {@link android.app.Activity#RESULT_OK} if BLE scan always available setting is turned on or

     * {@link android.app.Activity#RESULT_CANCELED} if the user has rejected the request or an

     * error occurred.

     *

     * @hide

     */

    @SystemApi

    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)

    public static final String ACTION_REQUEST_BLE_SCAN_ALWAYS_AVAILABLE =

            "android.bluetooth.adapter.action.REQUEST_BLE_SCAN_ALWAYS_AVAILABLE";



    /**

     * Broadcast Action: Indicates the Bluetooth scan mode of the local Adapter

     * has changed.
@@ -915,6 +933,22 @@ public final class BluetoothAdapter { 
        return false;

    }



    /**

     * Returns {@code true} if BLE scan is always available, {@code false} otherwise. <p>

     *

     * If this returns {@code true}, application can issue {@link BluetoothLeScanner#startScan} and

     * fetch scan results even when Bluetooth is turned off.<p>

     *

     * To change this setting, use {@link #ACTION_REQUEST_BLE_SCAN_ALWAYS_AVAILABLE}.

     *

     * @hide

     */

    @SystemApi

    public boolean isBleScanAlwaysAvailable() {

        // TODO: implement after Settings UI change.

        return false;

    }



    /**

     * Returns whether peripheral mode is supported.

     *