Merge "Expose CallLog provider fields as public API" (6b86518c) · Commits · e / os / android_frameworks_base

api/current.txt

+10 −0

Original line number	Diff line number	Diff line
		@@ -20074,16 +20074,24 @@ package android.provider {
		public static class CallLog.Calls implements android.provider.BaseColumns {
		ctor public CallLog.Calls();
		method public static java.lang.String getLastOutgoingCall(android.content.Context);
		field public static final java.lang.String CACHED_FORMATTED_NUMBER = "formatted_number";
		field public static final java.lang.String CACHED_LOOKUP_URI = "lookup_uri";
		field public static final java.lang.String CACHED_MATCHED_NUMBER = "matched_number";
		field public static final java.lang.String CACHED_NAME = "name";
		field public static final java.lang.String CACHED_NORMALIZED_NUMBER = "normalized_number";
		field public static final java.lang.String CACHED_NUMBER_LABEL = "numberlabel";
		field public static final java.lang.String CACHED_NUMBER_TYPE = "numbertype";
		field public static final java.lang.String CACHED_PHOTO_ID = "photo_id";
		field public static final android.net.Uri CONTENT_FILTER_URI;
		field public static final java.lang.String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/calls";
		field public static final java.lang.String CONTENT_TYPE = "vnd.android.cursor.dir/calls";
		field public static final android.net.Uri CONTENT_URI;
		field public static final android.net.Uri CONTENT_URI_WITH_VOICEMAIL;
		field public static final java.lang.String COUNTRY_ISO = "countryiso";
		field public static final java.lang.String DATE = "date";
		field public static final java.lang.String DEFAULT_SORT_ORDER = "date DESC";
		field public static final java.lang.String DURATION = "duration";
		field public static final java.lang.String GEOCODED_LOCATION = "geocoded_location";
		field public static final int INCOMING_TYPE = 1; // 0x1
		field public static final java.lang.String IS_READ = "is_read";
		field public static final java.lang.String LIMIT_PARAM_KEY = "limit";
		@@ -20098,6 +20106,8 @@ package android.provider {
		field public static final int PRESENTATION_RESTRICTED = 2; // 0x2
		field public static final int PRESENTATION_UNKNOWN = 3; // 0x3
		field public static final java.lang.String TYPE = "type";
		field public static final int VOICEMAIL_TYPE = 4; // 0x4
		field public static final java.lang.String VOICEMAIL_URI = "voicemail_uri";
		}

		public deprecated class Contacts {

core/java/android/provider/CallLog.java

+18 −28

Original line number	Diff line number	Diff line
		@@ -86,10 +86,9 @@ public class CallLog {
		public static final String ALLOW_VOICEMAILS_PARAM_KEY = "allow_voicemails";

		/**
		* Content uri with {@link #ALLOW_VOICEMAILS_PARAM_KEY} set. This can directly be used to
		* access call log entries that includes voicemail records.
		*
		* @hide
		* Content uri with {@link #ALLOW_VOICEMAILS_PARAM_KEY} set. This uri is used to access
		* call log entries, including voicemail records. You must have the READ_CALL_LOG and
		* WRITE_CALL_LOG permissions to read and write to the call log.
		*/
		public static final Uri CONTENT_URI_WITH_VOICEMAIL = CONTENT_URI.buildUpon()
		.appendQueryParameter(ALLOW_VOICEMAILS_PARAM_KEY, "true")
		@@ -124,10 +123,7 @@ public class CallLog {
		public static final int OUTGOING_TYPE = 2;
		/** Call log type for missed calls. */
		public static final int MISSED_TYPE = 3;
		/**
		* Call log type for voicemails.
		* @hide
		*/
		/** Call log type for voicemails. */
		public static final int VOICEMAIL_TYPE = 4;

		/**
		@@ -168,8 +164,6 @@ public class CallLog {
		* <P>
		* Type: TEXT
		* </P>
		*
		* @hide
		*/
		public static final String COUNTRY_ISO = "countryiso";

		@@ -220,7 +214,6 @@ public class CallLog {
		/**
		* URI of the voicemail entry. Populated only for {@link #VOICEMAIL_TYPE}.
		* <P>Type: TEXT</P>
		* @hide
		*/
		public static final String VOICEMAIL_URI = "voicemail_uri";

		@@ -238,51 +231,48 @@ public class CallLog {
		* <p>
		* The string represents a city, state, or country associated with the number.
		* <P>Type: TEXT</P>
		* @hide
		*/
		public static final String GEOCODED_LOCATION = "geocoded_location";

		/**
		* The cached URI to look up the contact associated with the phone number, if it exists.
		* This value is not guaranteed to be current, if the contact information
		* associated with this number has changed.
		* This value may not be current if the contact information associated with this number
		* has changed.
		* <P>Type: TEXT</P>
		* @hide
		*/
		public static final String CACHED_LOOKUP_URI = "lookup_uri";

		/**
		* The cached phone number of the contact which matches this entry, if it exists.
		* This value is not guaranteed to be current, if the contact information
		* associated with this number has changed.
		* This value may not be current if the contact information associated with this number
		* has changed.
		* <P>Type: TEXT</P>
		* @hide
		*/
		public static final String CACHED_MATCHED_NUMBER = "matched_number";

		/**
		* The cached normalized version of the phone number, if it exists.
		* This value is not guaranteed to be current, if the contact information
		* associated with this number has changed.
		* The cached normalized(E164) version of the phone number, if it exists.
		* This value may not be current if the contact information associated with this number
		* has changed.
		* <P>Type: TEXT</P>
		* @hide
		*/
		public static final String CACHED_NORMALIZED_NUMBER = "normalized_number";

		/**
		* The cached photo id of the picture associated with the phone number, if it exists.
		* This value is not guaranteed to be current, if the contact information
		* associated with this number has changed.
		* This value may not be current if the contact information associated with this number
		* has changed.
		* <P>Type: INTEGER (long)</P>
		* @hide
		*/
		public static final String CACHED_PHOTO_ID = "photo_id";

		/**
		* The cached formatted phone number.
		* This value is not guaranteed to be present.
		* The cached phone number, formatted with formatting rules based on the country the
		* user was in when the call was made or received.
		* This value is not guaranteed to be present, and may not be current if the contact
		* information associated with this number
		* has changed.
		* <P>Type: TEXT</P>
		* @hide
		*/
		public static final String CACHED_FORMATTED_NUMBER = "formatted_number";