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

Commit a7846f26 authored by Shi Lu's avatar Shi Lu Committed by Android (Google) Code Review
Browse files

Merge "For API Review: getManualNetworkSelectionPlmn"

parents 7fb67e3e f7a84596

src/java/com/android/internal/telephony/GsmCdmaPhone.java

+2 −2
Original line number Diff line number Diff line
@@ -175,7 +175,7 @@ public class GsmCdmaPhone extends Phone { 
    private SIMRecords mSimRecords;



    // For non-persisted manual network selection

    private String mManualNetworkSelectionPlmn = "";

    private String mManualNetworkSelectionPlmn;



    //Common

    // Instance Variables
@@ -1917,7 +1917,7 @@ public class GsmCdmaPhone extends Phone { 
            mManualNetworkSelectionPlmn = nsm.operatorNumeric;

        } else {

        //on Phone0 in emergency mode (no SIM), or in some races then clear the cache

            mManualNetworkSelectionPlmn = "";

            mManualNetworkSelectionPlmn = null;

            Rlog.e(LOG_TAG, "Cannot update network selection due to invalid subId "

                    + subId);

        }

src/java/com/android/internal/telephony/Phone.java

+1 −1
Original line number Diff line number Diff line
@@ -1944,7 +1944,7 @@ public abstract class Phone extends Handler implements PhoneInternalInterface { 
     *  Retrieves manually selected network info.

     */

    public String getManualNetworkSelectionPlmn() {

        return "";

        return null;

    }