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

Commit a722cefb authored by Philip P. Moltmann's avatar Philip P. Moltmann
Browse files

Pipe featureId from app to noteOp in BT code 

Test: atest CtsAppOpsTestCases (Now with canary test for this code)
Bug: 136595429
Change-Id: I90bb6b017da4f03038fce76760a860390b727f00
parent 6dbbed06

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(