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

Commit cbd8a4a5 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "SystemServer: use adapter after null check" into main

parents 47d32b91 becc272e

service/src/com/android/server/bluetooth/BluetoothManagerService.java

+2 −2
Original line number Diff line number Diff line
@@ -1323,7 +1323,7 @@ class BluetoothManagerService { 
        AdapterBinder adapter = mAdapter;

        if (adapter != null) {

            try {

                return mAdapter.getAddress(mContext.getAttributionSource());

                return adapter.getAddress(mContext.getAttributionSource());

            } catch (RemoteException e) {

                Log.e(TAG, "getAddress(): Returning cached address", e);

            }
@@ -1341,7 +1341,7 @@ class BluetoothManagerService { 
        AdapterBinder adapter = mAdapter;

        if (adapter != null) {

            try {

                return mAdapter.getName(mContext.getAttributionSource());

                return adapter.getName(mContext.getAttributionSource());

            } catch (RemoteException e) {

                Log.e(TAG, "getName(): Returning cached name", e);

            }