summaryrefslogtreecommitdiffstats
path: root/api/current.txt
diff options
context:
space:
mode:
Diffstat (limited to 'api/current.txt')
-rw-r--r--api/current.txt80
1 files changed, 61 insertions, 19 deletions
diff --git a/api/current.txt b/api/current.txt
index aa29ae8..5a9be90 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -106,7 +106,7 @@ package android {
field public static final deprecated java.lang.String READ_INPUT_STATE = "android.permission.READ_INPUT_STATE";
field public static final java.lang.String READ_LOGS = "android.permission.READ_LOGS";
field public static final java.lang.String READ_PHONE_STATE = "android.permission.READ_PHONE_STATE";
- field public static final java.lang.String READ_PROFILE = "android.permission.READ_PROFILE";
+ field public static final deprecated java.lang.String READ_PROFILE = "android.permission.READ_PROFILE";
field public static final java.lang.String READ_SMS = "android.permission.READ_SMS";
field public static final deprecated java.lang.String READ_SOCIAL_STREAM = "android.permission.READ_SOCIAL_STREAM";
field public static final java.lang.String READ_SYNC_SETTINGS = "android.permission.READ_SYNC_SETTINGS";
@@ -120,6 +120,7 @@ package android {
field public static final java.lang.String RECEIVE_WAP_PUSH = "android.permission.RECEIVE_WAP_PUSH";
field public static final java.lang.String RECORD_AUDIO = "android.permission.RECORD_AUDIO";
field public static final java.lang.String REORDER_TASKS = "android.permission.REORDER_TASKS";
+ field public static final java.lang.String REQUEST_INSTALL_PACKAGES = "android.permission.REQUEST_INSTALL_PACKAGES";
field public static final deprecated java.lang.String RESTART_PACKAGES = "android.permission.RESTART_PACKAGES";
field public static final java.lang.String SEND_RESPOND_VIA_MESSAGE = "android.permission.SEND_RESPOND_VIA_MESSAGE";
field public static final java.lang.String SEND_SMS = "android.permission.SEND_SMS";
@@ -154,7 +155,7 @@ package android {
field public static final java.lang.String WRITE_EXTERNAL_STORAGE = "android.permission.WRITE_EXTERNAL_STORAGE";
field public static final java.lang.String WRITE_GSERVICES = "android.permission.WRITE_GSERVICES";
field public static final java.lang.String WRITE_HISTORY_BOOKMARKS = "com.android.browser.permission.WRITE_HISTORY_BOOKMARKS";
- field public static final java.lang.String WRITE_PROFILE = "android.permission.WRITE_PROFILE";
+ field public static final deprecated java.lang.String WRITE_PROFILE = "android.permission.WRITE_PROFILE";
field public static final java.lang.String WRITE_SECURE_SETTINGS = "android.permission.WRITE_SECURE_SETTINGS";
field public static final java.lang.String WRITE_SETTINGS = "android.permission.WRITE_SETTINGS";
field public static final deprecated java.lang.String WRITE_SOCIAL_STREAM = "android.permission.WRITE_SOCIAL_STREAM";
@@ -3996,24 +3997,22 @@ package android.app {
public class AssistContent implements android.os.Parcelable {
ctor public AssistContent();
method public int describeContents();
- method public static android.app.AssistContent getAssistContent(android.os.Bundle);
method public android.content.ClipData getClipData();
method public android.content.Intent getIntent();
+ method public android.net.Uri getWebUri();
method public void setClipData(android.content.ClipData);
method public void setIntent(android.content.Intent);
+ method public void setWebUri(android.net.Uri);
method public void writeToParcel(android.os.Parcel, int);
- field public static final java.lang.String ASSIST_KEY = "android:assist_content";
field public static final android.os.Parcelable.Creator<android.app.AssistContent> CREATOR;
}
public final class AssistStructure implements android.os.Parcelable {
method public int describeContents();
method public android.content.ComponentName getActivityComponent();
- method public static android.app.AssistStructure getAssistStructure(android.os.Bundle);
method public android.app.AssistStructure.WindowNode getWindowNodeAt(int);
method public int getWindowNodeCount();
method public void writeToParcel(android.os.Parcel, int);
- field public static final java.lang.String ASSIST_KEY = "android:assist_structure";
field public static final android.os.Parcelable.Creator<android.app.AssistStructure> CREATOR;
}
@@ -8907,6 +8906,7 @@ package android.content.pm {
field public static final int FLAG_EXTRACT_NATIVE_LIBS = 268435456; // 0x10000000
field public static final int FLAG_FACTORY_TEST = 16; // 0x10
field public static final int FLAG_FULL_BACKUP_ONLY = 67108864; // 0x4000000
+ field public static final int FLAG_HARDWARE_ACCELERATED = 536870912; // 0x20000000
field public static final int FLAG_HAS_CODE = 4; // 0x4
field public static final int FLAG_INSTALLED = 8388608; // 0x800000
field public static final int FLAG_IS_DATA_ONLY = 16777216; // 0x1000000
@@ -8936,7 +8936,6 @@ package android.content.pm {
field public int descriptionRes;
field public boolean enabled;
field public int flags;
- field public boolean hardwareAccelerated;
field public int largestWidthLimitDp;
field public java.lang.String manageSpaceActivityName;
field public java.lang.String nativeLibraryDir;
@@ -12255,7 +12254,6 @@ package android.graphics.drawable {
method public android.graphics.drawable.Drawable getCurrent();
method public android.graphics.Rect getDirtyBounds();
method public boolean getDither();
- method public boolean getFilterBitmap();
method public void getHotspotBounds(android.graphics.Rect);
method public int getIntrinsicHeight();
method public int getIntrinsicWidth();
@@ -12272,12 +12270,13 @@ package android.graphics.drawable {
method public void inflate(android.content.res.Resources, org.xmlpull.v1.XmlPullParser, android.util.AttributeSet, android.content.res.Resources.Theme) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;
method public void invalidateSelf();
method public boolean isAutoMirrored();
+ method public boolean isFilterBitmap();
method public boolean isStateful();
method public final boolean isVisible();
method public void jumpToCurrentState();
method public android.graphics.drawable.Drawable mutate();
method protected void onBoundsChange(android.graphics.Rect);
- method public boolean onLayoutDirectionChange(int);
+ method public boolean onLayoutDirectionChanged(int);
method protected boolean onLevelChange(int);
method protected boolean onStateChange(int[]);
method public static int resolveOpacity(int, int);
@@ -15910,6 +15909,7 @@ package android.media {
field public static final java.lang.String MIMETYPE_AUDIO_AC3 = "audio/ac3";
field public static final java.lang.String MIMETYPE_AUDIO_AMR_NB = "audio/3gpp";
field public static final java.lang.String MIMETYPE_AUDIO_AMR_WB = "audio/amr-wb";
+ field public static final java.lang.String MIMETYPE_AUDIO_EAC3 = "audio/eac3";
field public static final java.lang.String MIMETYPE_AUDIO_FLAC = "audio/flac";
field public static final java.lang.String MIMETYPE_AUDIO_G711_ALAW = "audio/g711-alaw";
field public static final java.lang.String MIMETYPE_AUDIO_G711_MLAW = "audio/g711-mlaw";
@@ -23629,6 +23629,7 @@ package android.os {
field public static final java.lang.String DISALLOW_INSTALL_UNKNOWN_SOURCES = "no_install_unknown_sources";
field public static final java.lang.String DISALLOW_MODIFY_ACCOUNTS = "no_modify_accounts";
field public static final java.lang.String DISALLOW_MOUNT_PHYSICAL_MEDIA = "no_physical_media";
+ field public static final java.lang.String DISALLOW_NETWORK_RESET = "no_network_reset";
field public static final java.lang.String DISALLOW_OUTGOING_BEAM = "no_outgoing_beam";
field public static final java.lang.String DISALLOW_OUTGOING_CALLS = "no_outgoing_calls";
field public static final java.lang.String DISALLOW_REMOVE_USER = "no_remove_user";
@@ -28558,13 +28559,6 @@ package android.security.keystore {
package android.service.carrier {
- public abstract class CarrierConfigService extends android.app.Service {
- ctor public CarrierConfigService();
- method public final android.os.IBinder onBind(android.content.Intent);
- method public abstract android.os.PersistableBundle onLoadConfig(android.service.carrier.CarrierIdentifier);
- field public static final java.lang.String SERVICE_INTERFACE = "android.service.carrier.CarrierConfigService";
- }
-
public class CarrierIdentifier implements android.os.Parcelable {
ctor public CarrierIdentifier(java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String);
method public int describeContents();
@@ -28622,6 +28616,14 @@ package android.service.carrier {
method public int getSendStatus();
}
+ public abstract class CarrierService extends android.app.Service {
+ ctor public CarrierService();
+ method public final android.os.IBinder onBind(android.content.Intent);
+ method public abstract android.os.PersistableBundle onLoadConfig(android.service.carrier.CarrierIdentifier);
+ field public static final java.lang.String BIND_SERVICE_INTERFACE = "android.service.carrier.BindService";
+ field public static final java.lang.String CONFIG_SERVICE_INTERFACE = "android.service.carrier.ConfigService";
+ }
+
public final class MessagePdu implements android.os.Parcelable {
ctor public MessagePdu(java.util.List<byte[]>);
method public int describeContents();
@@ -28913,7 +28915,7 @@ package android.service.voice {
method public android.view.View onCreateContentView();
method public void onDestroy();
method public boolean[] onGetSupportedCommands(android.service.voice.VoiceInteractionSession.Caller, java.lang.String[]);
- method public void onHandleAssist(android.os.Bundle);
+ method public void onHandleAssist(android.os.Bundle, android.app.AssistStructure, android.app.AssistContent);
method public void onHide();
method public boolean onKeyDown(int, android.view.KeyEvent);
method public boolean onKeyLongPress(int, android.view.KeyEvent);
@@ -30001,6 +30003,7 @@ package android.telecom {
method public android.telecom.GatewayInfo getGatewayInfo();
method public android.net.Uri getHandle();
method public int getHandlePresentation();
+ method public android.os.Bundle getIntentExtras();
method public android.telecom.StatusHints getStatusHints();
method public int getVideoState();
method public static boolean hasProperty(int, int);
@@ -30055,6 +30058,7 @@ package android.telecom {
method public final long getConnectionTime();
method public final java.util.List<android.telecom.Connection> getConnections();
method public final android.telecom.DisconnectCause getDisconnectCause();
+ method public final android.os.Bundle getExtras();
method public final android.telecom.PhoneAccountHandle getPhoneAccountHandle();
method public final int getState();
method public final android.telecom.StatusHints getStatusHints();
@@ -30077,6 +30081,7 @@ package android.telecom {
method public final void setConnectionCapabilities(int);
method public final void setConnectionTime(long);
method public final void setDisconnected(android.telecom.DisconnectCause);
+ method public final void setExtras(android.os.Bundle);
method public final void setOnHold();
method public final void setStatusHints(android.telecom.StatusHints);
method public final void setVideoProvider(android.telecom.Connection, android.telecom.Connection.VideoProvider);
@@ -30103,6 +30108,7 @@ package android.telecom {
method public final java.util.List<android.telecom.Conferenceable> getConferenceables();
method public final int getConnectionCapabilities();
method public final android.telecom.DisconnectCause getDisconnectCause();
+ method public final android.os.Bundle getExtras();
method public final int getState();
method public final android.telecom.StatusHints getStatusHints();
method public final android.telecom.Connection.VideoProvider getVideoProvider();
@@ -30130,6 +30136,7 @@ package android.telecom {
method public final void setConnectionService(android.telecom.ConnectionService);
method public final void setDialing();
method public final void setDisconnected(android.telecom.DisconnectCause);
+ method public final void setExtras(android.os.Bundle);
method public final void setInitialized();
method public final void setInitializing();
method public final void setNextPostDialChar(char);
@@ -30370,6 +30377,7 @@ package android.telecom {
method public final int getConnectionCapabilities();
method public final java.util.List<android.telecom.RemoteConnection> getConnections();
method public android.telecom.DisconnectCause getDisconnectCause();
+ method public final android.os.Bundle getExtras();
method public final int getState();
method public void hold();
method public void merge();
@@ -30392,6 +30400,7 @@ package android.telecom {
method public void onConnectionRemoved(android.telecom.RemoteConference, android.telecom.RemoteConnection);
method public void onDestroyed(android.telecom.RemoteConference);
method public void onDisconnected(android.telecom.RemoteConference, android.telecom.DisconnectCause);
+ method public void onExtrasChanged(android.telecom.RemoteConference, android.os.Bundle);
method public void onStateChanged(android.telecom.RemoteConference, int, int);
}
@@ -30407,8 +30416,11 @@ package android.telecom {
method public java.util.List<android.telecom.RemoteConnection> getConferenceableConnections();
method public int getConnectionCapabilities();
method public android.telecom.DisconnectCause getDisconnectCause();
+ method public final android.os.Bundle getExtras();
method public int getState();
method public android.telecom.StatusHints getStatusHints();
+ method public final android.telecom.RemoteConnection.VideoProvider getVideoProvider();
+ method public int getVideoState();
method public void hold();
method public boolean isRingbackRequested();
method public boolean isVoipAudioMode();
@@ -30432,14 +30444,43 @@ package android.telecom {
method public void onConnectionCapabilitiesChanged(android.telecom.RemoteConnection, int);
method public void onDestroyed(android.telecom.RemoteConnection);
method public void onDisconnected(android.telecom.RemoteConnection, android.telecom.DisconnectCause);
+ method public void onExtrasChanged(android.telecom.RemoteConnection, android.os.Bundle);
method public void onPostDialChar(android.telecom.RemoteConnection, char);
method public void onPostDialWait(android.telecom.RemoteConnection, java.lang.String);
method public void onRingbackRequested(android.telecom.RemoteConnection, boolean);
method public void onStateChanged(android.telecom.RemoteConnection, int);
method public void onStatusHintsChanged(android.telecom.RemoteConnection, android.telecom.StatusHints);
+ method public void onVideoProviderChanged(android.telecom.RemoteConnection, android.telecom.RemoteConnection.VideoProvider);
+ method public void onVideoStateChanged(android.telecom.RemoteConnection, int);
method public void onVoipAudioChanged(android.telecom.RemoteConnection, boolean);
}
+ public static class RemoteConnection.VideoProvider {
+ method public void registerCallback(android.telecom.RemoteConnection.VideoProvider.Callback);
+ method public void requestCallDataUsage();
+ method public void requestCameraCapabilities();
+ method public void sendSessionModifyRequest(android.telecom.VideoProfile, android.telecom.VideoProfile);
+ method public void sendSessionModifyResponse(android.telecom.VideoProfile);
+ method public void setCamera(java.lang.String);
+ method public void setDeviceOrientation(int);
+ method public void setDisplaySurface(android.view.Surface);
+ method public void setPauseImage(android.net.Uri);
+ method public void setPreviewSurface(android.view.Surface);
+ method public void setZoom(float);
+ method public void unregisterCallback(android.telecom.RemoteConnection.VideoProvider.Callback);
+ }
+
+ public static abstract class RemoteConnection.VideoProvider.Callback {
+ ctor public RemoteConnection.VideoProvider.Callback();
+ method public void onCallDataUsageChanged(android.telecom.RemoteConnection.VideoProvider, long);
+ method public void onCallSessionEvent(android.telecom.RemoteConnection.VideoProvider, int);
+ method public void onCameraCapabilitiesChanged(android.telecom.RemoteConnection.VideoProvider, android.telecom.VideoProfile.CameraCapabilities);
+ method public void onPeerDimensionsChanged(android.telecom.RemoteConnection.VideoProvider, int, int);
+ method public void onSessionModifyRequestReceived(android.telecom.RemoteConnection.VideoProvider, android.telecom.VideoProfile);
+ method public void onSessionModifyResponseReceived(android.telecom.RemoteConnection.VideoProvider, int, android.telecom.VideoProfile, android.telecom.VideoProfile);
+ method public void onVideoQualityChanged(android.telecom.RemoteConnection.VideoProvider, int);
+ }
+
public final class StatusHints implements android.os.Parcelable {
ctor public StatusHints(java.lang.CharSequence, android.graphics.drawable.Icon, android.os.Bundle);
method public int describeContents();
@@ -30472,6 +30513,7 @@ package android.telecom {
method public void unregisterPhoneAccount(android.telecom.PhoneAccountHandle);
field public static final java.lang.String ACTION_CHANGE_DEFAULT_DIALER = "android.telecom.action.CHANGE_DEFAULT_DIALER";
field public static final java.lang.String ACTION_CHANGE_PHONE_ACCOUNTS = "android.telecom.action.CHANGE_PHONE_ACCOUNTS";
+ field public static final java.lang.String ACTION_CONNECTION_SERVICE_CONFIGURE = "android.telecom.action.CONNECTION_SERVICE_CONFIGURE";
field public static final java.lang.String ACTION_INCOMING_CALL = "android.telecom.action.INCOMING_CALL";
field public static final java.lang.String ACTION_SHOW_CALL_ACCESSIBILITY_SETTINGS = "android.telecom.action.SHOW_CALL_ACCESSIBILITY_SETTINGS";
field public static final java.lang.String ACTION_SHOW_CALL_SETTINGS = "android.telecom.action.SHOW_CALL_SETTINGS";
@@ -34603,6 +34645,7 @@ package android.view {
ctor public GestureDetector(android.content.Context, android.view.GestureDetector.OnGestureListener, android.os.Handler);
ctor public GestureDetector(android.content.Context, android.view.GestureDetector.OnGestureListener, android.os.Handler, boolean);
method public boolean isLongpressEnabled();
+ method public boolean onGenericMotionEvent(android.view.MotionEvent);
method public boolean onTouchEvent(android.view.MotionEvent);
method public void setIsLongpressEnabled(boolean);
method public void setOnDoubleTapListener(android.view.GestureDetector.OnDoubleTapListener);
@@ -36912,8 +36955,7 @@ package android.view {
method public abstract void setStylusButtonPressable(boolean);
method public abstract void setText(java.lang.CharSequence);
method public abstract void setText(java.lang.CharSequence, int, int);
- method public abstract void setTextPaint(android.text.TextPaint);
- method public abstract void setTextStyle(int, int, int, int);
+ method public abstract void setTextStyle(float, int, int, int);
method public abstract void setVisibility(int);
}