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

Commit 6f54da32 authored by Wei Wang's avatar Wei Wang Committed by Android (Google) Code Review
Browse files

Merge "Expose a few system APIs for BLE scan only mode." into mnc-dev

parents 8fa8b95c f9e3e9e3

api/system-current.txt

+4 −0
Original line number Diff line number Diff line
@@ -6486,7 +6486,9 @@ package android.bluetooth { 
    method public static boolean checkBluetoothAddress(java.lang.String);

    method public void closeProfileProxy(int, android.bluetooth.BluetoothProfile);

    method public boolean disable();

    method public boolean disableBLE();

    method public boolean enable();

    method public boolean enableBLE();

    method public java.lang.String getAddress();

    method public android.bluetooth.le.BluetoothLeAdvertiser getBluetoothLeAdvertiser();

    method public android.bluetooth.le.BluetoothLeScanner getBluetoothLeScanner();
@@ -6502,6 +6504,7 @@ package android.bluetooth { 
    method public boolean isBleScanAlwaysAvailable();

    method public boolean isDiscovering();

    method public boolean isEnabled();

    method public boolean isLeEnabled();

    method public boolean isMultipleAdvertisementSupported();

    method public boolean isOffloadedFilteringSupported();

    method public boolean isOffloadedScanBatchingSupported();
@@ -6512,6 +6515,7 @@ package android.bluetooth { 
    method public deprecated boolean startLeScan(android.bluetooth.BluetoothAdapter.LeScanCallback);

    method public deprecated boolean startLeScan(java.util.UUID[], android.bluetooth.BluetoothAdapter.LeScanCallback);

    method public deprecated void stopLeScan(android.bluetooth.BluetoothAdapter.LeScanCallback);

    field public static final java.lang.String ACTION_BLE_STATE_CHANGED = "android.bluetooth.adapter.action.BLE_STATE_CHANGED";

    field public static final java.lang.String ACTION_CONNECTION_STATE_CHANGED = "android.bluetooth.adapter.action.CONNECTION_STATE_CHANGED";

    field public static final java.lang.String ACTION_DISCOVERY_FINISHED = "android.bluetooth.adapter.action.DISCOVERY_FINISHED";

    field public static final java.lang.String ACTION_DISCOVERY_STARTED = "android.bluetooth.adapter.action.DISCOVERY_STARTED";

core/java/android/bluetooth/BluetoothAdapter.java

+15 −11
Original line number Diff line number Diff line
@@ -410,6 +410,7 @@ public final class BluetoothAdapter { 
     * Broadcast Action: The Bluetooth adapter state has changed in LE only mode.

     * @hide

     */

    @SystemApi

    public static final String ACTION_BLE_STATE_CHANGED =

        "android.bluetooth.adapter.action.BLE_STATE_CHANGED";
@@ -620,6 +621,7 @@ public final class BluetoothAdapter { 
     * @return true if the local Bluetooth LE adapter is turned on

     * @hide

     */

    @SystemApi

    public boolean isLeEnabled() {

       final int state = getLeState();

       if (state == BluetoothAdapter.STATE_ON) {
@@ -680,6 +682,7 @@ public final class BluetoothAdapter { 
     *         immediate error

     * @hide

     */

    @SystemApi

    public boolean disableBLE() {

        if (!isBleScanAlwaysAvailable()) return false;
@@ -742,6 +745,7 @@ public final class BluetoothAdapter { 
     *         immediate error

     * @hide

     */

    @SystemApi

    public boolean enableBLE() {

        if (!isBleScanAlwaysAvailable()) return false;