diff options
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 442 | ||||
| -rw-r--r-- | api/system-current.txt | 445 |
2 files changed, 444 insertions, 443 deletions
diff --git a/api/current.txt b/api/current.txt index d7b5982..a400fa6 100644 --- a/api/current.txt +++ b/api/current.txt @@ -20,10 +20,9 @@ package android { field public static final java.lang.String BATTERY_STATS = "android.permission.BATTERY_STATS"; field public static final java.lang.String BIND_ACCESSIBILITY_SERVICE = "android.permission.BIND_ACCESSIBILITY_SERVICE"; field public static final java.lang.String BIND_APPWIDGET = "android.permission.BIND_APPWIDGET"; - field public static final java.lang.String BIND_CARRIER_CONFIG_SERVICE = "android.permission.BIND_CARRIER_CONFIG_SERVICE"; - field public static final java.lang.String BIND_CARRIER_MESSAGING_SERVICE = "android.permission.BIND_CARRIER_MESSAGING_SERVICE"; + field public static final deprecated java.lang.String BIND_CARRIER_MESSAGING_SERVICE = "android.permission.BIND_CARRIER_MESSAGING_SERVICE"; + field public static final java.lang.String BIND_CARRIER_SERVICES = "android.permission.BIND_CARRIER_SERVICES"; field public static final java.lang.String BIND_CHOOSER_TARGET_SERVICE = "android.permission.BIND_CHOOSER_TARGET_SERVICE"; - field public static final java.lang.String BIND_CONNECTION_SERVICE = "android.permission.BIND_CONNECTION_SERVICE"; field public static final java.lang.String BIND_DEVICE_ADMIN = "android.permission.BIND_DEVICE_ADMIN"; field public static final java.lang.String BIND_DREAM_SERVICE = "android.permission.BIND_DREAM_SERVICE"; field public static final java.lang.String BIND_INCALL_SERVICE = "android.permission.BIND_INCALL_SERVICE"; @@ -32,6 +31,7 @@ package android { field public static final java.lang.String BIND_NOTIFICATION_LISTENER_SERVICE = "android.permission.BIND_NOTIFICATION_LISTENER_SERVICE"; field public static final java.lang.String BIND_PRINT_SERVICE = "android.permission.BIND_PRINT_SERVICE"; field public static final java.lang.String BIND_REMOTEVIEWS = "android.permission.BIND_REMOTEVIEWS"; + field public static final java.lang.String BIND_TELECOM_CONNECTION_SERVICE = "android.permission.BIND_TELECOM_CONNECTION_SERVICE"; field public static final java.lang.String BIND_TEXT_SERVICE = "android.permission.BIND_TEXT_SERVICE"; field public static final java.lang.String BIND_TV_INPUT = "android.permission.BIND_TV_INPUT"; field public static final java.lang.String BIND_VOICE_INTERACTION = "android.permission.BIND_VOICE_INTERACTION"; @@ -3572,7 +3572,6 @@ package android.app { method public int getMemoryClass(); method public void getMemoryInfo(android.app.ActivityManager.MemoryInfo); method public static void getMyMemoryState(android.app.ActivityManager.RunningAppProcessInfo); - method public int getPackageImportance(java.lang.String); method public android.os.Debug.MemoryInfo[] getProcessMemoryInfo(int[]); method public java.util.List<android.app.ActivityManager.ProcessErrorStateInfo> getProcessesInErrorState(); method public deprecated java.util.List<android.app.ActivityManager.RecentTaskInfo> getRecentTasks(int, int) throws java.lang.SecurityException; @@ -3883,6 +3882,7 @@ package android.app { field public static final java.lang.String OPSTR_COARSE_LOCATION = "android:coarse_location"; field public static final java.lang.String OPSTR_FINE_LOCATION = "android:fine_location"; field public static final java.lang.String OPSTR_GET_USAGE_STATS = "android:get_usage_stats"; + field public static final java.lang.String OPSTR_MOCK_LOCATION = "android:mock_location"; field public static final java.lang.String OPSTR_MONITOR_HIGH_POWER_LOCATION = "android:monitor_location_high_power"; field public static final java.lang.String OPSTR_MONITOR_LOCATION = "android:monitor_location"; } @@ -4781,6 +4781,8 @@ package android.app { method public android.app.Notification clone(); method public int describeContents(); method public java.lang.String getGroup(); + method public android.graphics.drawable.Icon getLargeIcon(); + method public android.graphics.drawable.Icon getSmallIcon(); method public java.lang.String getSortKey(); method public deprecated void setLatestEventInfo(android.content.Context, java.lang.CharSequence, java.lang.CharSequence, android.app.PendingIntent); method public void writeToParcel(android.os.Parcel, int); @@ -4925,6 +4927,7 @@ package android.app { ctor public Notification.BigPictureStyle(); ctor public Notification.BigPictureStyle(android.app.Notification.Builder); method public android.app.Notification.BigPictureStyle bigLargeIcon(android.graphics.Bitmap); + method public android.app.Notification.BigPictureStyle bigLargeIcon(android.graphics.drawable.Icon); method public android.app.Notification.BigPictureStyle bigPicture(android.graphics.Bitmap); method public android.app.Notification.BigPictureStyle setBigContentTitle(java.lang.CharSequence); method public android.app.Notification.BigPictureStyle setSummaryText(java.lang.CharSequence); @@ -4963,6 +4966,7 @@ package android.app { method public android.app.Notification.Builder setGroup(java.lang.String); method public android.app.Notification.Builder setGroupSummary(boolean); method public android.app.Notification.Builder setLargeIcon(android.graphics.Bitmap); + method public android.app.Notification.Builder setLargeIcon(android.graphics.drawable.Icon); method public android.app.Notification.Builder setLights(int, int, int); method public android.app.Notification.Builder setLocalOnly(boolean); method public android.app.Notification.Builder setNumber(int); @@ -4974,6 +4978,7 @@ package android.app { method public android.app.Notification.Builder setShowWhen(boolean); method public android.app.Notification.Builder setSmallIcon(int); method public android.app.Notification.Builder setSmallIcon(int, int); + method public android.app.Notification.Builder setSmallIcon(android.graphics.drawable.Icon); method public android.app.Notification.Builder setSortKey(java.lang.String); method public android.app.Notification.Builder setSound(android.net.Uri); method public deprecated android.app.Notification.Builder setSound(android.net.Uri, int); @@ -5628,7 +5633,7 @@ package android.app.admin { ctor public DeviceAdminReceiver(); method public android.app.admin.DevicePolicyManager getManager(android.content.Context); method public android.content.ComponentName getWho(android.content.Context); - method public java.lang.String onChoosePrivateKeyAlias(android.content.Context, android.content.Intent, int, java.lang.String, int, java.lang.String, java.lang.String); + method public java.lang.String onChoosePrivateKeyAlias(android.content.Context, android.content.Intent, int, android.net.Uri, java.lang.String); method public java.lang.CharSequence onDisableRequested(android.content.Context, android.content.Intent); method public void onDisabled(android.content.Context, android.content.Intent); method public void onEnabled(android.content.Context, android.content.Intent); @@ -5750,7 +5755,7 @@ package android.app.admin { method public void setCameraDisabled(android.content.ComponentName, boolean); method public void setCertInstallerPackage(android.content.ComponentName, java.lang.String) throws java.lang.SecurityException; method public void setCrossProfileCallerIdDisabled(android.content.ComponentName, boolean); - method public boolean setDeviceInitializer(android.content.ComponentName, android.content.ComponentName, java.lang.String) throws java.lang.IllegalArgumentException, java.lang.IllegalStateException; + method public boolean setDeviceInitializer(android.content.ComponentName, android.content.ComponentName) throws java.lang.IllegalArgumentException, java.lang.IllegalStateException; method public void setGlobalSetting(android.content.ComponentName, java.lang.String, java.lang.String); method public boolean setKeyguardDisabled(android.content.ComponentName, boolean); method public void setKeyguardDisabledFeatures(android.content.ComponentName, int); @@ -6053,22 +6058,14 @@ package android.app.usage { field public static final android.os.Parcelable.Creator<android.app.usage.ConfigurationStats> CREATOR; } - public class NetworkStatsManager { - method public android.app.usage.NetworkUsageStats queryDetails(int, java.lang.String, long, long) throws android.os.RemoteException, java.lang.SecurityException; - method public android.app.usage.NetworkUsageStats queryDetailsForUid(int, java.lang.String, long, long, int) throws android.os.RemoteException, java.lang.SecurityException; - method public android.app.usage.NetworkUsageStats querySummary(int, java.lang.String, long, long) throws android.os.RemoteException, java.lang.SecurityException; - method public android.app.usage.NetworkUsageStats.Bucket querySummaryForDevice(int, java.lang.String, long, long) throws android.os.RemoteException, java.lang.SecurityException; - method public android.app.usage.NetworkUsageStats.Bucket querySummaryForUser(int, java.lang.String, long, long) throws android.os.RemoteException, java.lang.SecurityException; - } - - public final class NetworkUsageStats implements java.lang.AutoCloseable { + public final class NetworkStats implements java.lang.AutoCloseable { method public void close(); - method public boolean getNextBucket(android.app.usage.NetworkUsageStats.Bucket); + method public boolean getNextBucket(android.app.usage.NetworkStats.Bucket); method public boolean hasNextBucket(); } - public static class NetworkUsageStats.Bucket { - ctor public NetworkUsageStats.Bucket(); + public static class NetworkStats.Bucket { + ctor public NetworkStats.Bucket(); method public long getEndTimeStamp(); method public long getRxBytes(); method public long getRxPackets(); @@ -6080,10 +6077,19 @@ package android.app.usage { field public static final int STATE_ALL = -1; // 0xffffffff field public static final int STATE_DEFAULT = 1; // 0x1 field public static final int STATE_FOREGROUND = 2; // 0x2 + field public static final int UID_ALL = -1; // 0xffffffff field public static final int UID_REMOVED = -4; // 0xfffffffc field public static final int UID_TETHERING = -5; // 0xfffffffb } + public class NetworkStatsManager { + method public android.app.usage.NetworkStats queryDetails(int, java.lang.String, long, long) throws android.os.RemoteException, java.lang.SecurityException; + method public android.app.usage.NetworkStats queryDetailsForUid(int, java.lang.String, long, long, int) throws android.os.RemoteException, java.lang.SecurityException; + method public android.app.usage.NetworkStats querySummary(int, java.lang.String, long, long) throws android.os.RemoteException, java.lang.SecurityException; + method public android.app.usage.NetworkStats.Bucket querySummaryForDevice(int, java.lang.String, long, long) throws android.os.RemoteException, java.lang.SecurityException; + method public android.app.usage.NetworkStats.Bucket querySummaryForUser(int, java.lang.String, long, long) throws android.os.RemoteException, java.lang.SecurityException; + } + public final class UsageEvents implements android.os.Parcelable { method public int describeContents(); method public boolean getNextEvent(android.app.usage.UsageEvents.Event); @@ -8919,7 +8925,6 @@ package android.content.pm { field public int descriptionRes; field public boolean enabled; field public int flags; - field public int fullBackupContent; field public boolean hardwareAccelerated; field public int largestWidthLimitDp; field public java.lang.String manageSpaceActivityName; @@ -12404,7 +12409,7 @@ package android.graphics.drawable { method public static android.graphics.drawable.Icon createWithContentUri(android.net.Uri); method public static android.graphics.drawable.Icon createWithData(byte[], int, int); method public static android.graphics.drawable.Icon createWithFilePath(java.lang.String); - method public static android.graphics.drawable.Icon createWithResource(android.content.res.Resources, int); + method public static android.graphics.drawable.Icon createWithResource(android.content.Context, int); method public static android.graphics.drawable.Icon createWithResource(java.lang.String, int); method public int describeContents(); method public android.graphics.drawable.Drawable loadDrawable(android.content.Context); @@ -13164,7 +13169,7 @@ package android.hardware.camera2 { method public abstract void close(); method public abstract android.hardware.camera2.CameraDevice getDevice(); method public abstract android.view.Surface getInputSurface(); - method public abstract boolean isReprocessible(); + method public abstract boolean isReprocessable(); method public abstract void prepare(android.view.Surface) throws android.hardware.camera2.CameraAccessException; method public abstract int setRepeatingBurst(java.util.List<android.hardware.camera2.CaptureRequest>, android.hardware.camera2.CameraCaptureSession.CaptureCallback, android.os.Handler) throws android.hardware.camera2.CameraAccessException; method public abstract int setRepeatingRequest(android.hardware.camera2.CaptureRequest, android.hardware.camera2.CameraCaptureSession.CaptureCallback, android.os.Handler) throws android.hardware.camera2.CameraAccessException; @@ -13285,7 +13290,7 @@ package android.hardware.camera2 { method public abstract android.hardware.camera2.CaptureRequest.Builder createCaptureRequest(int) throws android.hardware.camera2.CameraAccessException; method public abstract void createCaptureSession(java.util.List<android.view.Surface>, android.hardware.camera2.CameraCaptureSession.StateCallback, android.os.Handler) throws android.hardware.camera2.CameraAccessException; method public abstract android.hardware.camera2.CaptureRequest.Builder createReprocessCaptureRequest(android.hardware.camera2.TotalCaptureResult) throws android.hardware.camera2.CameraAccessException; - method public abstract void createReprocessibleCaptureSession(android.hardware.camera2.params.InputConfiguration, java.util.List<android.view.Surface>, android.hardware.camera2.CameraCaptureSession.StateCallback, android.os.Handler) throws android.hardware.camera2.CameraAccessException; + method public abstract void createReprocessableCaptureSession(android.hardware.camera2.params.InputConfiguration, java.util.List<android.view.Surface>, android.hardware.camera2.CameraCaptureSession.StateCallback, android.os.Handler) throws android.hardware.camera2.CameraAccessException; method public abstract java.lang.String getId(); field public static final int TEMPLATE_MANUAL = 6; // 0x6 field public static final int TEMPLATE_PREVIEW = 1; // 0x1 @@ -13464,7 +13469,7 @@ package android.hardware.camera2 { field public static final int REQUEST_AVAILABLE_CAPABILITIES_DEPTH_OUTPUT = 8; // 0x8 field public static final int REQUEST_AVAILABLE_CAPABILITIES_MANUAL_POST_PROCESSING = 2; // 0x2 field public static final int REQUEST_AVAILABLE_CAPABILITIES_MANUAL_SENSOR = 1; // 0x1 - field public static final int REQUEST_AVAILABLE_CAPABILITIES_OPAQUE_REPROCESSING = 4; // 0x4 + field public static final int REQUEST_AVAILABLE_CAPABILITIES_PRIVATE_REPROCESSING = 4; // 0x4 field public static final int REQUEST_AVAILABLE_CAPABILITIES_RAW = 3; // 0x3 field public static final int REQUEST_AVAILABLE_CAPABILITIES_READ_SENSOR_SETTINGS = 5; // 0x5 field public static final int REQUEST_AVAILABLE_CAPABILITIES_YUV_REPROCESSING = 7; // 0x7 @@ -14694,10 +14699,11 @@ package android.media { public final class AudioDeviceInfo { method public int[] getChannelCounts(); + method public int[] getChannelIndexMasks(); method public int[] getChannelMasks(); - method public int[] getFormats(); + method public int[] getEncodings(); method public int getId(); - method public java.lang.CharSequence getName(); + method public java.lang.CharSequence getProductName(); method public int[] getSampleRates(); method public int getType(); method public boolean isSink(); @@ -15228,7 +15234,6 @@ package android.media { method public abstract android.media.Image.Plane[] getPlanes(); method public abstract long getTimestamp(); method public abstract int getWidth(); - method public boolean isOpaque(); method public void setCropRect(android.graphics.Rect); method public void setTimestamp(long); } @@ -15248,9 +15253,7 @@ package android.media { method public int getMaxImages(); method public android.view.Surface getSurface(); method public int getWidth(); - method public boolean isOpaque(); method public static android.media.ImageReader newInstance(int, int, int, int); - method public static android.media.ImageReader newOpaqueInstance(int, int, int); method public void setOnImageAvailableListener(android.media.ImageReader.OnImageAvailableListener, android.os.Handler); } @@ -15265,11 +15268,11 @@ package android.media { method public int getMaxImages(); method public static android.media.ImageWriter newInstance(android.view.Surface, int); method public void queueInputImage(android.media.Image); - method public void setImageListener(android.media.ImageWriter.ImageListener, android.os.Handler); + method public void setOnImageReleasedListener(android.media.ImageWriter.OnImageReleasedListener, android.os.Handler); } - public static abstract interface ImageWriter.ImageListener { - method public abstract void onInputImageReleased(android.media.ImageWriter); + public static abstract interface ImageWriter.OnImageReleasedListener { + method public abstract void onImageReleased(android.media.ImageWriter); } public class JetPlayer { @@ -15340,14 +15343,14 @@ package android.media { method public final void reset(); method public void setCallback(android.media.MediaCodec.Callback, android.os.Handler); method public void setCallback(android.media.MediaCodec.Callback); + method public void setInputSurface(android.view.Surface); method public void setOnFrameRenderedListener(android.media.MediaCodec.OnFrameRenderedListener, android.os.Handler); + method public void setOutputSurface(android.view.Surface); method public final void setParameters(android.os.Bundle); - method public void setSurface(android.view.Surface); method public final void setVideoScalingMode(int); method public final void signalEndOfInputStream(); method public final void start(); method public final void stop(); - method public void usePersistentInputSurface(android.view.Surface); field public static final int BUFFER_FLAG_CODEC_CONFIG = 2; // 0x2 field public static final int BUFFER_FLAG_END_OF_STREAM = 4; // 0x4 field public static final int BUFFER_FLAG_KEY_FRAME = 1; // 0x1 @@ -15671,9 +15674,10 @@ package android.media { ctor public MediaCryptoException(java.lang.String); } - public abstract interface MediaDataSource implements java.io.Closeable { - method public abstract long getSize(); - method public abstract int readAt(long, byte[], int); + public abstract class MediaDataSource implements java.io.Closeable { + ctor public MediaDataSource(); + method public abstract long getSize() throws java.io.IOException; + method public abstract int readAt(long, byte[], int, int) throws java.io.IOException; } public class MediaDescription implements android.os.Parcelable { @@ -15726,7 +15730,7 @@ package android.media { method public void restoreKeys(byte[], byte[]); method public void setOnEventListener(android.media.MediaDrm.OnEventListener); method public void setOnExpirationUpdateListener(android.media.MediaDrm.OnExpirationUpdateListener, android.os.Handler); - method public void setOnKeysChangeListener(android.media.MediaDrm.OnKeysChangeListener, android.os.Handler); + method public void setOnKeyStatusChangeListener(android.media.MediaDrm.OnKeyStatusChangeListener, android.os.Handler); method public void setPropertyByteArray(java.lang.String, byte[]); method public void setPropertyString(java.lang.String, java.lang.String); field public static final int EVENT_KEY_EXPIRED = 3; // 0x3 @@ -15734,11 +15738,6 @@ package android.media { field public static final deprecated int EVENT_PROVISION_REQUIRED = 1; // 0x1 field public static final int EVENT_SESSION_RECLAIMED = 5; // 0x5 field public static final int EVENT_VENDOR_DEFINED = 4; // 0x4 - field public static final int KEY_STATUS_EXPIRED = 1; // 0x1 - field public static final int KEY_STATUS_INTERNAL_ERROR = 4; // 0x4 - field public static final int KEY_STATUS_OUTPUT_NOT_ALLOWED = 2; // 0x2 - field public static final int KEY_STATUS_PENDING = 3; // 0x3 - field public static final int KEY_STATUS_USABLE = 0; // 0x0 field public static final int KEY_TYPE_OFFLINE = 2; // 0x2 field public static final int KEY_TYPE_RELEASE = 3; // 0x3 field public static final int KEY_TYPE_STREAMING = 1; // 0x1 @@ -15747,9 +15746,6 @@ package android.media { field public static final java.lang.String PROPERTY_DEVICE_UNIQUE_ID = "deviceUniqueId"; field public static final java.lang.String PROPERTY_VENDOR = "vendor"; field public static final java.lang.String PROPERTY_VERSION = "version"; - field public static final int REQUEST_TYPE_INITIAL = 0; // 0x0 - field public static final int REQUEST_TYPE_RELEASE = 2; // 0x2 - field public static final int REQUEST_TYPE_RENEWAL = 1; // 0x1 } public final class MediaDrm.CryptoSession { @@ -15763,11 +15759,19 @@ package android.media { method public byte[] getData(); method public java.lang.String getDefaultUrl(); method public int getRequestType(); + field public static final int REQUEST_TYPE_INITIAL = 0; // 0x0 + field public static final int REQUEST_TYPE_RELEASE = 2; // 0x2 + field public static final int REQUEST_TYPE_RENEWAL = 1; // 0x1 } public static final class MediaDrm.KeyStatus { method public byte[] getKeyId(); method public int getStatusCode(); + field public static final int STATUS_EXPIRED = 1; // 0x1 + field public static final int STATUS_INTERNAL_ERROR = 4; // 0x4 + field public static final int STATUS_OUTPUT_NOT_ALLOWED = 2; // 0x2 + field public static final int STATUS_PENDING = 3; // 0x3 + field public static final int STATUS_USABLE = 0; // 0x0 } public static final class MediaDrm.MediaDrmStateException extends java.lang.IllegalStateException { @@ -15782,8 +15786,8 @@ package android.media { method public abstract void onExpirationUpdate(android.media.MediaDrm, byte[], long); } - public static abstract interface MediaDrm.OnKeysChangeListener { - method public abstract void onKeysChange(android.media.MediaDrm, byte[], java.util.List<android.media.MediaDrm.KeyStatus>, boolean); + public static abstract interface MediaDrm.OnKeyStatusChangeListener { + method public abstract void onKeyStatusChange(android.media.MediaDrm, byte[], java.util.List<android.media.MediaDrm.KeyStatus>, boolean); } public static final class MediaDrm.ProvisionRequest { @@ -16093,11 +16097,10 @@ package android.media { method public void setOnInfoListener(android.media.MediaPlayer.OnInfoListener); method public void setOnPreparedListener(android.media.MediaPlayer.OnPreparedListener); method public void setOnSeekCompleteListener(android.media.MediaPlayer.OnSeekCompleteListener); - method public void setOnTimedMetaDataListener(android.media.MediaPlayer.OnTimedMetaDataListener); + method public void setOnTimedMetaDataAvailableListener(android.media.MediaPlayer.OnTimedMetaDataAvailableListener); method public void setOnTimedTextListener(android.media.MediaPlayer.OnTimedTextListener); method public void setOnVideoSizeChangedListener(android.media.MediaPlayer.OnVideoSizeChangedListener); method public void setPlaybackParams(android.media.PlaybackParams); - method public void setPlaybackRate(float, int); method public void setScreenOnWhilePlaying(boolean); method public void setSurface(android.view.Surface); method public void setSyncParams(android.media.SyncParams); @@ -16124,9 +16127,6 @@ package android.media { field public static final int MEDIA_INFO_VIDEO_RENDERING_START = 3; // 0x3 field public static final int MEDIA_INFO_VIDEO_TRACK_LAGGING = 700; // 0x2bc field public static final java.lang.String MEDIA_MIMETYPE_TEXT_SUBRIP = "application/x-subrip"; - field public static final int PLAYBACK_RATE_AUDIO_MODE_DEFAULT = 0; // 0x0 - field public static final int PLAYBACK_RATE_AUDIO_MODE_RESAMPLE = 2; // 0x2 - field public static final int PLAYBACK_RATE_AUDIO_MODE_STRETCH = 1; // 0x1 field public static final int VIDEO_SCALING_MODE_SCALE_TO_FIT = 1; // 0x1 field public static final int VIDEO_SCALING_MODE_SCALE_TO_FIT_WITH_CROPPING = 2; // 0x2 } @@ -16155,8 +16155,8 @@ package android.media { method public abstract void onSeekComplete(android.media.MediaPlayer); } - public static abstract interface MediaPlayer.OnTimedMetaDataListener { - method public abstract void onTimedMetaData(android.media.MediaPlayer, android.media.TimedMetaData); + public static abstract interface MediaPlayer.OnTimedMetaDataAvailableListener { + method public abstract void onTimedMetaDataAvailable(android.media.MediaPlayer, android.media.TimedMetaData); } public static abstract interface MediaPlayer.OnTimedTextListener { @@ -16196,6 +16196,7 @@ package android.media { method public void setAudioSource(int) throws java.lang.IllegalStateException; method public deprecated void setCamera(android.hardware.Camera); method public void setCaptureRate(double); + method public void setInputSurface(android.view.Surface); method public void setLocation(float, float); method public void setMaxDuration(int) throws java.lang.IllegalArgumentException; method public void setMaxFileSize(long) throws java.lang.IllegalArgumentException; @@ -16214,7 +16215,6 @@ package android.media { method public void setVideoSource(int) throws java.lang.IllegalStateException; method public void start() throws java.lang.IllegalStateException; method public void stop() throws java.lang.IllegalStateException; - method public void usePersistentSurface(android.view.Surface); field public static final int MEDIA_ERROR_SERVER_DIED = 100; // 0x64 field public static final int MEDIA_RECORDER_ERROR_UNKNOWN = 1; // 0x1 field public static final int MEDIA_RECORDER_INFO_MAX_DURATION_REACHED = 800; // 0x320 @@ -16428,14 +16428,10 @@ package android.media { method public void setCallback(android.media.MediaSync.Callback, android.os.Handler); method public void setOnErrorListener(android.media.MediaSync.OnErrorListener, android.os.Handler); method public void setPlaybackParams(android.media.PlaybackParams); - method public void setPlaybackRate(float, int); method public void setSurface(android.view.Surface); method public void setSyncParams(android.media.SyncParams); field public static final int MEDIASYNC_ERROR_AUDIOTRACK_FAIL = 1; // 0x1 field public static final int MEDIASYNC_ERROR_SURFACE_FAIL = 2; // 0x2 - field public static final int PLAYBACK_RATE_AUDIO_MODE_DEFAULT = 0; // 0x0 - field public static final int PLAYBACK_RATE_AUDIO_MODE_RESAMPLE = 2; // 0x2 - field public static final int PLAYBACK_RATE_AUDIO_MODE_STRETCH = 1; // 0x1 } public static abstract class MediaSync.Callback { @@ -16457,9 +16453,9 @@ package android.media { } public final class MediaTimestamp { - field public final float clockRate; - field public final long mediaTimeUs; - field public final long nanoTime; + method public long getAnchorMediaTimeUs(); + method public long getAnchorSytemNanoTime(); + method public float getMediaClockRate(); } public final class NotProvisionedException extends android.media.MediaDrmException { @@ -16693,9 +16689,9 @@ package android.media { field public static final int OPTIONS_RECYCLE_INPUT = 2; // 0x2 } - public class TimedMetaData { - method public byte[] getRawData(); - method public long getTimeUs(); + public final class TimedMetaData { + method public byte[] getMetaData(); + method public long getTimestamp(); } public final class TimedText { @@ -17855,7 +17851,7 @@ package android.media.tv { method public void onTimeShiftPause(); method public void onTimeShiftResume(); method public void onTimeShiftSeekTo(long); - method public void onTimeShiftSetPlaybackRate(float, int); + method public void onTimeShiftSetPlaybackParams(android.media.PlaybackParams); method public boolean onTouchEvent(android.view.MotionEvent); method public boolean onTrackballEvent(android.view.MotionEvent); method public abstract boolean onTune(android.net.Uri); @@ -17867,7 +17863,7 @@ package android.media.tv { method public int describeContents(); method public final int getAudioChannelCount(); method public final int getAudioSampleRate(); - method public final java.lang.String getDescription(); + method public final java.lang.CharSequence getDescription(); method public final android.os.Bundle getExtra(); method public final java.lang.String getId(); method public final java.lang.String getLanguage(); @@ -17888,7 +17884,7 @@ package android.media.tv { method public android.media.tv.TvTrackInfo build(); method public final android.media.tv.TvTrackInfo.Builder setAudioChannelCount(int); method public final android.media.tv.TvTrackInfo.Builder setAudioSampleRate(int); - method public final android.media.tv.TvTrackInfo.Builder setDescription(java.lang.String); + method public final android.media.tv.TvTrackInfo.Builder setDescription(java.lang.CharSequence); method public final android.media.tv.TvTrackInfo.Builder setExtra(android.os.Bundle); method public final android.media.tv.TvTrackInfo.Builder setLanguage(java.lang.String); method public final android.media.tv.TvTrackInfo.Builder setVideoFrameRate(float); @@ -17916,7 +17912,7 @@ package android.media.tv { method public void timeShiftPause(); method public void timeShiftResume(); method public void timeShiftSeekTo(long); - method public void timeShiftSetPlaybackRate(float, int); + method public void timeShiftSetPlaybackParams(android.media.PlaybackParams); method public void tune(java.lang.String, android.net.Uri); } @@ -26602,7 +26598,7 @@ package android.provider { field public static final java.lang.String ACCESSIBILITY_SPEAK_PASSWORD = "speak_password"; field public static final deprecated java.lang.String ADB_ENABLED = "adb_enabled"; field public static final java.lang.String ALLOWED_GEOLOCATION_ORIGINS = "allowed_geolocation_origins"; - field public static final java.lang.String ALLOW_MOCK_LOCATION = "mock_location"; + field public static final deprecated java.lang.String ALLOW_MOCK_LOCATION = "mock_location"; field public static final java.lang.String ANDROID_ID = "android_id"; field public static final deprecated java.lang.String BACKGROUND_DATA = "background_data"; field public static final deprecated java.lang.String BLUETOOTH_ON = "bluetooth_on"; @@ -28331,7 +28327,7 @@ package android.security { public final class KeyChain { ctor public KeyChain(); method public static void choosePrivateKeyAlias(android.app.Activity, android.security.KeyChainAliasCallback, java.lang.String[], java.security.Principal[], java.lang.String, int, java.lang.String); - method public static void choosePrivateKeyAlias(android.app.Activity, android.security.KeyChainAliasCallback, java.lang.String[], java.security.Principal[], java.lang.String, int, java.lang.String, java.lang.String); + method public static void choosePrivateKeyAlias(android.app.Activity, android.security.KeyChainAliasCallback, java.lang.String[], java.security.Principal[], android.net.Uri, java.lang.String); method public static android.content.Intent createInstallIntent(); method public static java.security.cert.X509Certificate[] getCertificateChain(android.content.Context, java.lang.String) throws java.lang.InterruptedException, android.security.KeyChainException; method public static java.security.PrivateKey getPrivateKey(android.content.Context, java.lang.String) throws java.lang.InterruptedException, android.security.KeyChainException; @@ -28354,15 +28350,67 @@ package android.security { ctor public KeyChainException(java.lang.Throwable); } + public final deprecated class KeyPairGeneratorSpec implements java.security.spec.AlgorithmParameterSpec { + method public java.security.spec.AlgorithmParameterSpec getAlgorithmParameterSpec(); + method public android.content.Context getContext(); + method public java.util.Date getEndDate(); + method public int getKeySize(); + method public java.lang.String getKeyType(); + method public java.lang.String getKeystoreAlias(); + method public java.math.BigInteger getSerialNumber(); + method public java.util.Date getStartDate(); + method public javax.security.auth.x500.X500Principal getSubjectDN(); + method public boolean isEncryptionRequired(); + } + + public static final deprecated class KeyPairGeneratorSpec.Builder { + ctor public KeyPairGeneratorSpec.Builder(android.content.Context); + method public android.security.KeyPairGeneratorSpec build(); + method public android.security.KeyPairGeneratorSpec.Builder setAlgorithmParameterSpec(java.security.spec.AlgorithmParameterSpec); + method public android.security.KeyPairGeneratorSpec.Builder setAlias(java.lang.String); + method public android.security.KeyPairGeneratorSpec.Builder setEncryptionRequired(); + method public android.security.KeyPairGeneratorSpec.Builder setEndDate(java.util.Date); + method public android.security.KeyPairGeneratorSpec.Builder setKeySize(int); + method public android.security.KeyPairGeneratorSpec.Builder setKeyType(java.lang.String) throws java.security.NoSuchAlgorithmException; + method public android.security.KeyPairGeneratorSpec.Builder setSerialNumber(java.math.BigInteger); + method public android.security.KeyPairGeneratorSpec.Builder setStartDate(java.util.Date); + method public android.security.KeyPairGeneratorSpec.Builder setSubject(javax.security.auth.x500.X500Principal); + } + + public final deprecated class KeyStoreParameter implements java.security.KeyStore.ProtectionParameter { + method public android.content.Context getContext(); + method public boolean isEncryptionRequired(); + } + + public static final deprecated class KeyStoreParameter.Builder { + ctor public KeyStoreParameter.Builder(android.content.Context); + method public android.security.KeyStoreParameter build(); + method public android.security.KeyStoreParameter.Builder setEncryptionRequired(boolean); + } + + public class NetworkSecurityPolicy { + method public static android.security.NetworkSecurityPolicy getInstance(); + method public boolean isCleartextTrafficPermitted(); + } + +} + +package android.security.keystore { + public class KeyExpiredException extends java.security.InvalidKeyException { ctor public KeyExpiredException(); ctor public KeyExpiredException(java.lang.String); ctor public KeyExpiredException(java.lang.String, java.lang.Throwable); } - public class KeyGeneratorSpec implements java.security.spec.AlgorithmParameterSpec { + public final class KeyGenParameterSpec implements java.security.spec.AlgorithmParameterSpec { + method public java.security.spec.AlgorithmParameterSpec getAlgorithmParameterSpec(); method public java.lang.String[] getBlockModes(); - method public android.content.Context getContext(); + method public java.util.Date getCertificateNotAfter(); + method public java.util.Date getCertificateNotBefore(); + method public java.math.BigInteger getCertificateSerialNumber(); + method public javax.security.auth.x500.X500Principal getCertificateSubject(); + method public java.lang.String[] getDigests(); method public java.lang.String[] getEncryptionPaddings(); method public int getKeySize(); method public java.util.Date getKeyValidityForConsumptionEnd(); @@ -28370,84 +28418,57 @@ package android.security { method public java.util.Date getKeyValidityStart(); method public java.lang.String getKeystoreAlias(); method public int getPurposes(); + method public java.lang.String[] getSignaturePaddings(); method public int getUserAuthenticationValidityDurationSeconds(); - method public boolean isEncryptionRequired(); + method public boolean isDigestsSpecified(); method public boolean isRandomizedEncryptionRequired(); method public boolean isUserAuthenticationRequired(); } - public static class KeyGeneratorSpec.Builder { - ctor public KeyGeneratorSpec.Builder(android.content.Context); - method public android.security.KeyGeneratorSpec build(); - method public android.security.KeyGeneratorSpec.Builder setAlias(java.lang.String); - method public android.security.KeyGeneratorSpec.Builder setBlockModes(java.lang.String...); - method public android.security.KeyGeneratorSpec.Builder setEncryptionPaddings(java.lang.String...); - method public android.security.KeyGeneratorSpec.Builder setEncryptionRequired(); - method public android.security.KeyGeneratorSpec.Builder setKeySize(int); - method public android.security.KeyGeneratorSpec.Builder setKeyValidityEnd(java.util.Date); - method public android.security.KeyGeneratorSpec.Builder setKeyValidityForConsumptionEnd(java.util.Date); - method public android.security.KeyGeneratorSpec.Builder setKeyValidityForOriginationEnd(java.util.Date); - method public android.security.KeyGeneratorSpec.Builder setKeyValidityStart(java.util.Date); - method public android.security.KeyGeneratorSpec.Builder setPurposes(int); - method public android.security.KeyGeneratorSpec.Builder setRandomizedEncryptionRequired(boolean); - method public android.security.KeyGeneratorSpec.Builder setUserAuthenticationRequired(boolean); - method public android.security.KeyGeneratorSpec.Builder setUserAuthenticationValidityDurationSeconds(int); - } - - public class KeyNotYetValidException extends java.security.InvalidKeyException { - ctor public KeyNotYetValidException(); - ctor public KeyNotYetValidException(java.lang.String); - ctor public KeyNotYetValidException(java.lang.String, java.lang.Throwable); - } - - public final class KeyPairGeneratorSpec implements java.security.spec.AlgorithmParameterSpec { - method public java.security.spec.AlgorithmParameterSpec getAlgorithmParameterSpec(); + public static final class KeyGenParameterSpec.Builder { + ctor public KeyGenParameterSpec.Builder(java.lang.String, int); + method public android.security.keystore.KeyGenParameterSpec build(); + method public android.security.keystore.KeyGenParameterSpec.Builder setAlgorithmParameterSpec(java.security.spec.AlgorithmParameterSpec); + method public android.security.keystore.KeyGenParameterSpec.Builder setBlockModes(java.lang.String...); + method public android.security.keystore.KeyGenParameterSpec.Builder setCertificateNotAfter(java.util.Date); + method public android.security.keystore.KeyGenParameterSpec.Builder setCertificateNotBefore(java.util.Date); + method public android.security.keystore.KeyGenParameterSpec.Builder setCertificateSerialNumber(java.math.BigInteger); + method public android.security.keystore.KeyGenParameterSpec.Builder setCertificateSubject(javax.security.auth.x500.X500Principal); + method public android.security.keystore.KeyGenParameterSpec.Builder setDigests(java.lang.String...); + method public android.security.keystore.KeyGenParameterSpec.Builder setEncryptionPaddings(java.lang.String...); + method public android.security.keystore.KeyGenParameterSpec.Builder setKeySize(int); + method public android.security.keystore.KeyGenParameterSpec.Builder setKeyValidityEnd(java.util.Date); + method public android.security.keystore.KeyGenParameterSpec.Builder setKeyValidityForConsumptionEnd(java.util.Date); + method public android.security.keystore.KeyGenParameterSpec.Builder setKeyValidityForOriginationEnd(java.util.Date); + method public android.security.keystore.KeyGenParameterSpec.Builder setKeyValidityStart(java.util.Date); + method public android.security.keystore.KeyGenParameterSpec.Builder setRandomizedEncryptionRequired(boolean); + method public android.security.keystore.KeyGenParameterSpec.Builder setSignaturePaddings(java.lang.String...); + method public android.security.keystore.KeyGenParameterSpec.Builder setUserAuthenticationRequired(boolean); + method public android.security.keystore.KeyGenParameterSpec.Builder setUserAuthenticationValidityDurationSeconds(int); + } + + public class KeyInfo implements java.security.spec.KeySpec { method public java.lang.String[] getBlockModes(); - method public android.content.Context getContext(); method public java.lang.String[] getDigests(); method public java.lang.String[] getEncryptionPaddings(); - method public java.util.Date getEndDate(); method public int getKeySize(); - method public java.lang.String getKeyType(); method public java.util.Date getKeyValidityForConsumptionEnd(); method public java.util.Date getKeyValidityForOriginationEnd(); method public java.util.Date getKeyValidityStart(); method public java.lang.String getKeystoreAlias(); + method public int getOrigin(); method public int getPurposes(); - method public java.math.BigInteger getSerialNumber(); method public java.lang.String[] getSignaturePaddings(); - method public java.util.Date getStartDate(); - method public javax.security.auth.x500.X500Principal getSubjectDN(); method public int getUserAuthenticationValidityDurationSeconds(); - method public boolean isEncryptionRequired(); - method public boolean isRandomizedEncryptionRequired(); + method public boolean isInsideSecureHardware(); method public boolean isUserAuthenticationRequired(); + method public boolean isUserAuthenticationRequirementEnforcedBySecureHardware(); } - public static final class KeyPairGeneratorSpec.Builder { - ctor public KeyPairGeneratorSpec.Builder(android.content.Context); - method public android.security.KeyPairGeneratorSpec build(); - method public android.security.KeyPairGeneratorSpec.Builder setAlgorithmParameterSpec(java.security.spec.AlgorithmParameterSpec); - method public android.security.KeyPairGeneratorSpec.Builder setAlias(java.lang.String); - method public android.security.KeyPairGeneratorSpec.Builder setBlockModes(java.lang.String...); - method public android.security.KeyPairGeneratorSpec.Builder setDigests(java.lang.String...); - method public android.security.KeyPairGeneratorSpec.Builder setEncryptionPaddings(java.lang.String...); - method public android.security.KeyPairGeneratorSpec.Builder setEncryptionRequired(); - method public android.security.KeyPairGeneratorSpec.Builder setEndDate(java.util.Date); - method public android.security.KeyPairGeneratorSpec.Builder setKeySize(int); - method public android.security.KeyPairGeneratorSpec.Builder setKeyType(java.lang.String) throws java.security.NoSuchAlgorithmException; - method public android.security.KeyPairGeneratorSpec.Builder setKeyValidityEnd(java.util.Date); - method public android.security.KeyPairGeneratorSpec.Builder setKeyValidityForConsumptionEnd(java.util.Date); - method public android.security.KeyPairGeneratorSpec.Builder setKeyValidityForOriginationEnd(java.util.Date); - method public android.security.KeyPairGeneratorSpec.Builder setKeyValidityStart(java.util.Date); - method public android.security.KeyPairGeneratorSpec.Builder setPurposes(int); - method public android.security.KeyPairGeneratorSpec.Builder setRandomizedEncryptionRequired(boolean); - method public android.security.KeyPairGeneratorSpec.Builder setSerialNumber(java.math.BigInteger); - method public android.security.KeyPairGeneratorSpec.Builder setSignaturePaddings(java.lang.String...); - method public android.security.KeyPairGeneratorSpec.Builder setStartDate(java.util.Date); - method public android.security.KeyPairGeneratorSpec.Builder setSubject(javax.security.auth.x500.X500Principal); - method public android.security.KeyPairGeneratorSpec.Builder setUserAuthenticationRequired(boolean); - method public android.security.KeyPairGeneratorSpec.Builder setUserAuthenticationValidityDurationSeconds(int); + public class KeyNotYetValidException extends java.security.InvalidKeyException { + ctor public KeyNotYetValidException(); + ctor public KeyNotYetValidException(java.lang.String); + ctor public KeyNotYetValidException(java.lang.String, java.lang.Throwable); } public class KeyPermanentlyInvalidatedException extends java.security.InvalidKeyException { @@ -28456,7 +28477,7 @@ package android.security { ctor public KeyPermanentlyInvalidatedException(java.lang.String, java.lang.Throwable); } - public abstract class KeyStoreKeyProperties { + public abstract class KeyProperties { field public static final java.lang.String BLOCK_MODE_CBC = "CBC"; field public static final java.lang.String BLOCK_MODE_CTR = "CTR"; field public static final java.lang.String BLOCK_MODE_ECB = "ECB"; @@ -28491,29 +28512,10 @@ package android.security { field public static final java.lang.String SIGNATURE_PADDING_RSA_PSS = "PSS"; } - public class KeyStoreKeySpec implements java.security.spec.KeySpec { + public final class KeyProtection implements java.security.KeyStore.ProtectionParameter { method public java.lang.String[] getBlockModes(); method public java.lang.String[] getDigests(); method public java.lang.String[] getEncryptionPaddings(); - method public int getKeySize(); - method public java.util.Date getKeyValidityForConsumptionEnd(); - method public java.util.Date getKeyValidityForOriginationEnd(); - method public java.util.Date getKeyValidityStart(); - method public java.lang.String getKeystoreAlias(); - method public int getOrigin(); - method public int getPurposes(); - method public java.lang.String[] getSignaturePaddings(); - method public int getUserAuthenticationValidityDurationSeconds(); - method public boolean isInsideSecureHardware(); - method public boolean isUserAuthenticationRequired(); - method public boolean isUserAuthenticationRequirementEnforcedBySecureHardware(); - } - - public final class KeyStoreParameter implements java.security.KeyStore.ProtectionParameter { - method public java.lang.String[] getBlockModes(); - method public android.content.Context getContext(); - method public java.lang.String[] getDigests(); - method public java.lang.String[] getEncryptionPaddings(); method public java.util.Date getKeyValidityForConsumptionEnd(); method public java.util.Date getKeyValidityForOriginationEnd(); method public java.util.Date getKeyValidityStart(); @@ -28521,32 +28523,24 @@ package android.security { method public java.lang.String[] getSignaturePaddings(); method public int getUserAuthenticationValidityDurationSeconds(); method public boolean isDigestsSpecified(); - method public boolean isEncryptionRequired(); method public boolean isRandomizedEncryptionRequired(); method public boolean isUserAuthenticationRequired(); } - public static final class KeyStoreParameter.Builder { - ctor public KeyStoreParameter.Builder(android.content.Context); - method public android.security.KeyStoreParameter build(); - method public android.security.KeyStoreParameter.Builder setBlockModes(java.lang.String...); - method public android.security.KeyStoreParameter.Builder setDigests(java.lang.String...); - method public android.security.KeyStoreParameter.Builder setEncryptionPaddings(java.lang.String...); - method public android.security.KeyStoreParameter.Builder setEncryptionRequired(boolean); - method public android.security.KeyStoreParameter.Builder setKeyValidityEnd(java.util.Date); - method public android.security.KeyStoreParameter.Builder setKeyValidityForConsumptionEnd(java.util.Date); - method public android.security.KeyStoreParameter.Builder setKeyValidityForOriginationEnd(java.util.Date); - method public android.security.KeyStoreParameter.Builder setKeyValidityStart(java.util.Date); - method public android.security.KeyStoreParameter.Builder setPurposes(int); - method public android.security.KeyStoreParameter.Builder setRandomizedEncryptionRequired(boolean); - method public android.security.KeyStoreParameter.Builder setSignaturePaddings(java.lang.String...); - method public android.security.KeyStoreParameter.Builder setUserAuthenticationRequired(boolean); - method public android.security.KeyStoreParameter.Builder setUserAuthenticationValidityDurationSeconds(int); - } - - public class NetworkSecurityPolicy { - method public static android.security.NetworkSecurityPolicy getInstance(); - method public boolean isCleartextTrafficPermitted(); + public static final class KeyProtection.Builder { + ctor public KeyProtection.Builder(int); + method public android.security.keystore.KeyProtection build(); + method public android.security.keystore.KeyProtection.Builder setBlockModes(java.lang.String...); + method public android.security.keystore.KeyProtection.Builder setDigests(java.lang.String...); + method public android.security.keystore.KeyProtection.Builder setEncryptionPaddings(java.lang.String...); + method public android.security.keystore.KeyProtection.Builder setKeyValidityEnd(java.util.Date); + method public android.security.keystore.KeyProtection.Builder setKeyValidityForConsumptionEnd(java.util.Date); + method public android.security.keystore.KeyProtection.Builder setKeyValidityForOriginationEnd(java.util.Date); + method public android.security.keystore.KeyProtection.Builder setKeyValidityStart(java.util.Date); + method public android.security.keystore.KeyProtection.Builder setRandomizedEncryptionRequired(boolean); + method public android.security.keystore.KeyProtection.Builder setSignaturePaddings(java.lang.String...); + method public android.security.keystore.KeyProtection.Builder setUserAuthenticationRequired(boolean); + method public android.security.keystore.KeyProtection.Builder setUserAuthenticationValidityDurationSeconds(int); } public class UserNotAuthenticatedException extends java.security.InvalidKeyException { @@ -29938,23 +29932,6 @@ package android.system { package android.telecom { - public final class AudioState implements android.os.Parcelable { - ctor public AudioState(boolean, int, int); - ctor public AudioState(android.telecom.AudioState); - method public static java.lang.String audioRouteToString(int); - method public int describeContents(); - method public int getRoute(); - method public int getSupportedRouteMask(); - method public boolean isMuted(); - method public void writeToParcel(android.os.Parcel, int); - field public static final android.os.Parcelable.Creator<android.telecom.AudioState> CREATOR; - field public static final int ROUTE_BLUETOOTH = 2; // 0x2 - field public static final int ROUTE_EARPIECE = 1; // 0x1 - field public static final int ROUTE_SPEAKER = 8; // 0x8 - field public static final int ROUTE_WIRED_HEADSET = 4; // 0x4 - field public static final int ROUTE_WIRED_OR_EARPIECE = 5; // 0x5 - } - public final class Call { method public void answer(int); method public void conference(android.telecom.Call); @@ -30048,11 +30025,27 @@ package android.telecom { field public static final int PROPERTY_WIFI = 8; // 0x8 } - public abstract class Conference implements android.telecom.Conferenceable { + public final class CallAudioState implements android.os.Parcelable { + ctor public CallAudioState(boolean, int, int); + method public static java.lang.String audioRouteToString(int); + method public int describeContents(); + method public int getRoute(); + method public int getSupportedRouteMask(); + method public boolean isMuted(); + method public void writeToParcel(android.os.Parcel, int); + field public static final android.os.Parcelable.Creator<android.telecom.CallAudioState> CREATOR; + field public static final int ROUTE_BLUETOOTH = 2; // 0x2 + field public static final int ROUTE_EARPIECE = 1; // 0x1 + field public static final int ROUTE_SPEAKER = 8; // 0x8 + field public static final int ROUTE_WIRED_HEADSET = 4; // 0x4 + field public static final int ROUTE_WIRED_OR_EARPIECE = 5; // 0x5 + } + + public abstract class Conference extends android.telecom.Conferenceable { ctor public Conference(android.telecom.PhoneAccountHandle); method public final boolean addConnection(android.telecom.Connection); method public final void destroy(); - method public final android.telecom.AudioState getAudioState(); + method public final android.telecom.CallAudioState getCallAudioState(); method public final java.util.List<android.telecom.Connection> getConferenceableConnections(); method public final int getConnectionCapabilities(); method public final long getConnectionTime(); @@ -30063,7 +30056,7 @@ package android.telecom { method public final android.telecom.StatusHints getStatusHints(); method public android.telecom.Connection.VideoProvider getVideoProvider(); method public int getVideoState(); - method public void onAudioStateChanged(android.telecom.AudioState); + method public void onCallAudioStateChanged(android.telecom.CallAudioState); method public void onConnectionAdded(android.telecom.Connection); method public void onDisconnect(); method public void onHold(); @@ -30087,10 +30080,10 @@ package android.telecom { field public static final long CONNECT_TIME_NOT_SPECIFIED = 0L; // 0x0L } - public abstract interface Conferenceable { + public abstract class Conferenceable { } - public abstract class Connection implements android.telecom.Conferenceable { + public abstract class Connection extends android.telecom.Conferenceable { ctor public Connection(); method public static java.lang.String capabilitiesToString(int); method public static android.telecom.Connection createCanceledConnection(); @@ -30099,7 +30092,7 @@ package android.telecom { method public final android.net.Uri getAddress(); method public final int getAddressPresentation(); method public final boolean getAudioModeIsVoip(); - method public final android.telecom.AudioState getAudioState(); + method public final android.telecom.CallAudioState getCallAudioState(); method public final java.lang.String getCallerDisplayName(); method public final int getCallerDisplayNamePresentation(); method public final android.telecom.Conference getConference(); @@ -30113,7 +30106,7 @@ package android.telecom { method public void onAbort(); method public void onAnswer(int); method public void onAnswer(); - method public void onAudioStateChanged(android.telecom.AudioState); + method public void onCallAudioStateChanged(android.telecom.CallAudioState); method public void onDisconnect(); method public void onHold(); method public void onPlayDtmfTone(char); @@ -30271,12 +30264,12 @@ package android.telecom { public abstract class InCallService extends android.app.Service { ctor public InCallService(); method public final boolean canAddCall(); - method public final android.telecom.AudioState getAudioState(); + method public final android.telecom.CallAudioState getCallAudioState(); method public final java.util.List<android.telecom.Call> getCalls(); - method public void onAudioStateChanged(android.telecom.AudioState); method public android.os.IBinder onBind(android.content.Intent); method public void onBringToForeground(boolean); method public void onCallAdded(android.telecom.Call); + method public void onCallAudioStateChanged(android.telecom.CallAudioState); method public void onCallRemoved(android.telecom.Call); method public void onCanAddCallChanged(boolean); method public final void setAudioRoute(int); @@ -30314,16 +30307,12 @@ package android.telecom { public final 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); method public int describeContents(); method public android.telecom.PhoneAccountHandle getAccountHandle(); method public android.net.Uri getAddress(); method public int getCapabilities(); method public int getHighlightColor(); - method public android.graphics.Bitmap getIconBitmap(); - method public java.lang.String getIconPackageName(); - method public int getIconResId(); - method public int getIconTint(); + method public android.graphics.drawable.Icon getIcon(); method public java.lang.CharSequence getLabel(); method public java.lang.CharSequence getShortDescription(); method public android.net.Uri getSubscriptionAddress(); @@ -30339,7 +30328,6 @@ package android.telecom { field public static final int CAPABILITY_VIDEO_CALLING = 8; // 0x8 field public static final android.os.Parcelable.Creator<android.telecom.PhoneAccount> CREATOR; field public static final int NO_HIGHLIGHT_COLOR = 0; // 0x0 - field public static final int NO_ICON_TINT = 0; // 0x0 field public static final int NO_RESOURCE_ID = -1; // 0xffffffff field public static final java.lang.String SCHEME_SIP = "sip"; field public static final java.lang.String SCHEME_TEL = "tel"; @@ -30354,11 +30342,7 @@ package android.telecom { method public android.telecom.PhoneAccount.Builder setAddress(android.net.Uri); method public android.telecom.PhoneAccount.Builder setCapabilities(int); method public android.telecom.PhoneAccount.Builder setHighlightColor(int); - method public android.telecom.PhoneAccount.Builder setIcon(android.content.Context, int); - method public android.telecom.PhoneAccount.Builder setIcon(java.lang.String, int); - method public android.telecom.PhoneAccount.Builder setIcon(android.content.Context, int, int); - method public android.telecom.PhoneAccount.Builder setIcon(java.lang.String, int, int); - method public android.telecom.PhoneAccount.Builder setIcon(android.graphics.Bitmap); + method public android.telecom.PhoneAccount.Builder setIcon(android.graphics.drawable.Icon); method public android.telecom.PhoneAccount.Builder setShortDescription(java.lang.CharSequence); method public android.telecom.PhoneAccount.Builder setSubscriptionAddress(android.net.Uri); method public android.telecom.PhoneAccount.Builder setSupportedUriSchemes(java.util.List<java.lang.String>); @@ -30388,7 +30372,7 @@ package android.telecom { method public final void registerCallback(android.telecom.RemoteConference.Callback); method public final void registerCallback(android.telecom.RemoteConference.Callback, android.os.Handler); method public void separate(android.telecom.RemoteConnection); - method public void setAudioState(android.telecom.AudioState); + method public void setCallAudioState(android.telecom.CallAudioState); method public void stopDtmfTone(); method public void swap(); method public void unhold(); @@ -30428,7 +30412,7 @@ package android.telecom { method public void registerCallback(android.telecom.RemoteConnection.Callback); method public void registerCallback(android.telecom.RemoteConnection.Callback, android.os.Handler); method public void reject(); - method public void setAudioState(android.telecom.AudioState); + method public void setCallAudioState(android.telecom.CallAudioState); method public void stopDtmfTone(); method public void unhold(); method public void unregisterCallback(android.telecom.RemoteConnection.Callback); @@ -30452,13 +30436,11 @@ package android.telecom { } public final class StatusHints implements android.os.Parcelable { - ctor public StatusHints(android.content.ComponentName, java.lang.CharSequence, int, android.os.Bundle); + ctor public StatusHints(java.lang.CharSequence, android.graphics.drawable.Icon, android.os.Bundle); method public int describeContents(); method public android.os.Bundle getExtras(); - method public android.graphics.drawable.Drawable getIcon(android.content.Context); - method public int getIconResId(); + method public android.graphics.drawable.Icon getIcon(); method public java.lang.CharSequence getLabel(); - method public android.content.ComponentName getPackageName(); method public void writeToParcel(android.os.Parcel, int); field public static final android.os.Parcelable.Creator<android.telecom.StatusHints> CREATOR; } @@ -30572,7 +30554,7 @@ package android.telephony { field public static final java.lang.String BOOL_OPERATOR_SELECTION_EXPAND = "bool_operator_selection_expand"; field public static final java.lang.String BOOL_PREFER_2G = "bool_prefer_2g"; field public static final java.lang.String BOOL_SHOW_APN_SETTING_CDMA = "bool_show_apn_setting_cdma"; - field public static final java.lang.String BOOL_SHOW_CDMA = "bool_show_cdma"; + field public static final java.lang.String BOOL_SHOW_CDMA_CHOICES = "bool_show_cdma_choices"; field public static final java.lang.String BOOL_SHOW_ONSCREEN_DIAL_BUTTON = "bool_show_onscreen_dial_button"; field public static final java.lang.String BOOL_SIM_NETWORK_UNLOCK_ALLOW_DISMISS = "bool_sim_network_unlock_allow_dismiss"; field public static final java.lang.String BOOL_SUPPORT_PAUSE_IMS_VIDEO_CALLS = "bool_support_pause_ims_video_calls"; @@ -35368,6 +35350,7 @@ package android.view { method public static java.lang.String axisToString(int); method public final int findPointerIndex(int); method public final int getAction(); + method public final int getActionButton(); method public final int getActionIndex(); method public final int getActionMasked(); method public final float getAxisValue(int); @@ -35431,7 +35414,6 @@ package android.view { method public final float getY(int); method public final float getYPrecision(); method public final boolean isButtonPressed(int); - method public final boolean isStylusButtonPressed(); method public static android.view.MotionEvent obtain(long, long, int, int, android.view.MotionEvent.PointerProperties[], android.view.MotionEvent.PointerCoords[], int, int, float, float, int, int, int, int); method public static deprecated android.view.MotionEvent obtain(long, long, int, int, int[], android.view.MotionEvent.PointerCoords[], int, float, float, int, int, int, int); method public static android.view.MotionEvent obtain(long, long, int, float, float, float, float, int, float, float, int, int); @@ -35447,6 +35429,8 @@ package android.view { method public final void setSource(int); method public final void transform(android.graphics.Matrix); method public void writeToParcel(android.os.Parcel, int); + field public static final int ACTION_BUTTON_PRESS = 11; // 0xb + field public static final int ACTION_BUTTON_RELEASE = 12; // 0xc field public static final int ACTION_CANCEL = 3; // 0x3 field public static final int ACTION_DOWN = 0; // 0x0 field public static final int ACTION_HOVER_ENTER = 9; // 0x9 @@ -35515,6 +35499,8 @@ package android.view { field public static final int BUTTON_FORWARD = 16; // 0x10 field public static final int BUTTON_PRIMARY = 1; // 0x1 field public static final int BUTTON_SECONDARY = 2; // 0x2 + field public static final int BUTTON_STYLUS_PRIMARY = 32; // 0x20 + field public static final int BUTTON_STYLUS_SECONDARY = 64; // 0x40 field public static final int BUTTON_TERTIARY = 4; // 0x4 field public static final android.os.Parcelable.Creator<android.view.MotionEvent> CREATOR; field public static final int EDGE_BOTTOM = 2; // 0x2 @@ -38800,7 +38786,6 @@ package android.webkit { } public abstract class WebMessagePort { - ctor public WebMessagePort(); method public abstract void close(); method public abstract void postMessage(android.webkit.WebMessage); method public abstract void setWebMessageCallback(android.webkit.WebMessagePort.WebMessageCallback); @@ -38813,8 +38798,7 @@ package android.webkit { } public abstract class WebResourceError { - ctor public WebResourceError(); - method public abstract java.lang.String getDescription(); + method public java.lang.CharSequence getDescription(); method public abstract int getErrorCode(); } @@ -38844,12 +38828,6 @@ package android.webkit { public abstract class WebResourceResponseBase { ctor public WebResourceResponseBase(); - method public abstract java.io.InputStream getData(); - method public abstract java.lang.String getEncoding(); - method public abstract java.lang.String getMimeType(); - method public abstract java.lang.String getReasonPhrase(); - method public abstract java.util.Map<java.lang.String, java.lang.String> getResponseHeaders(); - method public abstract int getStatusCode(); } public abstract class WebSettings { @@ -39098,9 +39076,9 @@ package android.webkit { method public boolean pageDown(boolean); method public boolean pageUp(boolean); method public void pauseTimers(); - method public void postMessageToMainFrame(android.webkit.WebMessage, android.net.Uri); method public void postUrl(java.lang.String, byte[]); method public void postVisualStateCallback(long, android.webkit.WebView.VisualStateCallback); + method public void postWebMessage(android.webkit.WebMessage, android.net.Uri); method public void reload(); method public void removeJavascriptInterface(java.lang.String); method public void requestFocusNodeHref(android.os.Message); @@ -39181,6 +39159,7 @@ package android.webkit { method public void onReceivedError(android.webkit.WebView, android.webkit.WebResourceRequest, android.webkit.WebResourceError); method public void onReceivedHttpAuthRequest(android.webkit.WebView, android.webkit.HttpAuthHandler, java.lang.String, java.lang.String); method public void onReceivedHttpError(android.webkit.WebView, android.webkit.WebResourceRequest, android.webkit.WebResourceResponseBase); + method public void onReceivedHttpError(android.webkit.WebView, android.webkit.WebResourceRequest, android.webkit.WebResourceResponse); method public void onReceivedLoginRequest(android.webkit.WebView, java.lang.String, java.lang.String, java.lang.String); method public void onReceivedSslError(android.webkit.WebView, android.webkit.SslErrorHandler, android.net.http.SslError); method public void onScaleChanged(android.webkit.WebView, float, float); @@ -40283,6 +40262,7 @@ package android.widget { method public void setImageAlpha(int); method public void setImageBitmap(android.graphics.Bitmap); method public void setImageDrawable(android.graphics.drawable.Drawable); + method public void setImageIcon(android.graphics.drawable.Icon); method public void setImageLevel(int); method public void setImageMatrix(android.graphics.Matrix); method public void setImageResource(int); @@ -40863,7 +40843,9 @@ package android.widget { method public void setDouble(int, java.lang.String, double); method public void setEmptyView(int, int); method public void setFloat(int, java.lang.String, float); + method public void setIcon(int, java.lang.String, android.graphics.drawable.Icon); method public void setImageViewBitmap(int, android.graphics.Bitmap); + method public void setImageViewIcon(int, android.graphics.drawable.Icon); method public void setImageViewResource(int, int); method public void setImageViewUri(int, android.net.Uri); method public void setInt(int, java.lang.String, int); diff --git a/api/system-current.txt b/api/system-current.txt index 832895c..351ec8e 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -28,11 +28,11 @@ package android { field public static final java.lang.String BATTERY_STATS = "android.permission.BATTERY_STATS"; field public static final java.lang.String BIND_ACCESSIBILITY_SERVICE = "android.permission.BIND_ACCESSIBILITY_SERVICE"; field public static final java.lang.String BIND_APPWIDGET = "android.permission.BIND_APPWIDGET"; - field public static final java.lang.String BIND_CARRIER_CONFIG_SERVICE = "android.permission.BIND_CARRIER_CONFIG_SERVICE"; - field public static final java.lang.String BIND_CARRIER_MESSAGING_SERVICE = "android.permission.BIND_CARRIER_MESSAGING_SERVICE"; + field public static final deprecated java.lang.String BIND_CARRIER_MESSAGING_SERVICE = "android.permission.BIND_CARRIER_MESSAGING_SERVICE"; + field public static final java.lang.String BIND_CARRIER_SERVICES = "android.permission.BIND_CARRIER_SERVICES"; field public static final java.lang.String BIND_CHOOSER_TARGET_SERVICE = "android.permission.BIND_CHOOSER_TARGET_SERVICE"; field public static final java.lang.String BIND_CONDITION_PROVIDER_SERVICE = "android.permission.BIND_CONDITION_PROVIDER_SERVICE"; - field public static final java.lang.String BIND_CONNECTION_SERVICE = "android.permission.BIND_CONNECTION_SERVICE"; + field public static final deprecated java.lang.String BIND_CONNECTION_SERVICE = "android.permission.BIND_CONNECTION_SERVICE"; field public static final java.lang.String BIND_DEVICE_ADMIN = "android.permission.BIND_DEVICE_ADMIN"; field public static final java.lang.String BIND_DIRECTORY_SEARCH = "android.permission.BIND_DIRECTORY_SEARCH"; field public static final java.lang.String BIND_DREAM_SERVICE = "android.permission.BIND_DREAM_SERVICE"; @@ -43,6 +43,7 @@ package android { field public static final java.lang.String BIND_NOTIFICATION_LISTENER_SERVICE = "android.permission.BIND_NOTIFICATION_LISTENER_SERVICE"; field public static final java.lang.String BIND_PRINT_SERVICE = "android.permission.BIND_PRINT_SERVICE"; field public static final java.lang.String BIND_REMOTEVIEWS = "android.permission.BIND_REMOTEVIEWS"; + field public static final java.lang.String BIND_TELECOM_CONNECTION_SERVICE = "android.permission.BIND_TELECOM_CONNECTION_SERVICE"; field public static final java.lang.String BIND_TEXT_SERVICE = "android.permission.BIND_TEXT_SERVICE"; field public static final java.lang.String BIND_TRUST_AGENT = "android.permission.BIND_TRUST_AGENT"; field public static final java.lang.String BIND_TV_INPUT = "android.permission.BIND_TV_INPUT"; @@ -3975,6 +3976,7 @@ package android.app { field public static final java.lang.String OPSTR_COARSE_LOCATION = "android:coarse_location"; field public static final java.lang.String OPSTR_FINE_LOCATION = "android:fine_location"; field public static final java.lang.String OPSTR_GET_USAGE_STATS = "android:get_usage_stats"; + field public static final java.lang.String OPSTR_MOCK_LOCATION = "android:mock_location"; field public static final java.lang.String OPSTR_MONITOR_HIGH_POWER_LOCATION = "android:monitor_location_high_power"; field public static final java.lang.String OPSTR_MONITOR_LOCATION = "android:monitor_location"; } @@ -4873,6 +4875,8 @@ package android.app { method public android.app.Notification clone(); method public int describeContents(); method public java.lang.String getGroup(); + method public android.graphics.drawable.Icon getLargeIcon(); + method public android.graphics.drawable.Icon getSmallIcon(); method public java.lang.String getSortKey(); method public deprecated void setLatestEventInfo(android.content.Context, java.lang.CharSequence, java.lang.CharSequence, android.app.PendingIntent); method public void writeToParcel(android.os.Parcel, int); @@ -5017,6 +5021,7 @@ package android.app { ctor public Notification.BigPictureStyle(); ctor public Notification.BigPictureStyle(android.app.Notification.Builder); method public android.app.Notification.BigPictureStyle bigLargeIcon(android.graphics.Bitmap); + method public android.app.Notification.BigPictureStyle bigLargeIcon(android.graphics.drawable.Icon); method public android.app.Notification.BigPictureStyle bigPicture(android.graphics.Bitmap); method public android.app.Notification.BigPictureStyle setBigContentTitle(java.lang.CharSequence); method public android.app.Notification.BigPictureStyle setSummaryText(java.lang.CharSequence); @@ -5055,6 +5060,7 @@ package android.app { method public android.app.Notification.Builder setGroup(java.lang.String); method public android.app.Notification.Builder setGroupSummary(boolean); method public android.app.Notification.Builder setLargeIcon(android.graphics.Bitmap); + method public android.app.Notification.Builder setLargeIcon(android.graphics.drawable.Icon); method public android.app.Notification.Builder setLights(int, int, int); method public android.app.Notification.Builder setLocalOnly(boolean); method public android.app.Notification.Builder setNumber(int); @@ -5066,6 +5072,7 @@ package android.app { method public android.app.Notification.Builder setShowWhen(boolean); method public android.app.Notification.Builder setSmallIcon(int); method public android.app.Notification.Builder setSmallIcon(int, int); + method public android.app.Notification.Builder setSmallIcon(android.graphics.drawable.Icon); method public android.app.Notification.Builder setSortKey(java.lang.String); method public android.app.Notification.Builder setSound(android.net.Uri); method public deprecated android.app.Notification.Builder setSound(android.net.Uri, int); @@ -5724,7 +5731,7 @@ package android.app.admin { ctor public DeviceAdminReceiver(); method public android.app.admin.DevicePolicyManager getManager(android.content.Context); method public android.content.ComponentName getWho(android.content.Context); - method public java.lang.String onChoosePrivateKeyAlias(android.content.Context, android.content.Intent, int, java.lang.String, int, java.lang.String, java.lang.String); + method public java.lang.String onChoosePrivateKeyAlias(android.content.Context, android.content.Intent, int, android.net.Uri, java.lang.String); method public java.lang.CharSequence onDisableRequested(android.content.Context, android.content.Intent); method public void onDisabled(android.content.Context, android.content.Intent); method public void onEnabled(android.content.Context, android.content.Intent); @@ -5856,7 +5863,7 @@ package android.app.admin { method public void setCameraDisabled(android.content.ComponentName, boolean); method public void setCertInstallerPackage(android.content.ComponentName, java.lang.String) throws java.lang.SecurityException; method public void setCrossProfileCallerIdDisabled(android.content.ComponentName, boolean); - method public boolean setDeviceInitializer(android.content.ComponentName, android.content.ComponentName, java.lang.String) throws java.lang.IllegalArgumentException, java.lang.IllegalStateException; + method public boolean setDeviceInitializer(android.content.ComponentName, android.content.ComponentName) throws java.lang.IllegalArgumentException, java.lang.IllegalStateException; method public void setGlobalSetting(android.content.ComponentName, java.lang.String, java.lang.String); method public boolean setKeyguardDisabled(android.content.ComponentName, boolean); method public void setKeyguardDisabledFeatures(android.content.ComponentName, int); @@ -6242,22 +6249,14 @@ package android.app.usage { field public static final android.os.Parcelable.Creator<android.app.usage.ConfigurationStats> CREATOR; } - public class NetworkStatsManager { - method public android.app.usage.NetworkUsageStats queryDetails(int, java.lang.String, long, long) throws android.os.RemoteException, java.lang.SecurityException; - method public android.app.usage.NetworkUsageStats queryDetailsForUid(int, java.lang.String, long, long, int) throws android.os.RemoteException, java.lang.SecurityException; - method public android.app.usage.NetworkUsageStats querySummary(int, java.lang.String, long, long) throws android.os.RemoteException, java.lang.SecurityException; - method public android.app.usage.NetworkUsageStats.Bucket querySummaryForDevice(int, java.lang.String, long, long) throws android.os.RemoteException, java.lang.SecurityException; - method public android.app.usage.NetworkUsageStats.Bucket querySummaryForUser(int, java.lang.String, long, long) throws android.os.RemoteException, java.lang.SecurityException; - } - - public final class NetworkUsageStats implements java.lang.AutoCloseable { + public final class NetworkStats implements java.lang.AutoCloseable { method public void close(); - method public boolean getNextBucket(android.app.usage.NetworkUsageStats.Bucket); + method public boolean getNextBucket(android.app.usage.NetworkStats.Bucket); method public boolean hasNextBucket(); } - public static class NetworkUsageStats.Bucket { - ctor public NetworkUsageStats.Bucket(); + public static class NetworkStats.Bucket { + ctor public NetworkStats.Bucket(); method public long getEndTimeStamp(); method public long getRxBytes(); method public long getRxPackets(); @@ -6269,10 +6268,19 @@ package android.app.usage { field public static final int STATE_ALL = -1; // 0xffffffff field public static final int STATE_DEFAULT = 1; // 0x1 field public static final int STATE_FOREGROUND = 2; // 0x2 + field public static final int UID_ALL = -1; // 0xffffffff field public static final int UID_REMOVED = -4; // 0xfffffffc field public static final int UID_TETHERING = -5; // 0xfffffffb } + public class NetworkStatsManager { + method public android.app.usage.NetworkStats queryDetails(int, java.lang.String, long, long) throws android.os.RemoteException, java.lang.SecurityException; + method public android.app.usage.NetworkStats queryDetailsForUid(int, java.lang.String, long, long, int) throws android.os.RemoteException, java.lang.SecurityException; + method public android.app.usage.NetworkStats querySummary(int, java.lang.String, long, long) throws android.os.RemoteException, java.lang.SecurityException; + method public android.app.usage.NetworkStats.Bucket querySummaryForDevice(int, java.lang.String, long, long) throws android.os.RemoteException, java.lang.SecurityException; + method public android.app.usage.NetworkStats.Bucket querySummaryForUser(int, java.lang.String, long, long) throws android.os.RemoteException, java.lang.SecurityException; + } + public final class UsageEvents implements android.os.Parcelable { method public int describeContents(); method public boolean getNextEvent(android.app.usage.UsageEvents.Event); @@ -8359,6 +8367,7 @@ package android.content { field public static final java.lang.String ACTION_MANAGE_APP_PERMISSIONS = "android.intent.action.MANAGE_APP_PERMISSIONS"; field public static final java.lang.String ACTION_MANAGE_NETWORK_USAGE = "android.intent.action.MANAGE_NETWORK_USAGE"; field public static final java.lang.String ACTION_MANAGE_PACKAGE_STORAGE = "android.intent.action.MANAGE_PACKAGE_STORAGE"; + field public static final java.lang.String ACTION_MANAGE_PERMISSIONS = "android.intent.action.MANAGE_PERMISSIONS"; field public static final java.lang.String ACTION_MANAGE_PERMISSION_APPS = "android.intent.action.MANAGE_PERMISSION_APPS"; field public static final java.lang.String ACTION_MEDIA_BAD_REMOVAL = "android.intent.action.MEDIA_BAD_REMOVAL"; field public static final java.lang.String ACTION_MEDIA_BUTTON = "android.intent.action.MEDIA_BUTTON"; @@ -9148,7 +9157,6 @@ package android.content.pm { field public int descriptionRes; field public boolean enabled; field public int flags; - field public int fullBackupContent; field public boolean hardwareAccelerated; field public int largestWidthLimitDp; field public java.lang.String manageSpaceActivityName; @@ -9670,6 +9678,7 @@ package android.content.pm { field public static final int INSTALL_FAILED_NO_SHARED_USER = -6; // 0xfffffffa field public static final int INSTALL_FAILED_OLDER_SDK = -12; // 0xfffffff4 field public static final int INSTALL_FAILED_PACKAGE_CHANGED = -23; // 0xffffffe9 + field public static final int INSTALL_FAILED_PERMISSION_MODEL_DOWNGRADE = -26; // 0xffffffe6 field public static final int INSTALL_FAILED_REPLACE_COULDNT_DELETE = -10; // 0xfffffff6 field public static final int INSTALL_FAILED_SHARED_USER_INCOMPATIBLE = -8; // 0xfffffff8 field public static final int INSTALL_FAILED_TEST_ONLY = -15; // 0xfffffff1 @@ -12710,7 +12719,7 @@ package android.graphics.drawable { method public static android.graphics.drawable.Icon createWithContentUri(android.net.Uri); method public static android.graphics.drawable.Icon createWithData(byte[], int, int); method public static android.graphics.drawable.Icon createWithFilePath(java.lang.String); - method public static android.graphics.drawable.Icon createWithResource(android.content.res.Resources, int); + method public static android.graphics.drawable.Icon createWithResource(android.content.Context, int); method public static android.graphics.drawable.Icon createWithResource(java.lang.String, int); method public int describeContents(); method public android.graphics.drawable.Drawable loadDrawable(android.content.Context); @@ -13475,7 +13484,7 @@ package android.hardware.camera2 { method public abstract void close(); method public abstract android.hardware.camera2.CameraDevice getDevice(); method public abstract android.view.Surface getInputSurface(); - method public abstract boolean isReprocessible(); + method public abstract boolean isReprocessable(); method public abstract void prepare(android.view.Surface) throws android.hardware.camera2.CameraAccessException; method public abstract int setRepeatingBurst(java.util.List<android.hardware.camera2.CaptureRequest>, android.hardware.camera2.CameraCaptureSession.CaptureCallback, android.os.Handler) throws android.hardware.camera2.CameraAccessException; method public abstract int setRepeatingRequest(android.hardware.camera2.CaptureRequest, android.hardware.camera2.CameraCaptureSession.CaptureCallback, android.os.Handler) throws android.hardware.camera2.CameraAccessException; @@ -13596,7 +13605,7 @@ package android.hardware.camera2 { method public abstract android.hardware.camera2.CaptureRequest.Builder createCaptureRequest(int) throws android.hardware.camera2.CameraAccessException; method public abstract void createCaptureSession(java.util.List<android.view.Surface>, android.hardware.camera2.CameraCaptureSession.StateCallback, android.os.Handler) throws android.hardware.camera2.CameraAccessException; method public abstract android.hardware.camera2.CaptureRequest.Builder createReprocessCaptureRequest(android.hardware.camera2.TotalCaptureResult) throws android.hardware.camera2.CameraAccessException; - method public abstract void createReprocessibleCaptureSession(android.hardware.camera2.params.InputConfiguration, java.util.List<android.view.Surface>, android.hardware.camera2.CameraCaptureSession.StateCallback, android.os.Handler) throws android.hardware.camera2.CameraAccessException; + method public abstract void createReprocessableCaptureSession(android.hardware.camera2.params.InputConfiguration, java.util.List<android.view.Surface>, android.hardware.camera2.CameraCaptureSession.StateCallback, android.os.Handler) throws android.hardware.camera2.CameraAccessException; method public abstract java.lang.String getId(); field public static final int TEMPLATE_MANUAL = 6; // 0x6 field public static final int TEMPLATE_PREVIEW = 1; // 0x1 @@ -13775,7 +13784,7 @@ package android.hardware.camera2 { field public static final int REQUEST_AVAILABLE_CAPABILITIES_DEPTH_OUTPUT = 8; // 0x8 field public static final int REQUEST_AVAILABLE_CAPABILITIES_MANUAL_POST_PROCESSING = 2; // 0x2 field public static final int REQUEST_AVAILABLE_CAPABILITIES_MANUAL_SENSOR = 1; // 0x1 - field public static final int REQUEST_AVAILABLE_CAPABILITIES_OPAQUE_REPROCESSING = 4; // 0x4 + field public static final int REQUEST_AVAILABLE_CAPABILITIES_PRIVATE_REPROCESSING = 4; // 0x4 field public static final int REQUEST_AVAILABLE_CAPABILITIES_RAW = 3; // 0x3 field public static final int REQUEST_AVAILABLE_CAPABILITIES_READ_SENSOR_SETTINGS = 5; // 0x5 field public static final int REQUEST_AVAILABLE_CAPABILITIES_YUV_REPROCESSING = 7; // 0x7 @@ -15904,10 +15913,11 @@ package android.media { public final class AudioDeviceInfo { method public int[] getChannelCounts(); + method public int[] getChannelIndexMasks(); method public int[] getChannelMasks(); - method public int[] getFormats(); + method public int[] getEncodings(); method public int getId(); - method public java.lang.CharSequence getName(); + method public java.lang.CharSequence getProductName(); method public int[] getSampleRates(); method public int getType(); method public boolean isSink(); @@ -16462,7 +16472,6 @@ package android.media { method public abstract android.media.Image.Plane[] getPlanes(); method public abstract long getTimestamp(); method public abstract int getWidth(); - method public boolean isOpaque(); method public void setCropRect(android.graphics.Rect); method public void setTimestamp(long); } @@ -16482,9 +16491,7 @@ package android.media { method public int getMaxImages(); method public android.view.Surface getSurface(); method public int getWidth(); - method public boolean isOpaque(); method public static android.media.ImageReader newInstance(int, int, int, int); - method public static android.media.ImageReader newOpaqueInstance(int, int, int); method public void setOnImageAvailableListener(android.media.ImageReader.OnImageAvailableListener, android.os.Handler); } @@ -16499,11 +16506,11 @@ package android.media { method public int getMaxImages(); method public static android.media.ImageWriter newInstance(android.view.Surface, int); method public void queueInputImage(android.media.Image); - method public void setImageListener(android.media.ImageWriter.ImageListener, android.os.Handler); + method public void setOnImageReleasedListener(android.media.ImageWriter.OnImageReleasedListener, android.os.Handler); } - public static abstract interface ImageWriter.ImageListener { - method public abstract void onInputImageReleased(android.media.ImageWriter); + public static abstract interface ImageWriter.OnImageReleasedListener { + method public abstract void onImageReleased(android.media.ImageWriter); } public class JetPlayer { @@ -16574,14 +16581,14 @@ package android.media { method public final void reset(); method public void setCallback(android.media.MediaCodec.Callback, android.os.Handler); method public void setCallback(android.media.MediaCodec.Callback); + method public void setInputSurface(android.view.Surface); method public void setOnFrameRenderedListener(android.media.MediaCodec.OnFrameRenderedListener, android.os.Handler); + method public void setOutputSurface(android.view.Surface); method public final void setParameters(android.os.Bundle); - method public void setSurface(android.view.Surface); method public final void setVideoScalingMode(int); method public final void signalEndOfInputStream(); method public final void start(); method public final void stop(); - method public void usePersistentInputSurface(android.view.Surface); field public static final int BUFFER_FLAG_CODEC_CONFIG = 2; // 0x2 field public static final int BUFFER_FLAG_END_OF_STREAM = 4; // 0x4 field public static final int BUFFER_FLAG_KEY_FRAME = 1; // 0x1 @@ -16905,9 +16912,10 @@ package android.media { ctor public MediaCryptoException(java.lang.String); } - public abstract interface MediaDataSource implements java.io.Closeable { - method public abstract long getSize(); - method public abstract int readAt(long, byte[], int); + public abstract class MediaDataSource implements java.io.Closeable { + ctor public MediaDataSource(); + method public abstract long getSize() throws java.io.IOException; + method public abstract int readAt(long, byte[], int, int) throws java.io.IOException; } public class MediaDescription implements android.os.Parcelable { @@ -16960,7 +16968,7 @@ package android.media { method public void restoreKeys(byte[], byte[]); method public void setOnEventListener(android.media.MediaDrm.OnEventListener); method public void setOnExpirationUpdateListener(android.media.MediaDrm.OnExpirationUpdateListener, android.os.Handler); - method public void setOnKeysChangeListener(android.media.MediaDrm.OnKeysChangeListener, android.os.Handler); + method public void setOnKeyStatusChangeListener(android.media.MediaDrm.OnKeyStatusChangeListener, android.os.Handler); method public void setPropertyByteArray(java.lang.String, byte[]); method public void setPropertyString(java.lang.String, java.lang.String); method public void unprovisionDevice(); @@ -16969,11 +16977,6 @@ package android.media { field public static final deprecated int EVENT_PROVISION_REQUIRED = 1; // 0x1 field public static final int EVENT_SESSION_RECLAIMED = 5; // 0x5 field public static final int EVENT_VENDOR_DEFINED = 4; // 0x4 - field public static final int KEY_STATUS_EXPIRED = 1; // 0x1 - field public static final int KEY_STATUS_INTERNAL_ERROR = 4; // 0x4 - field public static final int KEY_STATUS_OUTPUT_NOT_ALLOWED = 2; // 0x2 - field public static final int KEY_STATUS_PENDING = 3; // 0x3 - field public static final int KEY_STATUS_USABLE = 0; // 0x0 field public static final int KEY_TYPE_OFFLINE = 2; // 0x2 field public static final int KEY_TYPE_RELEASE = 3; // 0x3 field public static final int KEY_TYPE_STREAMING = 1; // 0x1 @@ -16982,9 +16985,6 @@ package android.media { field public static final java.lang.String PROPERTY_DEVICE_UNIQUE_ID = "deviceUniqueId"; field public static final java.lang.String PROPERTY_VENDOR = "vendor"; field public static final java.lang.String PROPERTY_VERSION = "version"; - field public static final int REQUEST_TYPE_INITIAL = 0; // 0x0 - field public static final int REQUEST_TYPE_RELEASE = 2; // 0x2 - field public static final int REQUEST_TYPE_RENEWAL = 1; // 0x1 } public final class MediaDrm.CryptoSession { @@ -16998,11 +16998,19 @@ package android.media { method public byte[] getData(); method public java.lang.String getDefaultUrl(); method public int getRequestType(); + field public static final int REQUEST_TYPE_INITIAL = 0; // 0x0 + field public static final int REQUEST_TYPE_RELEASE = 2; // 0x2 + field public static final int REQUEST_TYPE_RENEWAL = 1; // 0x1 } public static final class MediaDrm.KeyStatus { method public byte[] getKeyId(); method public int getStatusCode(); + field public static final int STATUS_EXPIRED = 1; // 0x1 + field public static final int STATUS_INTERNAL_ERROR = 4; // 0x4 + field public static final int STATUS_OUTPUT_NOT_ALLOWED = 2; // 0x2 + field public static final int STATUS_PENDING = 3; // 0x3 + field public static final int STATUS_USABLE = 0; // 0x0 } public static final class MediaDrm.MediaDrmStateException extends java.lang.IllegalStateException { @@ -17017,8 +17025,8 @@ package android.media { method public abstract void onExpirationUpdate(android.media.MediaDrm, byte[], long); } - public static abstract interface MediaDrm.OnKeysChangeListener { - method public abstract void onKeysChange(android.media.MediaDrm, byte[], java.util.List<android.media.MediaDrm.KeyStatus>, boolean); + public static abstract interface MediaDrm.OnKeyStatusChangeListener { + method public abstract void onKeyStatusChange(android.media.MediaDrm, byte[], java.util.List<android.media.MediaDrm.KeyStatus>, boolean); } public static final class MediaDrm.ProvisionRequest { @@ -17328,11 +17336,10 @@ package android.media { method public void setOnInfoListener(android.media.MediaPlayer.OnInfoListener); method public void setOnPreparedListener(android.media.MediaPlayer.OnPreparedListener); method public void setOnSeekCompleteListener(android.media.MediaPlayer.OnSeekCompleteListener); - method public void setOnTimedMetaDataListener(android.media.MediaPlayer.OnTimedMetaDataListener); + method public void setOnTimedMetaDataAvailableListener(android.media.MediaPlayer.OnTimedMetaDataAvailableListener); method public void setOnTimedTextListener(android.media.MediaPlayer.OnTimedTextListener); method public void setOnVideoSizeChangedListener(android.media.MediaPlayer.OnVideoSizeChangedListener); method public void setPlaybackParams(android.media.PlaybackParams); - method public void setPlaybackRate(float, int); method public void setScreenOnWhilePlaying(boolean); method public void setSurface(android.view.Surface); method public void setSyncParams(android.media.SyncParams); @@ -17359,9 +17366,6 @@ package android.media { field public static final int MEDIA_INFO_VIDEO_RENDERING_START = 3; // 0x3 field public static final int MEDIA_INFO_VIDEO_TRACK_LAGGING = 700; // 0x2bc field public static final java.lang.String MEDIA_MIMETYPE_TEXT_SUBRIP = "application/x-subrip"; - field public static final int PLAYBACK_RATE_AUDIO_MODE_DEFAULT = 0; // 0x0 - field public static final int PLAYBACK_RATE_AUDIO_MODE_RESAMPLE = 2; // 0x2 - field public static final int PLAYBACK_RATE_AUDIO_MODE_STRETCH = 1; // 0x1 field public static final int VIDEO_SCALING_MODE_SCALE_TO_FIT = 1; // 0x1 field public static final int VIDEO_SCALING_MODE_SCALE_TO_FIT_WITH_CROPPING = 2; // 0x2 } @@ -17390,8 +17394,8 @@ package android.media { method public abstract void onSeekComplete(android.media.MediaPlayer); } - public static abstract interface MediaPlayer.OnTimedMetaDataListener { - method public abstract void onTimedMetaData(android.media.MediaPlayer, android.media.TimedMetaData); + public static abstract interface MediaPlayer.OnTimedMetaDataAvailableListener { + method public abstract void onTimedMetaDataAvailable(android.media.MediaPlayer, android.media.TimedMetaData); } public static abstract interface MediaPlayer.OnTimedTextListener { @@ -17431,6 +17435,7 @@ package android.media { method public void setAudioSource(int) throws java.lang.IllegalStateException; method public deprecated void setCamera(android.hardware.Camera); method public void setCaptureRate(double); + method public void setInputSurface(android.view.Surface); method public void setLocation(float, float); method public void setMaxDuration(int) throws java.lang.IllegalArgumentException; method public void setMaxFileSize(long) throws java.lang.IllegalArgumentException; @@ -17449,7 +17454,6 @@ package android.media { method public void setVideoSource(int) throws java.lang.IllegalStateException; method public void start() throws java.lang.IllegalStateException; method public void stop() throws java.lang.IllegalStateException; - method public void usePersistentSurface(android.view.Surface); field public static final int MEDIA_ERROR_SERVER_DIED = 100; // 0x64 field public static final int MEDIA_RECORDER_ERROR_UNKNOWN = 1; // 0x1 field public static final int MEDIA_RECORDER_INFO_MAX_DURATION_REACHED = 800; // 0x320 @@ -17665,14 +17669,10 @@ package android.media { method public void setCallback(android.media.MediaSync.Callback, android.os.Handler); method public void setOnErrorListener(android.media.MediaSync.OnErrorListener, android.os.Handler); method public void setPlaybackParams(android.media.PlaybackParams); - method public void setPlaybackRate(float, int); method public void setSurface(android.view.Surface); method public void setSyncParams(android.media.SyncParams); field public static final int MEDIASYNC_ERROR_AUDIOTRACK_FAIL = 1; // 0x1 field public static final int MEDIASYNC_ERROR_SURFACE_FAIL = 2; // 0x2 - field public static final int PLAYBACK_RATE_AUDIO_MODE_DEFAULT = 0; // 0x0 - field public static final int PLAYBACK_RATE_AUDIO_MODE_RESAMPLE = 2; // 0x2 - field public static final int PLAYBACK_RATE_AUDIO_MODE_STRETCH = 1; // 0x1 } public static abstract class MediaSync.Callback { @@ -17694,9 +17694,9 @@ package android.media { } public final class MediaTimestamp { - field public final float clockRate; - field public final long mediaTimeUs; - field public final long nanoTime; + method public long getAnchorMediaTimeUs(); + method public long getAnchorSytemNanoTime(); + method public float getMediaClockRate(); } public final class NotProvisionedException extends android.media.MediaDrmException { @@ -17930,9 +17930,9 @@ package android.media { field public static final int OPTIONS_RECYCLE_INPUT = 2; // 0x2 } - public class TimedMetaData { - method public byte[] getRawData(); - method public long getTimeUs(); + public final class TimedMetaData { + method public byte[] getMetaData(); + method public long getTimestamp(); } public final class TimedText { @@ -19302,7 +19302,7 @@ package android.media.tv { method public void onTimeShiftPause(); method public void onTimeShiftResume(); method public void onTimeShiftSeekTo(long); - method public void onTimeShiftSetPlaybackRate(float, int); + method public void onTimeShiftSetPlaybackParams(android.media.PlaybackParams); method public boolean onTouchEvent(android.view.MotionEvent); method public boolean onTrackballEvent(android.view.MotionEvent); method public abstract boolean onTune(android.net.Uri); @@ -19338,7 +19338,7 @@ package android.media.tv { method public int describeContents(); method public final int getAudioChannelCount(); method public final int getAudioSampleRate(); - method public final java.lang.String getDescription(); + method public final java.lang.CharSequence getDescription(); method public final android.os.Bundle getExtra(); method public final java.lang.String getId(); method public final java.lang.String getLanguage(); @@ -19359,7 +19359,7 @@ package android.media.tv { method public android.media.tv.TvTrackInfo build(); method public final android.media.tv.TvTrackInfo.Builder setAudioChannelCount(int); method public final android.media.tv.TvTrackInfo.Builder setAudioSampleRate(int); - method public final android.media.tv.TvTrackInfo.Builder setDescription(java.lang.String); + method public final android.media.tv.TvTrackInfo.Builder setDescription(java.lang.CharSequence); method public final android.media.tv.TvTrackInfo.Builder setExtra(android.os.Bundle); method public final android.media.tv.TvTrackInfo.Builder setLanguage(java.lang.String); method public final android.media.tv.TvTrackInfo.Builder setVideoFrameRate(float); @@ -19392,7 +19392,7 @@ package android.media.tv { method public void timeShiftPause(); method public void timeShiftResume(); method public void timeShiftSeekTo(long); - method public void timeShiftSetPlaybackRate(float, int); + method public void timeShiftSetPlaybackParams(android.media.PlaybackParams); method public void tune(java.lang.String, android.net.Uri); method public void tune(java.lang.String, android.net.Uri, android.os.Bundle); method public void unblockContent(android.media.tv.TvContentRating); @@ -28627,7 +28627,7 @@ package android.provider { field public static final java.lang.String ACCESSIBILITY_SPEAK_PASSWORD = "speak_password"; field public static final deprecated java.lang.String ADB_ENABLED = "adb_enabled"; field public static final java.lang.String ALLOWED_GEOLOCATION_ORIGINS = "allowed_geolocation_origins"; - field public static final java.lang.String ALLOW_MOCK_LOCATION = "mock_location"; + field public static final deprecated java.lang.String ALLOW_MOCK_LOCATION = "mock_location"; field public static final java.lang.String ANDROID_ID = "android_id"; field public static final deprecated java.lang.String BACKGROUND_DATA = "background_data"; field public static final deprecated java.lang.String BLUETOOTH_ON = "bluetooth_on"; @@ -30356,7 +30356,7 @@ package android.security { public final class KeyChain { ctor public KeyChain(); method public static void choosePrivateKeyAlias(android.app.Activity, android.security.KeyChainAliasCallback, java.lang.String[], java.security.Principal[], java.lang.String, int, java.lang.String); - method public static void choosePrivateKeyAlias(android.app.Activity, android.security.KeyChainAliasCallback, java.lang.String[], java.security.Principal[], java.lang.String, int, java.lang.String, java.lang.String); + method public static void choosePrivateKeyAlias(android.app.Activity, android.security.KeyChainAliasCallback, java.lang.String[], java.security.Principal[], android.net.Uri, java.lang.String); method public static android.content.Intent createInstallIntent(); method public static java.security.cert.X509Certificate[] getCertificateChain(android.content.Context, java.lang.String) throws java.lang.InterruptedException, android.security.KeyChainException; method public static java.security.PrivateKey getPrivateKey(android.content.Context, java.lang.String) throws java.lang.InterruptedException, android.security.KeyChainException; @@ -30379,15 +30379,67 @@ package android.security { ctor public KeyChainException(java.lang.Throwable); } + public final deprecated class KeyPairGeneratorSpec implements java.security.spec.AlgorithmParameterSpec { + method public java.security.spec.AlgorithmParameterSpec getAlgorithmParameterSpec(); + method public android.content.Context getContext(); + method public java.util.Date getEndDate(); + method public int getKeySize(); + method public java.lang.String getKeyType(); + method public java.lang.String getKeystoreAlias(); + method public java.math.BigInteger getSerialNumber(); + method public java.util.Date getStartDate(); + method public javax.security.auth.x500.X500Principal getSubjectDN(); + method public boolean isEncryptionRequired(); + } + + public static final deprecated class KeyPairGeneratorSpec.Builder { + ctor public KeyPairGeneratorSpec.Builder(android.content.Context); + method public android.security.KeyPairGeneratorSpec build(); + method public android.security.KeyPairGeneratorSpec.Builder setAlgorithmParameterSpec(java.security.spec.AlgorithmParameterSpec); + method public android.security.KeyPairGeneratorSpec.Builder setAlias(java.lang.String); + method public android.security.KeyPairGeneratorSpec.Builder setEncryptionRequired(); + method public android.security.KeyPairGeneratorSpec.Builder setEndDate(java.util.Date); + method public android.security.KeyPairGeneratorSpec.Builder setKeySize(int); + method public android.security.KeyPairGeneratorSpec.Builder setKeyType(java.lang.String) throws java.security.NoSuchAlgorithmException; + method public android.security.KeyPairGeneratorSpec.Builder setSerialNumber(java.math.BigInteger); + method public android.security.KeyPairGeneratorSpec.Builder setStartDate(java.util.Date); + method public android.security.KeyPairGeneratorSpec.Builder setSubject(javax.security.auth.x500.X500Principal); + } + + public final deprecated class KeyStoreParameter implements java.security.KeyStore.ProtectionParameter { + method public android.content.Context getContext(); + method public boolean isEncryptionRequired(); + } + + public static final deprecated class KeyStoreParameter.Builder { + ctor public KeyStoreParameter.Builder(android.content.Context); + method public android.security.KeyStoreParameter build(); + method public android.security.KeyStoreParameter.Builder setEncryptionRequired(boolean); + } + + public class NetworkSecurityPolicy { + method public static android.security.NetworkSecurityPolicy getInstance(); + method public boolean isCleartextTrafficPermitted(); + } + +} + +package android.security.keystore { + public class KeyExpiredException extends java.security.InvalidKeyException { ctor public KeyExpiredException(); ctor public KeyExpiredException(java.lang.String); ctor public KeyExpiredException(java.lang.String, java.lang.Throwable); } - public class KeyGeneratorSpec implements java.security.spec.AlgorithmParameterSpec { + public final class KeyGenParameterSpec implements java.security.spec.AlgorithmParameterSpec { + method public java.security.spec.AlgorithmParameterSpec getAlgorithmParameterSpec(); method public java.lang.String[] getBlockModes(); - method public android.content.Context getContext(); + method public java.util.Date getCertificateNotAfter(); + method public java.util.Date getCertificateNotBefore(); + method public java.math.BigInteger getCertificateSerialNumber(); + method public javax.security.auth.x500.X500Principal getCertificateSubject(); + method public java.lang.String[] getDigests(); method public java.lang.String[] getEncryptionPaddings(); method public int getKeySize(); method public java.util.Date getKeyValidityForConsumptionEnd(); @@ -30395,84 +30447,57 @@ package android.security { method public java.util.Date getKeyValidityStart(); method public java.lang.String getKeystoreAlias(); method public int getPurposes(); + method public java.lang.String[] getSignaturePaddings(); method public int getUserAuthenticationValidityDurationSeconds(); - method public boolean isEncryptionRequired(); + method public boolean isDigestsSpecified(); method public boolean isRandomizedEncryptionRequired(); method public boolean isUserAuthenticationRequired(); } - public static class KeyGeneratorSpec.Builder { - ctor public KeyGeneratorSpec.Builder(android.content.Context); - method public android.security.KeyGeneratorSpec build(); - method public android.security.KeyGeneratorSpec.Builder setAlias(java.lang.String); - method public android.security.KeyGeneratorSpec.Builder setBlockModes(java.lang.String...); - method public android.security.KeyGeneratorSpec.Builder setEncryptionPaddings(java.lang.String...); - method public android.security.KeyGeneratorSpec.Builder setEncryptionRequired(); - method public android.security.KeyGeneratorSpec.Builder setKeySize(int); - method public android.security.KeyGeneratorSpec.Builder setKeyValidityEnd(java.util.Date); - method public android.security.KeyGeneratorSpec.Builder setKeyValidityForConsumptionEnd(java.util.Date); - method public android.security.KeyGeneratorSpec.Builder setKeyValidityForOriginationEnd(java.util.Date); - method public android.security.KeyGeneratorSpec.Builder setKeyValidityStart(java.util.Date); - method public android.security.KeyGeneratorSpec.Builder setPurposes(int); - method public android.security.KeyGeneratorSpec.Builder setRandomizedEncryptionRequired(boolean); - method public android.security.KeyGeneratorSpec.Builder setUserAuthenticationRequired(boolean); - method public android.security.KeyGeneratorSpec.Builder setUserAuthenticationValidityDurationSeconds(int); - } - - public class KeyNotYetValidException extends java.security.InvalidKeyException { - ctor public KeyNotYetValidException(); - ctor public KeyNotYetValidException(java.lang.String); - ctor public KeyNotYetValidException(java.lang.String, java.lang.Throwable); - } - - public final class KeyPairGeneratorSpec implements java.security.spec.AlgorithmParameterSpec { - method public java.security.spec.AlgorithmParameterSpec getAlgorithmParameterSpec(); + public static final class KeyGenParameterSpec.Builder { + ctor public KeyGenParameterSpec.Builder(java.lang.String, int); + method public android.security.keystore.KeyGenParameterSpec build(); + method public android.security.keystore.KeyGenParameterSpec.Builder setAlgorithmParameterSpec(java.security.spec.AlgorithmParameterSpec); + method public android.security.keystore.KeyGenParameterSpec.Builder setBlockModes(java.lang.String...); + method public android.security.keystore.KeyGenParameterSpec.Builder setCertificateNotAfter(java.util.Date); + method public android.security.keystore.KeyGenParameterSpec.Builder setCertificateNotBefore(java.util.Date); + method public android.security.keystore.KeyGenParameterSpec.Builder setCertificateSerialNumber(java.math.BigInteger); + method public android.security.keystore.KeyGenParameterSpec.Builder setCertificateSubject(javax.security.auth.x500.X500Principal); + method public android.security.keystore.KeyGenParameterSpec.Builder setDigests(java.lang.String...); + method public android.security.keystore.KeyGenParameterSpec.Builder setEncryptionPaddings(java.lang.String...); + method public android.security.keystore.KeyGenParameterSpec.Builder setKeySize(int); + method public android.security.keystore.KeyGenParameterSpec.Builder setKeyValidityEnd(java.util.Date); + method public android.security.keystore.KeyGenParameterSpec.Builder setKeyValidityForConsumptionEnd(java.util.Date); + method public android.security.keystore.KeyGenParameterSpec.Builder setKeyValidityForOriginationEnd(java.util.Date); + method public android.security.keystore.KeyGenParameterSpec.Builder setKeyValidityStart(java.util.Date); + method public android.security.keystore.KeyGenParameterSpec.Builder setRandomizedEncryptionRequired(boolean); + method public android.security.keystore.KeyGenParameterSpec.Builder setSignaturePaddings(java.lang.String...); + method public android.security.keystore.KeyGenParameterSpec.Builder setUserAuthenticationRequired(boolean); + method public android.security.keystore.KeyGenParameterSpec.Builder setUserAuthenticationValidityDurationSeconds(int); + } + + public class KeyInfo implements java.security.spec.KeySpec { method public java.lang.String[] getBlockModes(); - method public android.content.Context getContext(); method public java.lang.String[] getDigests(); method public java.lang.String[] getEncryptionPaddings(); - method public java.util.Date getEndDate(); method public int getKeySize(); - method public java.lang.String getKeyType(); method public java.util.Date getKeyValidityForConsumptionEnd(); method public java.util.Date getKeyValidityForOriginationEnd(); method public java.util.Date getKeyValidityStart(); method public java.lang.String getKeystoreAlias(); + method public int getOrigin(); method public int getPurposes(); - method public java.math.BigInteger getSerialNumber(); method public java.lang.String[] getSignaturePaddings(); - method public java.util.Date getStartDate(); - method public javax.security.auth.x500.X500Principal getSubjectDN(); method public int getUserAuthenticationValidityDurationSeconds(); - method public boolean isEncryptionRequired(); - method public boolean isRandomizedEncryptionRequired(); + method public boolean isInsideSecureHardware(); method public boolean isUserAuthenticationRequired(); + method public boolean isUserAuthenticationRequirementEnforcedBySecureHardware(); } - public static final class KeyPairGeneratorSpec.Builder { - ctor public KeyPairGeneratorSpec.Builder(android.content.Context); - method public android.security.KeyPairGeneratorSpec build(); - method public android.security.KeyPairGeneratorSpec.Builder setAlgorithmParameterSpec(java.security.spec.AlgorithmParameterSpec); - method public android.security.KeyPairGeneratorSpec.Builder setAlias(java.lang.String); - method public android.security.KeyPairGeneratorSpec.Builder setBlockModes(java.lang.String...); - method public android.security.KeyPairGeneratorSpec.Builder setDigests(java.lang.String...); - method public android.security.KeyPairGeneratorSpec.Builder setEncryptionPaddings(java.lang.String...); - method public android.security.KeyPairGeneratorSpec.Builder setEncryptionRequired(); - method public android.security.KeyPairGeneratorSpec.Builder setEndDate(java.util.Date); - method public android.security.KeyPairGeneratorSpec.Builder setKeySize(int); - method public android.security.KeyPairGeneratorSpec.Builder setKeyType(java.lang.String) throws java.security.NoSuchAlgorithmException; - method public android.security.KeyPairGeneratorSpec.Builder setKeyValidityEnd(java.util.Date); - method public android.security.KeyPairGeneratorSpec.Builder setKeyValidityForConsumptionEnd(java.util.Date); - method public android.security.KeyPairGeneratorSpec.Builder setKeyValidityForOriginationEnd(java.util.Date); - method public android.security.KeyPairGeneratorSpec.Builder setKeyValidityStart(java.util.Date); - method public android.security.KeyPairGeneratorSpec.Builder setPurposes(int); - method public android.security.KeyPairGeneratorSpec.Builder setRandomizedEncryptionRequired(boolean); - method public android.security.KeyPairGeneratorSpec.Builder setSerialNumber(java.math.BigInteger); - method public android.security.KeyPairGeneratorSpec.Builder setSignaturePaddings(java.lang.String...); - method public android.security.KeyPairGeneratorSpec.Builder setStartDate(java.util.Date); - method public android.security.KeyPairGeneratorSpec.Builder setSubject(javax.security.auth.x500.X500Principal); - method public android.security.KeyPairGeneratorSpec.Builder setUserAuthenticationRequired(boolean); - method public android.security.KeyPairGeneratorSpec.Builder setUserAuthenticationValidityDurationSeconds(int); + public class KeyNotYetValidException extends java.security.InvalidKeyException { + ctor public KeyNotYetValidException(); + ctor public KeyNotYetValidException(java.lang.String); + ctor public KeyNotYetValidException(java.lang.String, java.lang.Throwable); } public class KeyPermanentlyInvalidatedException extends java.security.InvalidKeyException { @@ -30481,7 +30506,7 @@ package android.security { ctor public KeyPermanentlyInvalidatedException(java.lang.String, java.lang.Throwable); } - public abstract class KeyStoreKeyProperties { + public abstract class KeyProperties { field public static final java.lang.String BLOCK_MODE_CBC = "CBC"; field public static final java.lang.String BLOCK_MODE_CTR = "CTR"; field public static final java.lang.String BLOCK_MODE_ECB = "ECB"; @@ -30516,27 +30541,8 @@ package android.security { field public static final java.lang.String SIGNATURE_PADDING_RSA_PSS = "PSS"; } - public class KeyStoreKeySpec implements java.security.spec.KeySpec { - method public java.lang.String[] getBlockModes(); - method public java.lang.String[] getDigests(); - method public java.lang.String[] getEncryptionPaddings(); - method public int getKeySize(); - method public java.util.Date getKeyValidityForConsumptionEnd(); - method public java.util.Date getKeyValidityForOriginationEnd(); - method public java.util.Date getKeyValidityStart(); - method public java.lang.String getKeystoreAlias(); - method public int getOrigin(); - method public int getPurposes(); - method public java.lang.String[] getSignaturePaddings(); - method public int getUserAuthenticationValidityDurationSeconds(); - method public boolean isInsideSecureHardware(); - method public boolean isUserAuthenticationRequired(); - method public boolean isUserAuthenticationRequirementEnforcedBySecureHardware(); - } - - public final class KeyStoreParameter implements java.security.KeyStore.ProtectionParameter { + public final class KeyProtection implements java.security.KeyStore.ProtectionParameter { method public java.lang.String[] getBlockModes(); - method public android.content.Context getContext(); method public java.lang.String[] getDigests(); method public java.lang.String[] getEncryptionPaddings(); method public java.util.Date getKeyValidityForConsumptionEnd(); @@ -30546,32 +30552,24 @@ package android.security { method public java.lang.String[] getSignaturePaddings(); method public int getUserAuthenticationValidityDurationSeconds(); method public boolean isDigestsSpecified(); - method public boolean isEncryptionRequired(); method public boolean isRandomizedEncryptionRequired(); method public boolean isUserAuthenticationRequired(); } - public static final class KeyStoreParameter.Builder { - ctor public KeyStoreParameter.Builder(android.content.Context); - method public android.security.KeyStoreParameter build(); - method public android.security.KeyStoreParameter.Builder setBlockModes(java.lang.String...); - method public android.security.KeyStoreParameter.Builder setDigests(java.lang.String...); - method public android.security.KeyStoreParameter.Builder setEncryptionPaddings(java.lang.String...); - method public android.security.KeyStoreParameter.Builder setEncryptionRequired(boolean); - method public android.security.KeyStoreParameter.Builder setKeyValidityEnd(java.util.Date); - method public android.security.KeyStoreParameter.Builder setKeyValidityForConsumptionEnd(java.util.Date); - method public android.security.KeyStoreParameter.Builder setKeyValidityForOriginationEnd(java.util.Date); - method public android.security.KeyStoreParameter.Builder setKeyValidityStart(java.util.Date); - method public android.security.KeyStoreParameter.Builder setPurposes(int); - method public android.security.KeyStoreParameter.Builder setRandomizedEncryptionRequired(boolean); - method public android.security.KeyStoreParameter.Builder setSignaturePaddings(java.lang.String...); - method public android.security.KeyStoreParameter.Builder setUserAuthenticationRequired(boolean); - method public android.security.KeyStoreParameter.Builder setUserAuthenticationValidityDurationSeconds(int); - } - - public class NetworkSecurityPolicy { - method public static android.security.NetworkSecurityPolicy getInstance(); - method public boolean isCleartextTrafficPermitted(); + public static final class KeyProtection.Builder { + ctor public KeyProtection.Builder(int); + method public android.security.keystore.KeyProtection build(); + method public android.security.keystore.KeyProtection.Builder setBlockModes(java.lang.String...); + method public android.security.keystore.KeyProtection.Builder setDigests(java.lang.String...); + method public android.security.keystore.KeyProtection.Builder setEncryptionPaddings(java.lang.String...); + method public android.security.keystore.KeyProtection.Builder setKeyValidityEnd(java.util.Date); + method public android.security.keystore.KeyProtection.Builder setKeyValidityForConsumptionEnd(java.util.Date); + method public android.security.keystore.KeyProtection.Builder setKeyValidityForOriginationEnd(java.util.Date); + method public android.security.keystore.KeyProtection.Builder setKeyValidityStart(java.util.Date); + method public android.security.keystore.KeyProtection.Builder setRandomizedEncryptionRequired(boolean); + method public android.security.keystore.KeyProtection.Builder setSignaturePaddings(java.lang.String...); + method public android.security.keystore.KeyProtection.Builder setUserAuthenticationRequired(boolean); + method public android.security.keystore.KeyProtection.Builder setUserAuthenticationValidityDurationSeconds(int); } public class UserNotAuthenticatedException extends java.security.InvalidKeyException { @@ -32063,9 +32061,10 @@ package android.system { package android.telecom { - public final class AudioState implements android.os.Parcelable { + public deprecated class AudioState implements android.os.Parcelable { ctor public AudioState(boolean, int, int); ctor public AudioState(android.telecom.AudioState); + ctor public AudioState(android.telecom.CallAudioState); method public static java.lang.String audioRouteToString(int); method public int describeContents(); method public int getRoute(); @@ -32180,11 +32179,28 @@ package android.telecom { ctor public Call.Listener(); } - public abstract class Conference implements android.telecom.Conferenceable { + public final class CallAudioState implements android.os.Parcelable { + ctor public CallAudioState(boolean, int, int); + method public static java.lang.String audioRouteToString(int); + method public int describeContents(); + method public int getRoute(); + method public int getSupportedRouteMask(); + method public boolean isMuted(); + method public void writeToParcel(android.os.Parcel, int); + field public static final android.os.Parcelable.Creator<android.telecom.CallAudioState> CREATOR; + field public static final int ROUTE_BLUETOOTH = 2; // 0x2 + field public static final int ROUTE_EARPIECE = 1; // 0x1 + field public static final int ROUTE_SPEAKER = 8; // 0x8 + field public static final int ROUTE_WIRED_HEADSET = 4; // 0x4 + field public static final int ROUTE_WIRED_OR_EARPIECE = 5; // 0x5 + } + + public abstract class Conference extends android.telecom.Conferenceable { ctor public Conference(android.telecom.PhoneAccountHandle); method public final boolean addConnection(android.telecom.Connection); method public final void destroy(); - method public final android.telecom.AudioState getAudioState(); + method public final deprecated android.telecom.AudioState getAudioState(); + method public final android.telecom.CallAudioState getCallAudioState(); method public final java.util.List<android.telecom.Connection> getConferenceableConnections(); method public final deprecated long getConnectTimeMillis(); method public final int getConnectionCapabilities(); @@ -32197,7 +32213,8 @@ package android.telecom { method public final android.telecom.StatusHints getStatusHints(); method public android.telecom.Connection.VideoProvider getVideoProvider(); method public int getVideoState(); - method public void onAudioStateChanged(android.telecom.AudioState); + method public deprecated void onAudioStateChanged(android.telecom.AudioState); + method public void onCallAudioStateChanged(android.telecom.CallAudioState); method public void onConnectionAdded(android.telecom.Connection); method public void onDisconnect(); method public void onHold(); @@ -32222,10 +32239,10 @@ package android.telecom { field public static final long CONNECT_TIME_NOT_SPECIFIED = 0L; // 0x0L } - public abstract interface Conferenceable { + public abstract class Conferenceable { } - public abstract class Connection implements android.telecom.Conferenceable { + public abstract class Connection extends android.telecom.Conferenceable { ctor public Connection(); method public static java.lang.String capabilitiesToString(int); method public static android.telecom.Connection createCanceledConnection(); @@ -32234,7 +32251,8 @@ package android.telecom { method public final android.net.Uri getAddress(); method public final int getAddressPresentation(); method public final boolean getAudioModeIsVoip(); - method public final android.telecom.AudioState getAudioState(); + method public final deprecated android.telecom.AudioState getAudioState(); + method public final android.telecom.CallAudioState getCallAudioState(); method public final java.lang.String getCallerDisplayName(); method public final int getCallerDisplayNamePresentation(); method public final android.telecom.Conference getConference(); @@ -32248,7 +32266,8 @@ package android.telecom { method public void onAbort(); method public void onAnswer(int); method public void onAnswer(); - method public void onAudioStateChanged(android.telecom.AudioState); + method public deprecated void onAudioStateChanged(android.telecom.AudioState); + method public void onCallAudioStateChanged(android.telecom.CallAudioState); method public void onDisconnect(); method public void onHold(); method public void onPlayDtmfTone(char); @@ -32406,13 +32425,13 @@ package android.telecom { public abstract class InCallService extends android.app.Service { ctor public InCallService(); method public final boolean canAddCall(); - method public final android.telecom.AudioState getAudioState(); + method public final android.telecom.CallAudioState getCallAudioState(); method public final java.util.List<android.telecom.Call> getCalls(); method public deprecated android.telecom.Phone getPhone(); - method public void onAudioStateChanged(android.telecom.AudioState); method public android.os.IBinder onBind(android.content.Intent); method public void onBringToForeground(boolean); method public void onCallAdded(android.telecom.Call); + method public void onCallAudioStateChanged(android.telecom.CallAudioState); method public void onCallRemoved(android.telecom.Call); method public void onCanAddCallChanged(boolean); method public deprecated void onPhoneCreated(android.telecom.Phone); @@ -32453,7 +32472,8 @@ package android.telecom { public final deprecated class Phone { method public final void addListener(android.telecom.Phone.Listener); method public final boolean canAddCall(); - method public final android.telecom.AudioState getAudioState(); + method public final deprecated android.telecom.AudioState getAudioState(); + method public final android.telecom.CallAudioState getCallAudioState(); method public final java.util.List<android.telecom.Call> getCalls(); method public final void removeListener(android.telecom.Phone.Listener); method public final void setAudioRoute(int); @@ -32462,25 +32482,22 @@ package android.telecom { public static abstract class Phone.Listener { ctor public Phone.Listener(); - method public void onAudioStateChanged(android.telecom.Phone, android.telecom.AudioState); + method public deprecated void onAudioStateChanged(android.telecom.Phone, android.telecom.AudioState); method public void onBringToForeground(android.telecom.Phone, boolean); method public void onCallAdded(android.telecom.Phone, android.telecom.Call); + method public void onCallAudioStateChanged(android.telecom.Phone, android.telecom.CallAudioState); method public void onCallRemoved(android.telecom.Phone, android.telecom.Call); method public void onCanAddCallChanged(android.telecom.Phone, boolean); } public final 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); method public int describeContents(); method public android.telecom.PhoneAccountHandle getAccountHandle(); method public android.net.Uri getAddress(); method public int getCapabilities(); method public int getHighlightColor(); - method public android.graphics.Bitmap getIconBitmap(); - method public java.lang.String getIconPackageName(); - method public int getIconResId(); - method public int getIconTint(); + method public android.graphics.drawable.Icon getIcon(); method public java.lang.CharSequence getLabel(); method public java.lang.CharSequence getShortDescription(); method public android.net.Uri getSubscriptionAddress(); @@ -32497,7 +32514,6 @@ package android.telecom { field public static final int CAPABILITY_VIDEO_CALLING = 8; // 0x8 field public static final android.os.Parcelable.Creator<android.telecom.PhoneAccount> CREATOR; field public static final int NO_HIGHLIGHT_COLOR = 0; // 0x0 - field public static final int NO_ICON_TINT = 0; // 0x0 field public static final int NO_RESOURCE_ID = -1; // 0xffffffff field public static final java.lang.String SCHEME_SIP = "sip"; field public static final java.lang.String SCHEME_TEL = "tel"; @@ -32512,11 +32528,7 @@ package android.telecom { method public android.telecom.PhoneAccount.Builder setAddress(android.net.Uri); method public android.telecom.PhoneAccount.Builder setCapabilities(int); method public android.telecom.PhoneAccount.Builder setHighlightColor(int); - method public android.telecom.PhoneAccount.Builder setIcon(android.content.Context, int); - method public android.telecom.PhoneAccount.Builder setIcon(java.lang.String, int); - method public android.telecom.PhoneAccount.Builder setIcon(android.content.Context, int, int); - method public android.telecom.PhoneAccount.Builder setIcon(java.lang.String, int, int); - method public android.telecom.PhoneAccount.Builder setIcon(android.graphics.Bitmap); + method public android.telecom.PhoneAccount.Builder setIcon(android.graphics.drawable.Icon); method public android.telecom.PhoneAccount.Builder setShortDescription(java.lang.CharSequence); method public android.telecom.PhoneAccount.Builder setSubscriptionAddress(android.net.Uri); method public android.telecom.PhoneAccount.Builder setSupportedUriSchemes(java.util.List<java.lang.String>); @@ -32546,7 +32558,8 @@ package android.telecom { method public final void registerCallback(android.telecom.RemoteConference.Callback); method public final void registerCallback(android.telecom.RemoteConference.Callback, android.os.Handler); method public void separate(android.telecom.RemoteConnection); - method public void setAudioState(android.telecom.AudioState); + method public deprecated void setAudioState(android.telecom.AudioState); + method public void setCallAudioState(android.telecom.CallAudioState); method public void stopDtmfTone(); method public void swap(); method public void unhold(); @@ -32586,7 +32599,8 @@ package android.telecom { method public void registerCallback(android.telecom.RemoteConnection.Callback); method public void registerCallback(android.telecom.RemoteConnection.Callback, android.os.Handler); method public void reject(); - method public void setAudioState(android.telecom.AudioState); + method public deprecated void setAudioState(android.telecom.AudioState); + method public void setCallAudioState(android.telecom.CallAudioState); method public void stopDtmfTone(); method public void unhold(); method public void unregisterCallback(android.telecom.RemoteConnection.Callback); @@ -32610,13 +32624,15 @@ package android.telecom { } public final class StatusHints implements android.os.Parcelable { - ctor public StatusHints(android.content.ComponentName, java.lang.CharSequence, int, android.os.Bundle); + ctor public deprecated StatusHints(android.content.ComponentName, java.lang.CharSequence, int, android.os.Bundle); + ctor public StatusHints(java.lang.CharSequence, android.graphics.drawable.Icon, android.os.Bundle); method public int describeContents(); method public android.os.Bundle getExtras(); - method public android.graphics.drawable.Drawable getIcon(android.content.Context); - method public int getIconResId(); + method public deprecated android.graphics.drawable.Drawable getIcon(android.content.Context); + method public android.graphics.drawable.Icon getIcon(); + method public deprecated int getIconResId(); method public java.lang.CharSequence getLabel(); - method public android.content.ComponentName getPackageName(); + method public deprecated android.content.ComponentName getPackageName(); method public void writeToParcel(android.os.Parcel, int); field public static final android.os.Parcelable.Creator<android.telecom.StatusHints> CREATOR; } @@ -32751,7 +32767,7 @@ package android.telephony { field public static final java.lang.String BOOL_OPERATOR_SELECTION_EXPAND = "bool_operator_selection_expand"; field public static final java.lang.String BOOL_PREFER_2G = "bool_prefer_2g"; field public static final java.lang.String BOOL_SHOW_APN_SETTING_CDMA = "bool_show_apn_setting_cdma"; - field public static final java.lang.String BOOL_SHOW_CDMA = "bool_show_cdma"; + field public static final java.lang.String BOOL_SHOW_CDMA_CHOICES = "bool_show_cdma_choices"; field public static final java.lang.String BOOL_SHOW_ONSCREEN_DIAL_BUTTON = "bool_show_onscreen_dial_button"; field public static final java.lang.String BOOL_SIM_NETWORK_UNLOCK_ALLOW_DISMISS = "bool_sim_network_unlock_allow_dismiss"; field public static final java.lang.String BOOL_SUPPORT_PAUSE_IMS_VIDEO_CALLS = "bool_support_pause_ims_video_calls"; @@ -37596,6 +37612,7 @@ package android.view { method public static java.lang.String axisToString(int); method public final int findPointerIndex(int); method public final int getAction(); + method public final int getActionButton(); method public final int getActionIndex(); method public final int getActionMasked(); method public final float getAxisValue(int); @@ -37659,7 +37676,6 @@ package android.view { method public final float getY(int); method public final float getYPrecision(); method public final boolean isButtonPressed(int); - method public final boolean isStylusButtonPressed(); method public static android.view.MotionEvent obtain(long, long, int, int, android.view.MotionEvent.PointerProperties[], android.view.MotionEvent.PointerCoords[], int, int, float, float, int, int, int, int); method public static deprecated android.view.MotionEvent obtain(long, long, int, int, int[], android.view.MotionEvent.PointerCoords[], int, float, float, int, int, int, int); method public static android.view.MotionEvent obtain(long, long, int, float, float, float, float, int, float, float, int, int); @@ -37675,6 +37691,8 @@ package android.view { method public final void setSource(int); method public final void transform(android.graphics.Matrix); method public void writeToParcel(android.os.Parcel, int); + field public static final int ACTION_BUTTON_PRESS = 11; // 0xb + field public static final int ACTION_BUTTON_RELEASE = 12; // 0xc field public static final int ACTION_CANCEL = 3; // 0x3 field public static final int ACTION_DOWN = 0; // 0x0 field public static final int ACTION_HOVER_ENTER = 9; // 0x9 @@ -37743,6 +37761,8 @@ package android.view { field public static final int BUTTON_FORWARD = 16; // 0x10 field public static final int BUTTON_PRIMARY = 1; // 0x1 field public static final int BUTTON_SECONDARY = 2; // 0x2 + field public static final int BUTTON_STYLUS_PRIMARY = 32; // 0x20 + field public static final int BUTTON_STYLUS_SECONDARY = 64; // 0x40 field public static final int BUTTON_TERTIARY = 4; // 0x4 field public static final android.os.Parcelable.Creator<android.view.MotionEvent> CREATOR; field public static final int EDGE_BOTTOM = 2; // 0x2 @@ -41103,7 +41123,7 @@ package android.webkit { public abstract class WebResourceError { ctor public WebResourceError(); - method public abstract java.lang.String getDescription(); + method public java.lang.CharSequence getDescription(); method public abstract int getErrorCode(); } @@ -41118,6 +41138,7 @@ package android.webkit { public class WebResourceResponse extends android.webkit.WebResourceResponseBase { ctor public WebResourceResponse(java.lang.String, java.lang.String, java.io.InputStream); ctor public WebResourceResponse(java.lang.String, java.lang.String, int, java.lang.String, java.util.Map<java.lang.String, java.lang.String>, java.io.InputStream); + ctor public WebResourceResponse(boolean, java.lang.String, java.lang.String, int, java.lang.String, java.util.Map<java.lang.String, java.lang.String>, java.io.InputStream); method public java.io.InputStream getData(); method public java.lang.String getEncoding(); method public java.lang.String getMimeType(); @@ -41133,12 +41154,6 @@ package android.webkit { public abstract class WebResourceResponseBase { ctor public WebResourceResponseBase(); - method public abstract java.io.InputStream getData(); - method public abstract java.lang.String getEncoding(); - method public abstract java.lang.String getMimeType(); - method public abstract java.lang.String getReasonPhrase(); - method public abstract java.util.Map<java.lang.String, java.lang.String> getResponseHeaders(); - method public abstract int getStatusCode(); } public abstract class WebSettings { @@ -41402,9 +41417,9 @@ package android.webkit { method public boolean pageDown(boolean); method public boolean pageUp(boolean); method public void pauseTimers(); - method public void postMessageToMainFrame(android.webkit.WebMessage, android.net.Uri); method public void postUrl(java.lang.String, byte[]); method public void postVisualStateCallback(long, android.webkit.WebView.VisualStateCallback); + method public void postWebMessage(android.webkit.WebMessage, android.net.Uri); method public void reload(); method public void removeJavascriptInterface(java.lang.String); method public void requestFocusNodeHref(android.os.Message); @@ -41515,6 +41530,7 @@ package android.webkit { method public void onReceivedError(android.webkit.WebView, android.webkit.WebResourceRequest, android.webkit.WebResourceError); method public void onReceivedHttpAuthRequest(android.webkit.WebView, android.webkit.HttpAuthHandler, java.lang.String, java.lang.String); method public void onReceivedHttpError(android.webkit.WebView, android.webkit.WebResourceRequest, android.webkit.WebResourceResponseBase); + method public void onReceivedHttpError(android.webkit.WebView, android.webkit.WebResourceRequest, android.webkit.WebResourceResponse); method public void onReceivedLoginRequest(android.webkit.WebView, java.lang.String, java.lang.String, java.lang.String); method public void onReceivedSslError(android.webkit.WebView, android.webkit.SslErrorHandler, android.net.http.SslError); method public void onScaleChanged(android.webkit.WebView, float, float); @@ -42822,6 +42838,7 @@ package android.widget { method public void setImageAlpha(int); method public void setImageBitmap(android.graphics.Bitmap); method public void setImageDrawable(android.graphics.drawable.Drawable); + method public void setImageIcon(android.graphics.drawable.Icon); method public void setImageLevel(int); method public void setImageMatrix(android.graphics.Matrix); method public void setImageResource(int); @@ -43402,7 +43419,9 @@ package android.widget { method public void setDouble(int, java.lang.String, double); method public void setEmptyView(int, int); method public void setFloat(int, java.lang.String, float); + method public void setIcon(int, java.lang.String, android.graphics.drawable.Icon); method public void setImageViewBitmap(int, android.graphics.Bitmap); + method public void setImageViewIcon(int, android.graphics.drawable.Icon); method public void setImageViewResource(int, int); method public void setImageViewUri(int, android.net.Uri); method public void setInt(int, java.lang.String, int); |