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

Commit 241bb269 authored by Philip P. Moltmann's avatar Philip P. Moltmann Committed by Android (Google) Code Review
Browse files

Merge "Pipe featureId from app to noteOp in BT code"

parents 74e0e156 a722cefb

core/java/android/bluetooth/BluetoothAdapter.java

+1 −1
Original line number Diff line number Diff line
@@ -1642,7 +1642,7 @@ public final class BluetoothAdapter { 
        // Workaround for legacy API for getting a BluetoothAdapter not

        // passing a context

        if (mContext != null) {

            return null;

            return mContext.getFeatureId();

        }

        return null;

    }

core/java/android/bluetooth/BluetoothManager.java

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ public final class BluetoothManager { 
     * @hide

     */

    public BluetoothManager(Context context) {

        if (null == null) {

        if (context.getFeatureId() == null) {

            context = context.getApplicationContext();

            if (context == null) {

                throw new IllegalArgumentException(