Merge "cellbroadcast provider refactor" am: 1abff4f0db (4c135a2a) · Commits · e / os / android_frameworks_base

api/system-current.txt

+6 −0

Original line number	Diff line number	Diff line
		@@ -6120,15 +6120,21 @@ package android.provider {
		field public static final String DELIVERY_TIME = "date";
		field public static final String ETWS_WARNING_TYPE = "etws_warning_type";
		field public static final String GEOGRAPHICAL_SCOPE = "geo_scope";
		field public static final String GEOMETRIES = "geometries";
		field public static final String LAC = "lac";
		field public static final String LANGUAGE_CODE = "language";
		field public static final String MAXIMUM_WAIT_TIME = "maximum_wait_time";
		field public static final String MESSAGE_BODY = "body";
		field public static final String MESSAGE_BROADCASTED = "message_broadcasted";
		field public static final String MESSAGE_FORMAT = "format";
		field @NonNull @RequiresPermission(android.Manifest.permission.READ_CELL_BROADCASTS) public static final android.net.Uri MESSAGE_HISTORY_URI;
		field public static final String MESSAGE_PRIORITY = "priority";
		field public static final String MESSAGE_READ = "read";
		field public static final String PLMN = "plmn";
		field public static final String RECEIVED_TIME = "received_time";
		field public static final String SERIAL_NUMBER = "serial_number";
		field public static final String SERVICE_CATEGORY = "service_category";
		field public static final String SLOT_INDEX = "slot_index";
		}

		public final class TimeZoneRulesDataContract {

api/test-current.txt

+30 −0

Original line number	Diff line number	Diff line
		@@ -2378,6 +2378,36 @@ package android.provider {
		field public static final String VOICE_INTERACTION_SERVICE = "voice_interaction_service";
		}

		public static final class Telephony.CellBroadcasts implements android.provider.BaseColumns {
		field public static final String CID = "cid";
		field public static final String CMAS_CATEGORY = "cmas_category";
		field public static final String CMAS_CERTAINTY = "cmas_certainty";
		field public static final String CMAS_MESSAGE_CLASS = "cmas_message_class";
		field public static final String CMAS_RESPONSE_TYPE = "cmas_response_type";
		field public static final String CMAS_SEVERITY = "cmas_severity";
		field public static final String CMAS_URGENCY = "cmas_urgency";
		field @NonNull public static final android.net.Uri CONTENT_URI;
		field public static final String DEFAULT_SORT_ORDER = "date DESC";
		field public static final String DELIVERY_TIME = "date";
		field public static final String ETWS_WARNING_TYPE = "etws_warning_type";
		field public static final String GEOGRAPHICAL_SCOPE = "geo_scope";
		field public static final String GEOMETRIES = "geometries";
		field public static final String LAC = "lac";
		field public static final String LANGUAGE_CODE = "language";
		field public static final String MAXIMUM_WAIT_TIME = "maximum_wait_time";
		field public static final String MESSAGE_BODY = "body";
		field public static final String MESSAGE_BROADCASTED = "message_broadcasted";
		field public static final String MESSAGE_FORMAT = "format";
		field @NonNull @RequiresPermission(android.Manifest.permission.READ_CELL_BROADCASTS) public static final android.net.Uri MESSAGE_HISTORY_URI;
		field public static final String MESSAGE_PRIORITY = "priority";
		field public static final String MESSAGE_READ = "read";
		field public static final String PLMN = "plmn";
		field public static final String RECEIVED_TIME = "received_time";
		field public static final String SERIAL_NUMBER = "serial_number";
		field public static final String SERVICE_CATEGORY = "service_category";
		field public static final String SLOT_INDEX = "slot_index";
		}

		public static final class Telephony.Sms.Intents {
		field public static final String SMS_CARRIER_PROVISION_ACTION = "android.provider.Telephony.SMS_CARRIER_PROVISION";
		}

telephony/java/android/provider/Telephony.java

+36 −6

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@

		package android.provider;

		import android.Manifest;
		import android.annotation.IntDef;
		import android.annotation.NonNull;
		import android.annotation.RequiresPermission;
		@@ -3944,10 +3945,11 @@ public final class Telephony {
		}

		/**
		* Contains received SMS cell broadcast messages. More details are available in 3GPP TS 23.041.
		* Contains received cell broadcast messages. More details are available in 3GPP TS 23.041.
		* @hide
		*/
		@SystemApi
		@TestApi
		public static final class CellBroadcasts implements BaseColumns {

		/**
		@@ -3958,10 +3960,43 @@ public final class Telephony {

		/**
		* The {@code content://} URI for this table.
		* Only privileged framework components running on phone or network stack uid can
		* query or modify this table.
		*/
		@NonNull
		public static final Uri CONTENT_URI = Uri.parse("content://cellbroadcasts");

		/**
		* The {@code content://} URI for query cellbroadcast message history.
		* query results include following entries
		* <ul>
		* <li>{@link #_ID}</li>
		* <li>{@link #SLOT_INDEX}</li>
		* <li>{@link #GEOGRAPHICAL_SCOPE}</li>
		* <li>{@link #PLMN}</li>
		* <li>{@link #LAC}</li>
		* <li>{@link #CID}</li>
		* <li>{@link #SERIAL_NUMBER}</li>
		* <li>{@link #SERVICE_CATEGORY}</li>
		* <li>{@link #LANGUAGE_CODE}</li>
		* <li>{@link #MESSAGE_BODY}</li>
		* <li>{@link #DELIVERY_TIME}</li>
		* <li>{@link #MESSAGE_READ}</li>
		* <li>{@link #MESSAGE_FORMAT}</li>
		* <li>{@link #MESSAGE_PRIORITY}</li>
		* <li>{@link #ETWS_WARNING_TYPE}</li>
		* <li>{@link #CMAS_MESSAGE_CLASS}</li>
		* <li>{@link #CMAS_CATEGORY}</li>
		* <li>{@link #CMAS_RESPONSE_TYPE}</li>
		* <li>{@link #CMAS_SEVERITY}</li>
		* <li>{@link #CMAS_URGENCY}</li>
		* <li>{@link #CMAS_CERTAINTY}</li>
		* </ul>
		*/
		@RequiresPermission(Manifest.permission.READ_CELL_BROADCASTS)
		@NonNull
		public static final Uri MESSAGE_HISTORY_URI = Uri.parse("content://cellbroadcasts/history");

		/**
		* The subscription which received this cell broadcast message.
		* @deprecated use {@link #SLOT_INDEX} instead.
		@@ -3973,7 +4008,6 @@ public final class Telephony {
		/**
		* The slot which received this cell broadcast message.
		* <P>Type: INTEGER</P>
		* @hide
		*/
		public static final String SLOT_INDEX = "slot_index";

		@@ -4151,14 +4185,12 @@ public final class Telephony {
		/**
		* The timestamp in millisecond of when the device received the message.
		* <P>Type: BIGINT</P>
		* @hide
		*/
		public static final String RECEIVED_TIME = "received_time";

		/**
		* Indicates that whether the message has been broadcasted to the application.
		* <P>Type: BOOLEAN</P>
		* @hide
		*/
		public static final String MESSAGE_BROADCASTED = "message_broadcasted";

		@@ -4194,7 +4226,6 @@ public final class Telephony {
		* "circle\|0,0\|100;polygon\|0,0\|0,1.5\|1,1\|1,0;circle\|100.123,100\|200.123"
		*
		* <P>Type: TEXT</P>
		* @hide
		*/
		public static final String GEOMETRIES = "geometries";

		@@ -4206,7 +4237,6 @@ public final class Telephony {
		* for the alert.
		*
		* <P>Type: INTEGER</P>
		* @hide
		*/
		public static final String MAXIMUM_WAIT_TIME = "maximum_wait_time";