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

Commit a0883b4b authored by Wink Saville's avatar Wink Saville Committed by Android Git Automerger
Browse files

am 373b373b: Merge "Telephony:Prevent duplicate auto mode request on EF_CSP read" 

* commit '373b373b':
  Telephony:Prevent duplicate auto mode request on EF_CSP read
parents 94b4d47b 373b373b

src/java/com/android/internal/telephony/gsm/GSMPhone.java

+9 −2
Original line number Original line Diff line number Diff line
@@ -1332,8 +1332,15 @@ public class GSMPhone extends PhoneBase { 
                break;

                break;





            case EVENT_SET_NETWORK_AUTOMATIC:

            case EVENT_SET_NETWORK_AUTOMATIC:

                // Automatic network selection from EF_CSP SIM record

                ar = (AsyncResult) msg.obj;

                ar = (AsyncResult) msg.obj;

                if (mSST.mSS.getIsManualSelection()) {

                    setNetworkSelectionModeAutomatic((Message) ar.result);

                    setNetworkSelectionModeAutomatic((Message) ar.result);

                    Rlog.d(LOG_TAG, "SET_NETWORK_SELECTION_AUTOMATIC: set to automatic");

                } else {

                    // prevent duplicate request which will push current PLMN to low priority

                    Rlog.d(LOG_TAG, "SET_NETWORK_SELECTION_AUTOMATIC: already automatic, ignore");

                }

                break;

                break;





            case EVENT_ICC_RECORD_EVENTS:

            case EVENT_ICC_RECORD_EVENTS: