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

Merge "Add @UnsupportedAppUsage annotations"

Browse Source 
am: 9513a9e215

Change-Id: I347d6893209c55b6e6029034db1b42957f27306a
This commit is contained in:
Mathew Inwood
2018-08-20 11:32:10 -07:00
committed by android-build-merger
parent 66611eb170 9513a9e215
commit 5e2a54ab19
18 changed files with 115 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

91
config/hiddenapi-light-greylist.txt
View File

@@ -2736,103 +2736,12 @@ Landroid/view/WindowManagerGlobal;->sWindowSession:Landroid/view/IWindowSession;
Landroid/view/WindowManagerGlobal;->trimMemory(I)V
Landroid/view/WindowManagerImpl;->mGlobal:Landroid/view/WindowManagerGlobal;
Landroid/webkit/CacheManager$CacheResult;-><init>()V
Landroid/webkit/CacheManager$CacheResult;->contentdisposition:Ljava/lang/String;
Landroid/webkit/CacheManager$CacheResult;->contentLength:J
Landroid/webkit/CacheManager$CacheResult;->crossDomain:Ljava/lang/String;
Landroid/webkit/CacheManager$CacheResult;->encoding:Ljava/lang/String;
Landroid/webkit/CacheManager$CacheResult;->etag:Ljava/lang/String;
Landroid/webkit/CacheManager$CacheResult;->expires:J
Landroid/webkit/CacheManager$CacheResult;->expiresString:Ljava/lang/String;
Landroid/webkit/CacheManager$CacheResult;->getContentDisposition()Ljava/lang/String;
Landroid/webkit/CacheManager$CacheResult;->getContentLength()J
Landroid/webkit/CacheManager$CacheResult;->getEncoding()Ljava/lang/String;
Landroid/webkit/CacheManager$CacheResult;->getETag()Ljava/lang/String;
Landroid/webkit/CacheManager$CacheResult;->getExpires()J
Landroid/webkit/CacheManager$CacheResult;->getExpiresString()Ljava/lang/String;
Landroid/webkit/CacheManager$CacheResult;->getHttpStatusCode()I
Landroid/webkit/CacheManager$CacheResult;->getInputStream()Ljava/io/InputStream;
Landroid/webkit/CacheManager$CacheResult;->getLastModified()Ljava/lang/String;
Landroid/webkit/CacheManager$CacheResult;->getLocalPath()Ljava/lang/String;
Landroid/webkit/CacheManager$CacheResult;->getLocation()Ljava/lang/String;
Landroid/webkit/CacheManager$CacheResult;->getMimeType()Ljava/lang/String;
Landroid/webkit/CacheManager$CacheResult;->getOutputStream()Ljava/io/OutputStream;
Landroid/webkit/CacheManager$CacheResult;->httpStatusCode:I
Landroid/webkit/CacheManager$CacheResult;->inStream:Ljava/io/InputStream;
Landroid/webkit/CacheManager$CacheResult;->lastModified:Ljava/lang/String;
Landroid/webkit/CacheManager$CacheResult;->localPath:Ljava/lang/String;
Landroid/webkit/CacheManager$CacheResult;->location:Ljava/lang/String;
Landroid/webkit/CacheManager$CacheResult;->mimeType:Ljava/lang/String;
Landroid/webkit/CacheManager$CacheResult;->outFile:Ljava/io/File;
Landroid/webkit/CacheManager$CacheResult;->outStream:Ljava/io/OutputStream;
Landroid/webkit/CacheManager$CacheResult;->setEncoding(Ljava/lang/String;)V
Landroid/webkit/CacheManager$CacheResult;->setInputStream(Ljava/io/InputStream;)V
Landroid/webkit/CacheManager;->cacheDisabled()Z
Landroid/webkit/CacheManager;->endCacheTransaction()Z
Landroid/webkit/CacheManager;->getCacheFile(Ljava/lang/String;Ljava/util/Map;)Landroid/webkit/CacheManager$CacheResult;
Landroid/webkit/CacheManager;->getCacheFileBaseDir()Ljava/io/File;
Landroid/webkit/CacheManager;->saveCacheFile(Ljava/lang/String;JLandroid/webkit/CacheManager$CacheResult;)V
Landroid/webkit/CacheManager;->saveCacheFile(Ljava/lang/String;Landroid/webkit/CacheManager$CacheResult;)V
Landroid/webkit/CacheManager;->startCacheTransaction()Z
Landroid/webkit/ConsoleMessage;->mLevel:Landroid/webkit/ConsoleMessage$MessageLevel;
Landroid/webkit/ConsoleMessage;->mLineNumber:I
Landroid/webkit/ConsoleMessage;->mMessage:Ljava/lang/String;
Landroid/webkit/ConsoleMessage;->mSourceId:Ljava/lang/String;
Landroid/webkit/IWebViewUpdateService$Stub$Proxy;-><init>(Landroid/os/IBinder;)V
Landroid/webkit/IWebViewUpdateService$Stub$Proxy;->waitForAndGetProvider()Landroid/webkit/WebViewProviderResponse;
Landroid/webkit/IWebViewUpdateService$Stub;->asInterface(Landroid/os/IBinder;)Landroid/webkit/IWebViewUpdateService;
Landroid/webkit/IWebViewUpdateService;->getCurrentWebViewPackageName()Ljava/lang/String;
Landroid/webkit/IWebViewUpdateService;->getValidWebViewPackages()[Landroid/webkit/WebViewProviderInfo;
Landroid/webkit/IWebViewUpdateService;->isFallbackPackage(Ljava/lang/String;)Z
Landroid/webkit/JsResult;->mReceiver:Landroid/webkit/JsResult$ResultReceiver;
Landroid/webkit/PluginData;-><init>(Ljava/io/InputStream;JLjava/util/Map;I)V
Landroid/webkit/PluginData;->getContentLength()J
Landroid/webkit/PluginData;->getHeaders()Ljava/util/Map;
Landroid/webkit/PluginData;->getInputStream()Ljava/io/InputStream;
Landroid/webkit/PluginData;->getStatusCode()I
Landroid/webkit/UrlInterceptHandler;->getPluginData(Ljava/lang/String;Ljava/util/Map;)Landroid/webkit/PluginData;
Landroid/webkit/UrlInterceptHandler;->service(Ljava/lang/String;Ljava/util/Map;)Landroid/webkit/CacheManager$CacheResult;
Landroid/webkit/UrlInterceptRegistry;->getPluginData(Ljava/lang/String;Ljava/util/Map;)Landroid/webkit/PluginData;
Landroid/webkit/UrlInterceptRegistry;->registerHandler(Landroid/webkit/UrlInterceptHandler;)Z
Landroid/webkit/UrlInterceptRegistry;->setUrlInterceptDisabled(Z)V
Landroid/webkit/UrlInterceptRegistry;->unregisterHandler(Landroid/webkit/UrlInterceptHandler;)Z
Landroid/webkit/URLUtil;->isResourceUrl(Ljava/lang/String;)Z
Landroid/webkit/URLUtil;->parseContentDisposition(Ljava/lang/String;)Ljava/lang/String;
Landroid/webkit/URLUtil;->verifyURLEncoding(Ljava/lang/String;)Z
Landroid/webkit/WebResourceResponse;->mImmutable:Z
Landroid/webkit/WebResourceResponse;->mStatusCode:I
Landroid/webkit/WebSettings$TextSize;->value:I
Landroid/webkit/WebSyncManager;->syncFromRamToFlash()V
Landroid/webkit/WebView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;IILjava/util/Map;Z)V
Landroid/webkit/WebView;-><init>(Landroid/content/Context;Landroid/util/AttributeSet;ILjava/util/Map;Z)V
Landroid/webkit/WebView;->checkThread()V
Landroid/webkit/WebView;->debugDump()V
Landroid/webkit/WebView;->disablePlatformNotifications()V
Landroid/webkit/WebView;->emulateShiftHeld()V
Landroid/webkit/WebView;->enablePlatformNotifications()V
Landroid/webkit/WebView;->freeMemoryForTests()V
Landroid/webkit/WebView;->getContentWidth()I
Landroid/webkit/WebView;->getFactory()Landroid/webkit/WebViewFactoryProvider;
Landroid/webkit/WebView;->getTouchIconUrl()Ljava/lang/String;
Landroid/webkit/WebView;->getVisibleTitleHeight()I
Landroid/webkit/WebView;->isPaused()Z
Landroid/webkit/WebView;->mProvider:Landroid/webkit/WebViewProvider;
Landroid/webkit/WebView;->mWebViewThread:Landroid/os/Looper;
Landroid/webkit/WebView;->notifyFindDialogDismissed()V
Landroid/webkit/WebView;->onDrawVerticalScrollBar(Landroid/graphics/Canvas;Landroid/graphics/drawable/Drawable;IIII)V
Landroid/webkit/WebView;->restorePicture(Landroid/os/Bundle;Ljava/io/File;)Z
Landroid/webkit/WebView;->savePicture(Landroid/os/Bundle;Ljava/io/File;)Z
Landroid/webkit/WebView;->sEnforceThreadChecking:Z
Landroid/webkit/WebView;->setFrame(IIII)Z
Landroid/webkit/WebViewDelegate;-><init>()V
Landroid/webkit/WebViewFactory;->getProvider()Landroid/webkit/WebViewFactoryProvider;
Landroid/webkit/WebViewFactory;->getProviderClass()Ljava/lang/Class;
Landroid/webkit/WebViewFactory;->getUpdateService()Landroid/webkit/IWebViewUpdateService;
Landroid/webkit/WebViewFactory;->getWebViewContextAndSetProvider()Landroid/content/Context;
Landroid/webkit/WebViewFactory;->sPackageInfo:Landroid/content/pm/PackageInfo;
Landroid/webkit/WebViewFactory;->sProviderInstance:Landroid/webkit/WebViewFactoryProvider;
Landroid/webkit/WebViewProviderInfo;-><init>(Landroid/os/Parcel;)V
Landroid/webkit/WebViewProviderResponse;->packageInfo:Landroid/content/pm/PackageInfo;
Landroid/webkit/WebViewUpdateService;-><init>()V
Landroid/widget/AbsListView$FlingRunnable;->endFling()V
Landroid/widget/AbsListView$FlingRunnable;->mScroller:Landroid/widget/OverScroller;
Landroid/widget/AbsListView$FlingRunnable;->start(I)V

7
config/hiddenapi-vendor-list.txt
View File

@@ -284,13 +284,6 @@ Landroid/view/SurfaceControl$Transaction;->show(Landroid/view/SurfaceControl;)La
Landroid/view/ThreadedRenderer;->createHardwareBitmap(Landroid/view/RenderNode;II)Landroid/graphics/Bitmap;
Landroid/view/View;->hideTooltip()V
Landroid/view/View;->setTooltip(Ljava/lang/CharSequence;)V
Landroid/webkit/WebSettings;->getPluginsPath()Ljava/lang/String;
Landroid/webkit/WebSettings;->getUseDoubleTree()Z
Landroid/webkit/WebSettings;->setPluginsPath(Ljava/lang/String;)V
Landroid/webkit/WebSettings;->setUseDoubleTree(Z)V
Landroid/webkit/WebView;->getPluginList()Landroid/webkit/PluginList;
Landroid/webkit/WebView;->getZoomControls()Landroid/view/View;
Landroid/webkit/WebView;->refreshPlugins(Z)V
Landroid/widget/ListView;->lookForSelectablePosition(IZ)I
Lcom/android/ims/ImsConfigListener;->onSetFeatureResponse(IIII)V
Lcom/android/ims/internal/IImsCallSessionListener;->callSessionConferenceStateUpdated(Lcom/android/ims/internal/IImsCallSession;Landroid/telephony/ims/ImsConferenceState;)V

38
core/java/android/webkit/CacheManager.java
View File

@@ -17,6 +17,7 @@
package android.webkit;
import android.annotation.Nullable;
import android.annotation.UnsupportedAppUsage;
import java.io.File;
import java.io.IOException;
@@ -50,22 +51,37 @@ public final class CacheManager {
@Deprecated
public static class CacheResult {
// these fields are saved to the database
@UnsupportedAppUsage
int httpStatusCode;
@UnsupportedAppUsage
long contentLength;
@UnsupportedAppUsage
long expires;
@UnsupportedAppUsage
String expiresString;
@UnsupportedAppUsage
String localPath;
@UnsupportedAppUsage
String lastModified;
@UnsupportedAppUsage
String etag;
@UnsupportedAppUsage
String mimeType;
@UnsupportedAppUsage
String location;
@UnsupportedAppUsage
String encoding;
@UnsupportedAppUsage
String contentdisposition;
@UnsupportedAppUsage
String crossDomain;
// these fields are NOT saved to the database
@UnsupportedAppUsage
InputStream inStream;
@UnsupportedAppUsage
OutputStream outStream;
@UnsupportedAppUsage
File outFile;
/**
@@ -73,6 +89,7 @@ public final class CacheManager {
*
* @return the status code of this cache entry
*/
@UnsupportedAppUsage
public int getHttpStatusCode() {
return httpStatusCode;
}
@@ -82,6 +99,7 @@ public final class CacheManager {
*
* @return the content length of this cache entry
*/
@UnsupportedAppUsage
public long getContentLength() {
return contentLength;
}
@@ -93,6 +111,7 @@ public final class CacheManager {
*
* @return the path of the file used to store this cache entry
*/
@UnsupportedAppUsage
public String getLocalPath() {
return localPath;
}
@@ -103,6 +122,7 @@ public final class CacheManager {
*
* @return the expiry date of this cache entry
*/
@UnsupportedAppUsage
public long getExpires() {
return expires;
}
@@ -113,6 +133,7 @@ public final class CacheManager {
* @return the expiry date of this cache entry
*
*/
@UnsupportedAppUsage
public String getExpiresString() {
return expiresString;
}
@@ -123,6 +144,7 @@ public final class CacheManager {
*
* @return the date at which this cache entry was last modified
*/
@UnsupportedAppUsage
public String getLastModified() {
return lastModified;
}
@@ -132,6 +154,7 @@ public final class CacheManager {
*
* @return the entity tag of this cache entry
*/
@UnsupportedAppUsage
public String getETag() {
return etag;
}
@@ -141,6 +164,7 @@ public final class CacheManager {
*
* @return the MIME type of this cache entry
*/
@UnsupportedAppUsage
public String getMimeType() {
return mimeType;
}
@@ -151,6 +175,7 @@ public final class CacheManager {
*
* @return the HTTP 'Location' header for this cache entry
*/
@UnsupportedAppUsage
public String getLocation() {
return location;
}
@@ -160,6 +185,7 @@ public final class CacheManager {
*
* @return the encoding of this cache entry
*/
@UnsupportedAppUsage
public String getEncoding() {
return encoding;
}
@@ -171,6 +197,7 @@ public final class CacheManager {
* @return the HTTP 'Content-Disposition' header for this cache entry
*
*/
@UnsupportedAppUsage
public String getContentDisposition() {
return contentdisposition;
}
@@ -182,6 +209,7 @@ public final class CacheManager {
*
* @return an input stream to the content of this cache entry
*/
@UnsupportedAppUsage
public InputStream getInputStream() {
return inStream;
}
@@ -194,6 +222,7 @@ public final class CacheManager {
* @return an output stream to the content of this cache entry
*/
// Note that this is always null for objects returned by getCacheFile()!
@UnsupportedAppUsage
public OutputStream getOutputStream() {
return outStream;
}
@@ -204,6 +233,7 @@ public final class CacheManager {
*
* @param stream an input stream to the content of this cache entry
*/
@UnsupportedAppUsage
public void setInputStream(InputStream stream) {
this.inStream = stream;
}
@@ -213,6 +243,7 @@ public final class CacheManager {
*
* @param encoding the encoding of this cache entry
*/
@UnsupportedAppUsage
public void setEncoding(String encoding) {
this.encoding = encoding;
}
@@ -235,6 +266,7 @@ public final class CacheManager {
*/
@Deprecated
@Nullable
@UnsupportedAppUsage
public static File getCacheFileBaseDir() {
return null;
}
@@ -246,6 +278,7 @@ public final class CacheManager {
* @deprecated This method no longer has any effect and always returns {@code false}.
*/
@Deprecated
@UnsupportedAppUsage
public static boolean cacheDisabled() {
return false;
}
@@ -259,6 +292,7 @@ public final class CacheManager {
* @deprecated This method no longer has any effect and always returns {@code false}.
*/
@Deprecated
@UnsupportedAppUsage
public static boolean startCacheTransaction() {
return false;
}
@@ -271,6 +305,7 @@ public final class CacheManager {
* @deprecated This method no longer has any effect and always returns {@code false}.
*/
@Deprecated
@UnsupportedAppUsage
public static boolean endCacheTransaction() {
return false;
}
@@ -290,6 +325,7 @@ public final class CacheManager {
*/
@Deprecated
@Nullable
@UnsupportedAppUsage
public static CacheResult getCacheFile(String url,
Map<String, String> headers) {
return null;
@@ -304,10 +340,12 @@ public final class CacheManager {
* @deprecated Access to the HTTP cache will be removed in a future release.
*/
@Deprecated
@UnsupportedAppUsage
public static void saveCacheFile(String url, CacheResult cacheResult) {
saveCacheFile(url, 0, cacheResult);
}
@UnsupportedAppUsage
static void saveCacheFile(String url, long postIdentifier,
CacheResult cacheRet) {
try {

6
core/java/android/webkit/ConsoleMessage.java
View File

@@ -16,6 +16,8 @@
package android.webkit;
import android.annotation.UnsupportedAppUsage;
/**
* Public class representing a JavaScript console message from WebCore. This could be a issued
* by a call to one of the <code>console</code> logging functions (e.g.
@@ -34,9 +36,13 @@ public class ConsoleMessage {
DEBUG
};
@UnsupportedAppUsage
private MessageLevel mLevel;
@UnsupportedAppUsage
private String mMessage;
@UnsupportedAppUsage
private String mSourceId;
@UnsupportedAppUsage
private int mLineNumber;
public ConsoleMessage(String message, String sourceId, int lineNumber, MessageLevel msgLevel) {

2
core/java/android/webkit/JsResult.java
View File

@@ -17,6 +17,7 @@
package android.webkit;
import android.annotation.SystemApi;
import android.annotation.UnsupportedAppUsage;
/**
* An instance of this class is passed as a parameter in various {@link WebChromeClient} action
@@ -34,6 +35,7 @@ public class JsResult {
public void onJsResultComplete(JsResult result);
}
// This is the caller of the prompt and is the object that is waiting.
@UnsupportedAppUsage
private final ResultReceiver mReceiver;
// This is a basic result of a confirm or prompt dialog.
private boolean mResult;

6
core/java/android/webkit/PluginData.java
View File

@@ -16,6 +16,7 @@
package android.webkit;
import android.annotation.UnsupportedAppUsage;
import java.io.InputStream;
import java.util.Map;
@@ -69,6 +70,7 @@ public final class PluginData {
* deprecated, so is this class.
*/
@Deprecated
@UnsupportedAppUsage
public PluginData(
InputStream stream,
long length,
@@ -90,6 +92,7 @@ public final class PluginData {
* deprecated, so is this class.
*/
@Deprecated
@UnsupportedAppUsage
public InputStream getInputStream() {
return mStream;
}
@@ -104,6 +107,7 @@ public final class PluginData {
* deprecated, so is this class.
*/
@Deprecated
@UnsupportedAppUsage
public long getContentLength() {
return mContentLength;
}
@@ -121,6 +125,7 @@ public final class PluginData {
* deprecated, so is this class.
*/
@Deprecated
@UnsupportedAppUsage
public Map<String, String[]> getHeaders() {
return mHeaders;
}
@@ -135,6 +140,7 @@ public final class PluginData {
* deprecated, so is this class.
*/
@Deprecated
@UnsupportedAppUsage
public int getStatusCode() {
return mStatusCode;
}

4
core/java/android/webkit/URLUtil.java
View File

@@ -17,6 +17,7 @@
package android.webkit;
import android.annotation.Nullable;
import android.annotation.UnsupportedAppUsage;
import android.net.ParseException;
import android.net.Uri;
import android.net.WebAddress;
@@ -139,6 +140,7 @@ public final class URLUtil {
/**
* @return {@code true} if the url is correctly URL encoded
*/
@UnsupportedAppUsage
static boolean verifyURLEncoding(String url) {
int count = url.length();
if (count == 0) {
@@ -181,6 +183,7 @@ public final class URLUtil {
* @return {@code true} if the url is a resource file.
* @hide
*/
@UnsupportedAppUsage
public static boolean isResourceUrl(String url) {
return (null != url) && url.startsWith(RESOURCE_BASE);
}
@@ -398,6 +401,7 @@ public final class URLUtil {
* Unfortunately some servers do not quote the value so to maintain
* consistent behaviour with other browsers, we allow unquoted values too.
*/
@UnsupportedAppUsage
static String parseContentDisposition(String contentDisposition) {
try {
Matcher m = CONTENT_DISPOSITION_PATTERN.matcher(contentDisposition);

3
core/java/android/webkit/UrlInterceptHandler.java
View File

@@ -17,6 +17,7 @@
package android.webkit;
import android.annotation.Nullable;
import android.annotation.UnsupportedAppUsage;
import android.webkit.CacheManager.CacheResult;
import android.webkit.PluginData;
@@ -44,6 +45,7 @@ public interface UrlInterceptHandler {
*/
@Deprecated
@Nullable
@UnsupportedAppUsage
CacheResult service(String url, @Nullable Map<String, String> headers);
/**
@@ -60,5 +62,6 @@ public interface UrlInterceptHandler {
*/
@Deprecated
@Nullable
@UnsupportedAppUsage
PluginData getPluginData(String url, @Nullable Map<String, String> headers);
}

5
core/java/android/webkit/UrlInterceptRegistry.java
View File

@@ -17,6 +17,7 @@
package android.webkit;
import android.annotation.Nullable;
import android.annotation.UnsupportedAppUsage;
import android.webkit.CacheManager.CacheResult;
import android.webkit.PluginData;
import android.webkit.UrlInterceptHandler;
@@ -55,6 +56,7 @@ public final class UrlInterceptRegistry {
* deprecated, so is this class.
*/
@Deprecated
@UnsupportedAppUsage
public static synchronized void setUrlInterceptDisabled(boolean disabled) {
mDisabled = disabled;
}
@@ -85,6 +87,7 @@ public final class UrlInterceptRegistry {
* deprecated, so is this class.
*/
@Deprecated
@UnsupportedAppUsage
public static synchronized boolean registerHandler(
UrlInterceptHandler handler) {
if (!getHandlers().contains(handler)) {
@@ -106,6 +109,7 @@ public final class UrlInterceptRegistry {
* deprecated, so is this class.
*/
@Deprecated
@UnsupportedAppUsage
public static synchronized boolean unregisterHandler(
UrlInterceptHandler handler) {
return getHandlers().remove(handler);
@@ -152,6 +156,7 @@ public final class UrlInterceptRegistry {
*/
@Deprecated
@Nullable
@UnsupportedAppUsage
public static synchronized PluginData getPluginData(
String url, Map<String, String> headers) {
if (urlInterceptDisabled()) {

3
core/java/android/webkit/WebResourceResponse.java
View File

@@ -18,6 +18,7 @@ package android.webkit;
import android.annotation.NonNull;
import android.annotation.SystemApi;
import android.annotation.UnsupportedAppUsage;
import java.io.InputStream;
import java.io.StringBufferInputStream;
@@ -29,9 +30,11 @@ import java.util.Map;
* response when the WebView requests a particular resource.
*/
public class WebResourceResponse {
@UnsupportedAppUsage
private boolean mImmutable;
private String mMimeType;
private String mEncoding;
@UnsupportedAppUsage
private int mStatusCode;
private String mReasonPhrase;
private Map<String, String> mResponseHeaders;

6
core/java/android/webkit/WebSettings.java
View File

@@ -19,6 +19,7 @@ package android.webkit;
import android.annotation.IntDef;
import android.annotation.Nullable;
import android.annotation.SystemApi;
import android.annotation.UnsupportedAppUsage;
import android.content.Context;
import java.lang.annotation.ElementType;
@@ -92,6 +93,7 @@ public abstract class WebSettings {
TextSize(int size) {
value = size;
}
@UnsupportedAppUsage
int value;
}
@@ -579,6 +581,7 @@ public abstract class WebSettings {
* @hide Since API level {@link android.os.Build.VERSION_CODES#JELLY_BEAN_MR1}
*/
@Deprecated
@UnsupportedAppUsage
public void setUseDoubleTree(boolean use) {
// Specified to do nothing, so no need for derived classes to override.
}
@@ -591,6 +594,7 @@ public abstract class WebSettings {
* @hide Since API level {@link android.os.Build.VERSION_CODES#JELLY_BEAN_MR1}
*/
@Deprecated
@UnsupportedAppUsage
public boolean getUseDoubleTree() {
// Returns false unconditionally, so no need for derived classes to override.
return false;
@@ -1002,6 +1006,7 @@ public abstract class WebSettings {
* @hide Since API level {@link android.os.Build.VERSION_CODES#JELLY_BEAN_MR2}
*/
@Deprecated
@UnsupportedAppUsage
public void setPluginsPath(String pluginsPath) {
// Specified to do nothing, so no need for derived classes to override.
}
@@ -1197,6 +1202,7 @@ public abstract class WebSettings {
* @hide Since API level {@link android.os.Build.VERSION_CODES#JELLY_BEAN_MR2}
*/
@Deprecated
@UnsupportedAppUsage
public String getPluginsPath() {
// Unconditionally returns empty string, so no need for derived classes to override.
return "";

2
core/java/android/webkit/WebSyncManager.java
View File

@@ -16,6 +16,7 @@
package android.webkit;
import android.annotation.UnsupportedAppUsage;
import android.content.Context;
/**
@@ -65,5 +66,6 @@ abstract class WebSyncManager implements Runnable {
protected void onSyncInit() {
}
@UnsupportedAppUsage
abstract void syncFromRamToFlash();
}

25
core/java/android/webkit/WebView.java
View File

@@ -20,6 +20,7 @@ import android.annotation.IntDef;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.SystemApi;
import android.annotation.UnsupportedAppUsage;
import android.annotation.Widget;
import android.content.Context;
import android.content.Intent;
@@ -108,6 +109,7 @@ public class WebView extends AbsoluteLayout
// Throwing an exception for incorrect thread usage if the
// build target is JB MR2 or newer. Defaults to false, and is
// set in the WebView constructor.
@UnsupportedAppUsage
private static volatile boolean sEnforceThreadChecking = false;
/**
@@ -390,6 +392,7 @@ public class WebView extends AbsoluteLayout
* @hide This is used internally by dumprendertree, as it requires the JavaScript interfaces to
* be added synchronously, before a subsequent loadUrl call takes effect.
*/
@UnsupportedAppUsage
protected WebView(Context context, AttributeSet attrs, int defStyleAttr,
Map<String, Object> javaScriptInterfaces, boolean privateBrowsing) {
this(context, attrs, defStyleAttr, 0, javaScriptInterfaces, privateBrowsing);
@@ -399,6 +402,7 @@ public class WebView extends AbsoluteLayout
* @hide
*/
@SuppressWarnings("deprecation") // for super() call into deprecated base class constructor.
@UnsupportedAppUsage
protected WebView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes,
Map<String, Object> javaScriptInterfaces, boolean privateBrowsing) {
super(context, attrs, defStyleAttr, defStyleRes);
@@ -476,6 +480,7 @@ public class WebView extends AbsoluteLayout
* @hide Since API level {@link android.os.Build.VERSION_CODES#JELLY_BEAN_MR1}
*/
@Deprecated
@UnsupportedAppUsage
public int getVisibleTitleHeight() {
checkThread();
return mProvider.getVisibleTitleHeight();
@@ -580,6 +585,7 @@ public class WebView extends AbsoluteLayout
* @hide Since API level {@link android.os.Build.VERSION_CODES#JELLY_BEAN_MR1}
*/
@Deprecated
@UnsupportedAppUsage
public static void enablePlatformNotifications() {
// noop
}
@@ -592,6 +598,7 @@ public class WebView extends AbsoluteLayout
* @hide Since API level {@link android.os.Build.VERSION_CODES#JELLY_BEAN_MR1}
*/
@Deprecated
@UnsupportedAppUsage
public static void disablePlatformNotifications() {
// noop
}
@@ -601,6 +608,7 @@ public class WebView extends AbsoluteLayout
*
* @hide
*/
@UnsupportedAppUsage
public static void freeMemoryForTests() {
getFactory().getStatics().freeMemoryForTests();
}
@@ -645,6 +653,7 @@ public class WebView extends AbsoluteLayout
* @hide Since API level {@link android.os.Build.VERSION_CODES#JELLY_BEAN_MR1}
*/
@Deprecated
@UnsupportedAppUsage
public boolean savePicture(Bundle b, final File dest) {
checkThread();
return mProvider.savePicture(b, dest);
@@ -662,6 +671,7 @@ public class WebView extends AbsoluteLayout
* @hide Since API level {@link android.os.Build.VERSION_CODES#JELLY_BEAN_MR1}
*/
@Deprecated
@UnsupportedAppUsage
public boolean restorePicture(Bundle b, File src) {
checkThread();
return mProvider.restorePicture(b, src);
@@ -1279,6 +1289,7 @@ public class WebView extends AbsoluteLayout
*
* @hide
*/
@UnsupportedAppUsage
public String getTouchIconUrl() {
return mProvider.getTouchIconUrl();
}
@@ -1311,6 +1322,7 @@ public class WebView extends AbsoluteLayout
* @hide
*/
@ViewDebug.ExportedProperty(category = "webview")
@UnsupportedAppUsage
public int getContentWidth() {
return mProvider.getContentWidth();
}
@@ -1361,6 +1373,7 @@ public class WebView extends AbsoluteLayout
*
* @hide
*/
@UnsupportedAppUsage
public boolean isPaused() {
return mProvider.isPaused();
}
@@ -1871,6 +1884,7 @@ public class WebView extends AbsoluteLayout
* @hide
*/
@Deprecated
@UnsupportedAppUsage
public static synchronized PluginList getPluginList() {
return new PluginList();
}
@@ -1938,6 +1952,7 @@ public class WebView extends AbsoluteLayout
* @hide
*/
@Deprecated
@UnsupportedAppUsage
public void refreshPlugins(boolean reloadOpenPages) {
checkThread();
}
@@ -1950,6 +1965,7 @@ public class WebView extends AbsoluteLayout
* @hide Since API level {@link android.os.Build.VERSION_CODES#JELLY_BEAN_MR1}
*/
@Deprecated
@UnsupportedAppUsage
public void emulateShiftHeld() {
checkThread();
}
@@ -2010,6 +2026,7 @@ public class WebView extends AbsoluteLayout
* @hide Since API level {@link android.os.Build.VERSION_CODES#JELLY_BEAN}
*/
@Deprecated
@UnsupportedAppUsage
public View getZoomControls() {
checkThread();
return mProvider.getZoomControls();
@@ -2085,6 +2102,7 @@ public class WebView extends AbsoluteLayout
* @hide Since API level {@link android.os.Build.VERSION_CODES#JELLY_BEAN_MR1}
*/
@Deprecated
@UnsupportedAppUsage
public void debugDump() {
checkThread();
}
@@ -2370,6 +2388,7 @@ public class WebView extends AbsoluteLayout
}
// Only used by android.webkit.FindActionModeCallback.
@UnsupportedAppUsage
void notifyFindDialogDismissed() {
checkThread();
mProvider.notifyFindDialogDismissed();
@@ -2379,6 +2398,7 @@ public class WebView extends AbsoluteLayout
// Private internal stuff
//-------------------------------------------------------------------------
@UnsupportedAppUsage
private WebViewProvider mProvider;
/**
@@ -2422,12 +2442,15 @@ public class WebView extends AbsoluteLayout
}
}
@UnsupportedAppUsage
private static WebViewFactoryProvider getFactory() {
return WebViewFactory.getProvider();
}
@UnsupportedAppUsage
private final Looper mWebViewThread = Looper.myLooper();
@UnsupportedAppUsage
private void checkThread() {
// Ignore mWebViewThread == null because this can be called during in the super class
// constructor, before this class's own constructor has even started.
@@ -2708,6 +2731,7 @@ public class WebView extends AbsoluteLayout
/** @hide */
@Override
@UnsupportedAppUsage
protected void onDrawVerticalScrollBar(Canvas canvas, Drawable scrollBar,
int l, int t, int r, int b) {
mProvider.getViewDelegate().onDrawVerticalScrollBar(canvas, scrollBar, l, t, r, b);
@@ -2779,6 +2803,7 @@ public class WebView extends AbsoluteLayout
/** @hide */
@Override
@UnsupportedAppUsage
protected boolean setFrame(int left, int top, int right, int bottom) {
return mProvider.getViewDelegate().setFrame(left, top, right, bottom);
}

2
core/java/android/webkit/WebViewDelegate.java
View File

@@ -19,6 +19,7 @@ package android.webkit;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.SystemApi;
import android.annotation.UnsupportedAppUsage;
import android.app.ActivityThread;
import android.app.Application;
import android.app.ResourcesManager;
@@ -45,6 +46,7 @@ import com.android.internal.util.ArrayUtils;
@SystemApi
public final class WebViewDelegate {
@UnsupportedAppUsage
/* package */ WebViewDelegate() { }
/**

7
core/java/android/webkit/WebViewFactory.java
View File

@@ -17,6 +17,7 @@
package android.webkit;
import android.annotation.SystemApi;
import android.annotation.UnsupportedAppUsage;
import android.app.ActivityManager;
import android.app.AppGlobals;
import android.app.Application;
@@ -59,8 +60,10 @@ public final class WebViewFactory {
// Cache the factory both for efficiency, and ensure any one process gets all webviews from the
// same provider.
@UnsupportedAppUsage
private static WebViewFactoryProvider sProviderInstance;
private static final Object sProviderLock = new Object();
@UnsupportedAppUsage
private static PackageInfo sPackageInfo;
private static Boolean sWebViewSupported;
private static boolean sWebViewDisabled;
@@ -222,6 +225,7 @@ public final class WebViewFactory {
return loadNativeRet;
}
@UnsupportedAppUsage
static WebViewFactoryProvider getProvider() {
synchronized (sProviderLock) {
// For now the main purpose of this function (and the factory abstraction) is to keep
@@ -359,6 +363,7 @@ public final class WebViewFactory {
}
}
@UnsupportedAppUsage
private static Context getWebViewContextAndSetProvider() throws MissingWebViewPackageException {
Application initialApplication = AppGlobals.getInitialApplication();
try {
@@ -428,6 +433,7 @@ public final class WebViewFactory {
}
}
@UnsupportedAppUsage
private static Class<WebViewFactoryProvider> getProviderClass() {
Context webViewContext = null;
Application initialApplication = AppGlobals.getInitialApplication();
@@ -509,6 +515,7 @@ public final class WebViewFactory {
private static String WEBVIEW_UPDATE_SERVICE_NAME = "webviewupdate";
/** @hide */
@UnsupportedAppUsage
public static IWebViewUpdateService getUpdateService() {
if (isWebViewSupported()) {
return getUpdateServiceUnchecked();

2
core/java/android/webkit/WebViewProviderInfo.java
View File

@@ -17,6 +17,7 @@
package android.webkit;
import android.annotation.SystemApi;
import android.annotation.UnsupportedAppUsage;
import android.content.pm.Signature;
import android.os.Parcel;
import android.os.Parcelable;
@@ -56,6 +57,7 @@ public final class WebViewProviderInfo implements Parcelable {
}
};
@UnsupportedAppUsage
private WebViewProviderInfo(Parcel in) {
packageName = in.readString();
description = in.readString();

2
core/java/android/webkit/WebViewProviderResponse.java
View File

@@ -16,6 +16,7 @@
package android.webkit;
import android.annotation.UnsupportedAppUsage;
import android.content.pm.PackageInfo;
import android.os.Parcel;
import android.os.Parcelable;
@@ -56,6 +57,7 @@ public final class WebViewProviderResponse implements Parcelable {
out.writeInt(status);
}
@UnsupportedAppUsage
public final PackageInfo packageInfo;
public final int status;
}

2
core/java/android/webkit/WebViewUpdateService.java
View File

@@ -17,6 +17,7 @@
package android.webkit;
import android.annotation.SystemApi;
import android.annotation.UnsupportedAppUsage;
import android.os.RemoteException;
/**
@@ -25,6 +26,7 @@ import android.os.RemoteException;
@SystemApi
public final class WebViewUpdateService {
@UnsupportedAppUsage
private WebViewUpdateService () {}
/**