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

Commit 5c0d6f61 authored by Etan Cohen's avatar Etan Cohen
Browse files

Merge commit '6ddbb5e5' into merge2

parents 21125b81 6ddbb5e5

core/java/android/bluetooth/BluetoothAdapter.java

+6 −0
Original line number Diff line number Diff line
@@ -121,6 +121,9 @@ public final class BluetoothAdapter { 
     * {@link #STATE_TURNING_ON},

     * {@link #STATE_ON},

     * {@link #STATE_TURNING_OFF},

     * {@link #STATE_BLE_TURNING_ON},

     * {@link #STATE_BLE_ON},

     * {@link #STATE_BLE_TURNING_OFF},

     */

    public static final String EXTRA_STATE =

            "android.bluetooth.adapter.extra.STATE";
@@ -131,6 +134,9 @@ public final class BluetoothAdapter { 
     * {@link #STATE_TURNING_ON},

     * {@link #STATE_ON},

     * {@link #STATE_TURNING_OFF},

     * {@link #STATE_BLE_TURNING_ON},

     * {@link #STATE_BLE_ON},

     * {@link #STATE_BLE_TURNING_OFF},

     */

    public static final String EXTRA_PREVIOUS_STATE =

            "android.bluetooth.adapter.extra.PREVIOUS_STATE";

services/core/java/com/android/server/BluetoothManagerService.java

+1 −0
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ import java.io.PrintWriter; 
import java.util.HashMap;

import java.util.Map;



import java.util.*;

class BluetoothManagerService extends IBluetoothManager.Stub {

    private static final String TAG = "BluetoothManagerService";

    private static final boolean DBG = true;