Merge "DO NOT MERGE Hide Voicemail APIs" into m-wireless-dev (3452b396) · Commits · e / os / android_frameworks_base

api/current.txt

+0 −45

Original line number	Diff line number	Diff line
		@@ -28273,22 +28273,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);
		@@ -28397,35 +28381,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 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 {

api/system-current.txt

+0 −45

Original line number	Diff line number	Diff line
		@@ -30105,22 +30105,6 @@ package android.telecom {
		field public static final int ROUTE_WIRED_OR_EARPIECE = 5; // 0x5
		}

		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 final class Call {
		method public void addListener(android.telecom.Call.Listener);
		method public void answer(int);
		@@ -30638,35 +30622,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 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 {

telecomm/java/android/telecom/AuthenticatorService.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -28,6 +28,8 @@ import android.os.IBinder;
		/**
		* A generic stub account authenticator service often used for sync adapters that do not directly
		* involve accounts.
		*
		* @hide
		*/
		public class AuthenticatorService extends Service {
		private static Authenticator mAuthenticator;

telecomm/java/android/telecom/Voicemail.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -22,6 +22,8 @@ import android.os.Parcelable;

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