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

Commit b89b073e authored by Chienyuan's avatar Chienyuan
Browse files

PAN: Choose proper address for native command/callback 

Tag: #refactor
Bug: 197044261
Test: manual
BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines

Change-Id: Ib0e25f4d5168b56d3218c02e3623a39d969f116e
parent c587e289

android/app/src/com/android/bluetooth/pan/PanService.java

+7 −4
Original line number Diff line number Diff line
@@ -91,6 +91,7 @@ public class PanService extends ProfileService { 
    private BluetoothTetheringNetworkFactory mNetworkFactory;

    private boolean mStarted = false;



    private AdapterService mAdapterService;



    static {

        classInitNative();
@@ -122,6 +123,8 @@ public class PanService extends ProfileService { 


    @Override

    protected boolean start() {

        mAdapterService = Objects.requireNonNull(AdapterService.getAdapterService(),

                "AdapterService cannot be null when HeadsetService starts");

        mDatabaseManager = Objects.requireNonNull(AdapterService.getAdapterService().getDatabase(),

                "DatabaseManager cannot be null when PanService starts");
@@ -146,6 +149,7 @@ public class PanService extends ProfileService { 


    @Override

    protected boolean stop() {

        mAdapterService = null;

        mHandler.removeCallbacksAndMessages(null);

        return true;

    }
@@ -185,7 +189,7 @@ public class PanService extends ProfileService { 
            switch (msg.what) {

                case MESSAGE_CONNECT: {

                    BluetoothDevice device = (BluetoothDevice) msg.obj;

                    if (!connectPanNative(Utils.getByteAddress(device),

                    if (!connectPanNative(mAdapterService.getByteIdentityAddress(device),

                            BluetoothPan.LOCAL_PANU_ROLE, BluetoothPan.REMOTE_NAP_ROLE)) {

                        handlePanDeviceStateChange(device, null, BluetoothProfile.STATE_CONNECTING,

                                BluetoothPan.LOCAL_PANU_ROLE, BluetoothPan.REMOTE_NAP_ROLE);
@@ -198,7 +202,7 @@ public class PanService extends ProfileService { 
                break;

                case MESSAGE_DISCONNECT: {

                    BluetoothDevice device = (BluetoothDevice) msg.obj;

                    if (!disconnectPanNative(Utils.getByteAddress(device))) {

                    if (!disconnectPanNative(mAdapterService.getByteIdentityAddress(device))) {

                        handlePanDeviceStateChange(device, mPanIfName,

                                BluetoothProfile.STATE_DISCONNECTING, BluetoothPan.LOCAL_PANU_ROLE,

                                BluetoothPan.REMOTE_NAP_ROLE);
@@ -211,8 +215,7 @@ public class PanService extends ProfileService { 
                break;

                case MESSAGE_CONNECT_STATE_CHANGED: {

                    ConnectState cs = (ConnectState) msg.obj;

                    final BluetoothDevice device = BluetoothAdapter.getDefaultAdapter()

                            .getRemoteDevice(cs.addr);

                    final BluetoothDevice device = mAdapterService.getDeviceFromByte(cs.addr);

                    // TBD get iface from the msg

                    if (DBG) {

                        Log.d(TAG,