Merge "Add @UnsupportedAppUsage annotations" (9513a9e2) · Commits · e / os / android_frameworks_base

config/hiddenapi-light-greylist.txt

+0 −91

Original line number	Diff line number	Diff line
		@@ -2735,103 +2735,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

config/hiddenapi-vendor-list.txt

+0 −7

Original line number	Diff line number	Diff line
		@@ -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

core/java/android/webkit/CacheManager.java

+38 −0

Original line number	Diff line number	Diff line
		@@ -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 {

core/java/android/webkit/ConsoleMessage.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -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) {

core/java/android/webkit/JsResult.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -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;