Merge changes I5c5c4eb3,I36712447,I5b78d449 (2d5bf0b8) · Commits · e / os / android_frameworks_base

core/java/android/provider/Telephony.java

+0 −14

Original line number	Diff line number	Diff line
		@@ -4117,20 +4117,6 @@ public final class Telephony {
		*/
		public static final String CID = "cid";

		/**
		* Message code. <em>OBSOLETE: merged into SERIAL_NUMBER.</em>
		* <P>Type: INTEGER</P>
		* @hide
		*/
		public static final String V1_MESSAGE_CODE = "message_code";

		/**
		* Message identifier. <em>OBSOLETE: renamed to SERVICE_CATEGORY.</em>
		* <P>Type: INTEGER</P>
		* @hide
		*/
		public static final String V1_MESSAGE_IDENTIFIER = "message_id";

		/**
		* Service category which represents the general topic of the message.
		* <p>

+20 −0

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@ package android.telephony;

		import android.annotation.NonNull;
		import android.annotation.SystemApi;
		import android.os.Build;
		import android.text.TextUtils;

		import java.util.ArrayList;
		@@ -257,6 +258,15 @@ public class CbGeoUtils {
		return new Point(x - p.x, y - p.y);
		}
		}

		@Override
		public String toString() {
		String str = "Polygon: ";
		if (Build.IS_DEBUGGABLE) {
		str += mVertices;
		}
		return str;
		}
		}

		/**
		@@ -284,6 +294,16 @@ public class CbGeoUtils {
		public boolean contains(LatLng p) {
		return mCenter.distance(p) <= mRadiusMeter;
		}

		@Override
		public String toString() {
		String str = "Circle: ";
		if (Build.IS_DEBUGGABLE) {
		str += mCenter + ", radius = " + mRadiusMeter;
		}

		return str;
		}
		}

		/**

+2 −1

Original line number	Diff line number	Diff line
		@@ -534,6 +534,7 @@ public final class SmsCbMessage implements Parcelable {
		+ (mEtwsWarningInfo != null ? (", " + mEtwsWarningInfo.toString()) : "")
		+ (mCmasWarningInfo != null ? (", " + mCmasWarningInfo.toString()) : "")
		+ ", maximumWaitingTime=" + mMaximumWaitTimeSec
		+ ", received time=" + mReceivedTimeMillis
		+ ", slotIndex = " + mSlotIndex
		+ ", geo=" + (mGeometries != null
		? CbGeoUtils.encodeGeometriesToString(mGeometries) : "null")

+6 −0

Original line number	Diff line number	Diff line
		@@ -2367,6 +2367,8 @@ public class TelephonyManager {
		*
		* @return the lowercase 2 character ISO-3166 country code, or empty string if not available.
		*
		* @throws IllegalArgumentException when the slotIndex is invalid.
		*
		* {@hide}
		*/
		@SystemApi
		@@ -2374,6 +2376,10 @@ public class TelephonyManager {
		@NonNull
		public String getNetworkCountryIso(int slotIndex) {
		try {
		if (!SubscriptionManager.isValidSlotIndex(slotIndex)) {
		throw new IllegalArgumentException("invalid slot index " + slotIndex);
		}

		ITelephony telephony = getITelephony();
		if (telephony == null) return "";
		return telephony.getNetworkCountryIsoForPhone(slotIndex);