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

Commit 248e2a04 authored by Xin Li's avatar Xin Li
Browse files

Merge commit '98e12851336b7db16e583f9afac63ecc97465980' from 

oc-mr1-dev-plus-aosp-without-vendor into stage-aosp-master.

Change-Id: Ia7b8da4a00d215160e4a4fa40f6044208d1297b7
Merged-In: I19846d2a3ee27aecbae2367a74ee49082eea154d
parents 2fd10275 c197ddbe

framework/java/android/bluetooth/BluetoothHidDevice.java

+1 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ public final class BluetoothHidDevice implements BluetoothProfile { 
    public static final byte SUBCLASS2_GAMEPAD = (byte) 0x02;

    public static final byte SUBCLASS2_REMOTE_CONTROL = (byte) 0x03;

    public static final byte SUBCLASS2_SENSING_DEVICE = (byte) 0x04;

    public static final byte SUBCLASS2_DIGITIZER_TABLET = (byte) 0x05;

    public static final byte SUBCLASS2_DIGITIZER_TABLED = (byte) 0x05;

    public static final byte SUBCLASS2_CARD_READER = (byte) 0x06;



    /**

framework/java/android/bluetooth/le/BluetoothLeScanner.java

+5 −0
Original line number Diff line number Diff line
@@ -143,6 +143,11 @@ public final class BluetoothLeScanner { 
     * the PendingIntent. Use this method of scanning if your process is not always running and it

     * should be started when scan results are available.

     * <p>

     * An app must hold

     * {@link android.Manifest.permission#ACCESS_COARSE_LOCATION ACCESS_COARSE_LOCATION} or

     * {@link android.Manifest.permission#ACCESS_FINE_LOCATION ACCESS_FINE_LOCATION} permission

     * in order to get results.

     * <p>

     * When the PendingIntent is delivered, the Intent passed to the receiver or activity

     * will contain one or more of the extras {@link #EXTRA_CALLBACK_TYPE},

     * {@link #EXTRA_ERROR_CODE} and {@link #EXTRA_LIST_SCAN_RESULT} to indicate the result of