Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "DO NOT MERGE Hide Voicemail APIs" into m-wireless-dev

Browse Source
This commit is contained in:
Jay Shrauner
2015-04-15 20:24:28 +00:00
committed by Android Partner Code Review
parent 42beb0f029 870edddcbe
commit 3452b39692
4 changed files with 5 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
api/current.txt
View File

@@ -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 {

45
api/system-current.txt
View File

@@ -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 {

2
telecomm/java/android/telecom/AuthenticatorService.java
View File

@@ -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;

4
telecomm/java/android/telecom/Voicemail.java
View File

@@ -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;
@@ -263,4 +265,4 @@ public class Voicemail implements Parcelable {
mIsRead = in.readInt() > 0 ? true : false;
mHasContent = in.readInt() > 0 ? true : false;
}
}
}