Merge "Hide and make systemapi visual voicemail-related apis." (a9e9578d) · Commits · e / os / android_frameworks_base

api/current.txt

+0 −50

Original line number	Diff line number	Diff line
		@@ -26828,7 +26828,6 @@ package android.provider {

		public static final class VoicemailContract.Status implements android.provider.BaseColumns {
		method public static android.net.Uri buildSourceUri(java.lang.String);
		method public static void setStatus(android.content.Context, android.telecom.PhoneAccountHandle, int, int, int);
		field public static final java.lang.String CONFIGURATION_STATE = "configuration_state";
		field public static final int CONFIGURATION_STATE_CAN_BE_CONFIGURED = 2; // 0x2
		field public static final int CONFIGURATION_STATE_NOT_CONFIGURED = 1; // 0x1
		@@ -26852,9 +26851,6 @@ package android.provider {

		public static final class VoicemailContract.Voicemails implements android.provider.BaseColumns android.provider.OpenableColumns {
		method public static android.net.Uri buildSourceUri(java.lang.String);
		method public static int deleteAll(android.content.Context);
		method public static android.net.Uri insert(android.content.Context, android.telecom.Voicemail);
		method public static int insert(android.content.Context, java.util.List<android.telecom.Voicemail>);
		field public static final android.net.Uri CONTENT_URI;
		field public static final java.lang.String DATE = "date";
		field public static final java.lang.String DELETED = "deleted";
		@@ -29313,22 +29309,6 @@ package android.system {

		package android.telecom {

		public class AuthenticatorService extends android.app.Service {
		ctor public AuthenticatorService();
		method public android.os.IBinder onBind(android.content.Intent);
		}

		public class AuthenticatorService.Authenticator extends android.accounts.AbstractAccountAuthenticator {
		ctor public AuthenticatorService.Authenticator(android.content.Context);
		method public android.os.Bundle addAccount(android.accounts.AccountAuthenticatorResponse, java.lang.String, java.lang.String, java.lang.String[], android.os.Bundle) throws android.accounts.NetworkErrorException;
		method public android.os.Bundle confirmCredentials(android.accounts.AccountAuthenticatorResponse, android.accounts.Account, android.os.Bundle) throws android.accounts.NetworkErrorException;
		method public android.os.Bundle editProperties(android.accounts.AccountAuthenticatorResponse, java.lang.String);
		method public android.os.Bundle getAuthToken(android.accounts.AccountAuthenticatorResponse, android.accounts.Account, java.lang.String, android.os.Bundle) throws android.accounts.NetworkErrorException;
		method public java.lang.String getAuthTokenLabel(java.lang.String);
		method public android.os.Bundle hasFeatures(android.accounts.AccountAuthenticatorResponse, android.accounts.Account, java.lang.String[]) throws android.accounts.NetworkErrorException;
		method public android.os.Bundle updateCredentials(android.accounts.AccountAuthenticatorResponse, android.accounts.Account, java.lang.String, android.os.Bundle) throws android.accounts.NetworkErrorException;
		}

		public class PhoneAccount implements android.os.Parcelable {
		method public static android.telecom.PhoneAccount.Builder builder(android.telecom.PhoneAccountHandle, java.lang.CharSequence);
		method public android.graphics.drawable.Drawable createIconDrawable(android.content.Context);
		@@ -29440,36 +29420,6 @@ package android.telecom {
		field public static final int TX_ENABLED = 1; // 0x1
		}

		public class Voicemail implements android.os.Parcelable {
		method public static android.telecom.Voicemail.Builder createForInsertion(long, java.lang.String);
		method public static android.telecom.Voicemail.Builder createForUpdate(long, java.lang.String);
		method public int describeContents();
		method public long getDuration();
		method public long getId();
		method public java.lang.String getNumber();
		method public java.lang.String getSourceData();
		method public java.lang.String getSourcePackage();
		method public long getTimestampMillis();
		method public android.net.Uri getUri();
		method public boolean hasContent();
		method public boolean isRead();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.telecom.Voicemail> CREATOR;
		}

		public static class Voicemail.Builder {
		method public android.telecom.Voicemail build();
		method public android.telecom.Voicemail.Builder setDuration(long);
		method public android.telecom.Voicemail.Builder setHasContent(boolean);
		method public android.telecom.Voicemail.Builder setId(long);
		method public android.telecom.Voicemail.Builder setIsRead(boolean);
		method public android.telecom.Voicemail.Builder setNumber(java.lang.String);
		method public android.telecom.Voicemail.Builder setSourceData(java.lang.String);
		method public android.telecom.Voicemail.Builder setSourcePackage(java.lang.String);
		method public android.telecom.Voicemail.Builder setTimestamp(long);
		method public android.telecom.Voicemail.Builder setUri(android.net.Uri);
		}

		}

		package android.telephony {

core/java/android/provider/VoicemailContract.java

+13 −0

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@ package android.provider;
		import android.Manifest;
		import android.annotation.SdkConstant;
		import android.annotation.SdkConstant.SdkConstantType;
		import android.annotation.SystemApi;
		import android.content.ContentResolver;
		import android.content.ContentValues;
		import android.content.Context;
		@@ -254,7 +255,10 @@ public class VoicemailContract {
		* @param context The context of the app doing the inserting
		* @param voicemail Data to be inserted
		* @return {@link Uri} of the newly inserted {@link Voicemail}
		*
		* @hide
		*/
		@SystemApi
		public static Uri insert(Context context, Voicemail voicemail) {
		ContentResolver contentResolver = context.getContentResolver();
		ContentValues contentValues = getContentValues(voicemail);
		@@ -267,7 +271,10 @@ public class VoicemailContract {
		* @param context The context of the app doing the inserting
		* @param voicemails Data to be inserted
		* @return the number of voicemails inserted
		*
		* @hide
		*/
		@SystemApi
		public static int insert(Context context, List<Voicemail> voicemails) {
		ContentResolver contentResolver = context.getContentResolver();
		int count = voicemails.size();
		@@ -283,7 +290,10 @@ public class VoicemailContract {
		* package. By default, a package only has permission to delete voicemails it inserted.
		*
		* @return the number of voicemails deleted
		*
		* @hide
		*/
		@SystemApi
		public static int deleteAll(Context context) {
		return context.getContentResolver().delete(
		buildSourceUri(context.getPackageName()), "", new String[0]);
		@@ -439,7 +449,10 @@ public class VoicemailContract {
		* @param configurationState See {@link Status#CONFIGURATION_STATE}
		* @param dataChannelState See {@link Status#DATA_CHANNEL_STATE}
		* @param notificationChannelState See {@link Status#NOTIFICATION_CHANNEL_STATE}
		*
		* @hide
		*/
		@SystemApi
		public static void setStatus(Context context, PhoneAccountHandle accountHandle,
		int configurationState, int dataChannelState, int notificationChannelState) {
		ContentResolver contentResolver = context.getContentResolver();

telecomm/java/android/telecom/AuthenticatorService.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@ import android.accounts.AbstractAccountAuthenticator;
		import android.accounts.Account;
		import android.accounts.AccountAuthenticatorResponse;
		import android.accounts.NetworkErrorException;
		import android.annotation.SystemApi;
		import android.app.Service;
		import android.content.Context;
		import android.content.Intent;
		@@ -28,7 +29,10 @@ import android.os.IBinder;
		/**
		* A generic stub account authenticator service often used for sync adapters that do not directly
		* involve accounts.
		*
		* @hide
		*/
		@SystemApi
		public class AuthenticatorService extends Service {
		private static Authenticator mAuthenticator;

telecomm/java/android/telecom/Voicemail.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -16,13 +16,17 @@

		package android.telecom;

		import android.annotation.SystemApi;
		import android.net.Uri;
		import android.os.Parcel;
		import android.os.Parcelable;

		/**
		* Represents a single voicemail stored in the voicemail content provider.
		*
		* @hide
		*/
		@SystemApi
		public class Voicemail implements Parcelable {
		private final Long mTimestamp;
		private final String mNumber;