Merge "[Telephony Mainline] Add SimInfo.CONTENT_URI instead... (e74c1f12) · Commits · e / os / android_frameworks_base

api/system-current.txt

+4 −0

Original line number	Diff line number	Diff line
		@@ -6757,6 +6757,10 @@ package android.provider {
		field public static final String SUB_ID = "sub_id";
		}

		public static final class Telephony.SimInfo {
		field @NonNull public static final android.net.Uri CONTENT_URI;
		}

		public static final class Telephony.Sms.Intents {
		field public static final String ACTION_SMS_EMERGENCY_CB_RECEIVED = "android.provider.action.SMS_EMERGENCY_CB_RECEIVED";
		}

+19 −0

Original line number	Diff line number	Diff line
		@@ -4800,4 +4800,23 @@ public final class Telephony {
		public static final Uri CONTENT_URI = Uri.parse("content://carrier_id/all");
		}
		}

		/**
		* Contains SIM Information
		* @hide
		*/
		@SystemApi
		public static final class SimInfo {
		/**
		* Not instantiable.
		* @hide
		*/
		private SimInfo() {}

		/**
		* The {@code content://} style URI for this provider.
		*/
		@NonNull
		public static final Uri CONTENT_URI = Uri.parse("content://telephony/siminfo");
		}
		}

+2 −1

Original line number	Diff line number	Diff line
		@@ -54,6 +54,7 @@ import android.os.ParcelUuid;
		import android.os.Process;
		import android.os.RemoteException;
		import android.os.ServiceManager;
		import android.provider.Telephony.SimInfo;
		import android.telephony.euicc.EuiccManager;
		import android.telephony.ims.ImsMmTelManager;
		import android.util.DisplayMetrics;
		@@ -129,7 +130,7 @@ public class SubscriptionManager {

		/** @hide */
		@UnsupportedAppUsage
		public static final Uri CONTENT_URI = Uri.parse("content://telephony/siminfo");
		public static final Uri CONTENT_URI = SimInfo.CONTENT_URI;

		/**
		* Generates a content {@link Uri} used to receive updates on simInfo change