diff options
Diffstat (limited to 'api/current.txt')
-rw-r--r-- | api/current.txt | 29 |
1 files changed, 21 insertions, 8 deletions
diff --git a/api/current.txt b/api/current.txt index 0228d49..fdcda1f 100644 --- a/api/current.txt +++ b/api/current.txt @@ -3449,6 +3449,7 @@ package android.app { method public boolean onPreparePanel(int, android.view.View, android.view.Menu); method public void onProvideAssistContent(android.app.assist.AssistContent); method public void onProvideAssistData(android.os.Bundle); + method public android.net.Uri onProvideReferrer(); method public void onRequestPermissionsResult(int, java.lang.String[], int[]); method protected void onRestart(); method protected void onRestoreInstanceState(android.os.Bundle); @@ -4469,6 +4470,7 @@ package android.app { method public boolean onHasView(); method public boolean onHasWindowAnimations(); method public void onInvalidateOptionsMenu(); + method public void onRequestPermissionsFromFragment(android.app.Fragment, java.lang.String[], int); method public boolean onShouldSaveFragmentState(android.app.Fragment); method public void onStartActivityFromFragment(android.app.Fragment, android.content.Intent, int, android.os.Bundle); method public boolean onUseFragmentManagerInflaterFactory(); @@ -5489,8 +5491,11 @@ package android.app { field public static final int MODE_NIGHT_YES = 2; // 0x2 } - public class VoiceInteractor { + public final class VoiceInteractor { + method public android.app.VoiceInteractor.Request getActiveRequest(java.lang.String); + method public android.app.VoiceInteractor.Request[] getActiveRequests(); method public boolean submitRequest(android.app.VoiceInteractor.Request); + method public boolean submitRequest(android.app.VoiceInteractor.Request, java.lang.String); method public boolean[] supportsCommands(java.lang.String[]); } @@ -5553,6 +5558,7 @@ package android.app { method public void cancel(); method public android.app.Activity getActivity(); method public android.content.Context getContext(); + method public java.lang.String getName(); method public void onAttached(android.app.Activity); method public void onCancel(); method public void onDetached(); @@ -5790,7 +5796,6 @@ package android.app.admin { method public void setPermissionPolicy(android.content.ComponentName, int); method public boolean setPermittedAccessibilityServices(android.content.ComponentName, java.util.List<java.lang.String>); method public boolean setPermittedInputMethods(android.content.ComponentName, java.util.List<java.lang.String>); - method public void setPreferredSetupActivity(android.content.ComponentName, android.content.ComponentName); method public void setProfileEnabled(android.content.ComponentName); method public void setProfileName(android.content.ComponentName, java.lang.String); method public void setRecommendedGlobalProxy(android.content.ComponentName, android.net.ProxyInfo); @@ -15243,6 +15248,7 @@ package android.media { field public static final int ORIENTATION_UNDEFINED = 0; // 0x0 field public static final java.lang.String TAG_APERTURE = "FNumber"; field public static final java.lang.String TAG_DATETIME = "DateTime"; + field public static final java.lang.String TAG_DATETIME_DIGITIZED = "DateTimeDigitized"; field public static final java.lang.String TAG_EXPOSURE_TIME = "ExposureTime"; field public static final java.lang.String TAG_FLASH = "Flash"; field public static final java.lang.String TAG_FOCAL_LENGTH = "FocalLength"; @@ -15261,6 +15267,9 @@ package android.media { field public static final java.lang.String TAG_MAKE = "Make"; field public static final java.lang.String TAG_MODEL = "Model"; field public static final java.lang.String TAG_ORIENTATION = "Orientation"; + field public static final java.lang.String TAG_SUBSEC_TIME = "SubSecTime"; + field public static final java.lang.String TAG_SUBSEC_TIME_DIG = "SubSecTimeDigitized"; + field public static final java.lang.String TAG_SUBSEC_TIME_ORIG = "SubSecTimeOriginal"; field public static final java.lang.String TAG_WHITE_BALANCE = "WhiteBalance"; field public static final int WHITEBALANCE_AUTO = 0; // 0x0 field public static final int WHITEBALANCE_MANUAL = 1; // 0x1 @@ -19677,7 +19686,8 @@ package android.nfc { public final class NfcEvent { field public final android.nfc.NfcAdapter nfcAdapter; - field public final byte peerLlcpVersion; + field public final int peerLlcpMajorVersion; + field public final int peerLlcpMinorVersion; } public final class NfcManager { @@ -22900,6 +22910,8 @@ package android.os { public static class Debug.MemoryInfo implements android.os.Parcelable { ctor public Debug.MemoryInfo(); method public int describeContents(); + method public java.lang.String getMemoryStat(java.lang.String); + method public java.util.Map<java.lang.String, java.lang.String> getMemoryStats(); method public int getTotalPrivateClean(); method public int getTotalPrivateDirty(); method public int getTotalPss(); @@ -23446,6 +23458,7 @@ package android.os { method public static final int getGidForName(java.lang.String); method public static final int getThreadPriority(int) throws java.lang.IllegalArgumentException; method public static final int getUidForName(java.lang.String); + method public static final boolean is64Bit(); method public static final void killProcess(int); method public static final int myPid(); method public static final int myTid(); @@ -30604,8 +30617,8 @@ package android.telecom { field public static final java.lang.String EXTRA_CALL_DISCONNECT_CAUSE = "android.telecom.extra.CALL_DISCONNECT_CAUSE"; field public static final java.lang.String EXTRA_CALL_DISCONNECT_MESSAGE = "android.telecom.extra.CALL_DISCONNECT_MESSAGE"; field public static final java.lang.String EXTRA_CHANGE_DEFAULT_DIALER_PACKAGE_NAME = "android.telecom.extra.CHANGE_DEFAULT_DIALER_PACKAGE_NAME"; + field public static final java.lang.String EXTRA_INCOMING_CALL_ADDRESS = "android.telecom.extra.INCOMING_CALL_ADDRESS"; field public static final java.lang.String EXTRA_INCOMING_CALL_EXTRAS = "android.telecom.extra.INCOMING_CALL_EXTRAS"; - field public static final java.lang.String EXTRA_INCOMING_CALL_HANDLE = "android.telecom.extra.INCOMING_CALL_HANDLE"; field public static final java.lang.String EXTRA_OUTGOING_CALL_EXTRAS = "android.telecom.extra.OUTGOING_CALL_EXTRAS"; field public static final java.lang.String EXTRA_PHONE_ACCOUNT_HANDLE = "android.telecom.extra.PHONE_ACCOUNT_HANDLE"; field public static final java.lang.String EXTRA_START_CALL_WITH_SPEAKERPHONE = "android.telecom.extra.START_CALL_WITH_SPEAKERPHONE"; @@ -39230,8 +39243,8 @@ package android.webkit { method public deprecated void onGlobalFocusChanged(android.view.View, android.view.View); method public void onPause(); method public void onResume(); - method public boolean overlayHorizontalScrollbar(); - method public boolean overlayVerticalScrollbar(); + method public deprecated boolean overlayHorizontalScrollbar(); + method public deprecated boolean overlayVerticalScrollbar(); method public boolean pageDown(boolean); method public boolean pageUp(boolean); method public void pauseTimers(); @@ -39251,13 +39264,13 @@ package android.webkit { method public deprecated void setCertificate(android.net.http.SslCertificate); method public void setDownloadListener(android.webkit.DownloadListener); method public void setFindListener(android.webkit.WebView.FindListener); - method public void setHorizontalScrollbarOverlay(boolean); + method public deprecated void setHorizontalScrollbarOverlay(boolean); method public void setHttpAuthUsernamePassword(java.lang.String, java.lang.String, java.lang.String, java.lang.String); method public void setInitialScale(int); method public deprecated void setMapTrackballToArrowKeys(boolean); method public void setNetworkAvailable(boolean); method public deprecated void setPictureListener(android.webkit.WebView.PictureListener); - method public void setVerticalScrollbarOverlay(boolean); + method public deprecated void setVerticalScrollbarOverlay(boolean); method public void setWebChromeClient(android.webkit.WebChromeClient); method public static void setWebContentsDebuggingEnabled(boolean); method public void setWebViewClient(android.webkit.WebViewClient); |