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

Commit 40b1870f authored by Hemant Gupta's avatar Hemant Gupta Committed by android-build-merger
Browse files

Merge "SAP: Handle disconnect indication message type properly" am: d792efd9 am: e45e1e3f 

am: 68b145d8

Change-Id: I8f1c240f4e6efec1e3f6cfa4b9ac20493454946d
parents bb5644e3 68b145d8

android/app/src/com/android/bluetooth/sap/SapMessage.java

+2 −0
Original line number Diff line number Diff line
@@ -1248,6 +1248,8 @@ public class SapMessage { 
                    return "ID_SET_TRANSPORT_PROTOCOL_RESP";

                case ID_RIL_UNSOL_CONNECTED:

                    return "ID_RIL_UNSOL_CONNECTED";

                case ID_RIL_UNSOL_DISCONNECT_IND:

                    return "ID_RIL_UNSOL_DISCONNECT_IND";

                case ID_RIL_UNKNOWN:

                    return "ID_RIL_UNKNOWN";

                case ID_RIL_GET_SIM_STATUS_REQ:

android/app/src/com/android/bluetooth/sap/SapServer.java

+1 −1
Original line number Diff line number Diff line
@@ -899,7 +899,7 @@ public class SapServer extends Thread implements Callback { 
        }



        switch (sapMsg.getMsgType()) {

            case SapMessage.ID_DISCONNECT_IND: {

            case SapMessage.ID_RIL_UNSOL_DISCONNECT_IND: {

                if (mState != SAP_STATE.DISCONNECTED && mState != SAP_STATE.DISCONNECTING) {

                /* we only send disconnect indication to the client if we are actually connected*/

                    SapMessage reply = new SapMessage(SapMessage.ID_DISCONNECT_IND);