Merge "Added getEquivalentHomePlmns API" am: 6eaa9f8d09 am: 1d7e474283 am: 087b9a5ddf (47624b47) · Commits · e / os / android_frameworks_opt_telephony

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

+14 −0

Original line number	Diff line number	Diff line
		@@ -115,6 +115,7 @@ import com.android.telephony.Rlog;
		import java.io.FileDescriptor;
		import java.io.PrintWriter;
		import java.util.ArrayList;
		import java.util.Arrays;
		import java.util.Collections;
		import java.util.Iterator;
		import java.util.List;
		@@ -4472,4 +4473,17 @@ public class GsmCdmaPhone extends Phone {
		public boolean canDisablePhysicalSubscription() {
		return mCi.canToggleUiccApplicationsEnablement();
		}

		@Override
		public @NonNull List<String> getEquivalentHomePlmns() {
		if (isPhoneTypeGsm()) {
		IccRecords r = mIccRecords.get();
		if (r != null) {
		return Arrays.asList(r.getEhplmns());
		}
		} else if (isPhoneTypeCdma()) {
		loge("EHPLMN is not available in CDMA");
		}
		return Collections.emptyList();
		}
		}

+11 −0

Original line number	Diff line number	Diff line
		@@ -94,6 +94,7 @@ import java.io.FileDescriptor;
		import java.io.PrintWriter;
		import java.util.ArrayList;
		import java.util.Arrays;
		import java.util.Collections;
		import java.util.HashMap;
		import java.util.HashSet;
		import java.util.List;
		@@ -4393,6 +4394,16 @@ public abstract class Phone extends Handler implements PhoneInternalInterface {
		return false;
		}

		/**
		* Returns a list of the equivalent home PLMNs (EF_EHPLMN) from the USIM app.
		*
		* @return A list of equivalent home PLMNs. Returns an empty list if EF_EHPLMN is empty or
		* does not exist on the SIM card.
		*/
		public @NonNull List<String> getEquivalentHomePlmns() {
		return Collections.emptyList();
		}

		public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
		pw.println("Phone: subId=" + getSubId());
		pw.println(" mPhoneId=" + mPhoneId);