Merge "Use Network object instead of network handle and expand documentation." (617461b3) · Commits · e / os / android_frameworks_base

api/system-current.txt

+3 −3

core/java/android/webkit/PacProcessor.java

+25 −11

Original line number	Original line	Diff line number	Diff line
	@@ -32,6 +32,10 @@ public interface PacProcessor {
	/**		/**
	* Returns the default PacProcessor instance.		* Returns the default PacProcessor instance.
	*		*
			* <p> There can only be one default {@link PacProcessor} instance.
			* This method will create a new instance if one did not already exist, or
			* if the previous instance was released with {@link #releasePacProcessor}.
			*
	* @return the default PacProcessor instance.		* @return the default PacProcessor instance.
	*/		*/
	@NonNull		@NonNull
	@@ -43,14 +47,21 @@ public interface PacProcessor {
	* Returns PacProcessor instance associated with the {@link Network}.		* Returns PacProcessor instance associated with the {@link Network}.
	* The host resolution is done on this {@link Network}.		* The host resolution is done on this {@link Network}.
	*		*
	* @param networkHandle a handle representing {@link Network} handle.		* <p> There can only be one {@link PacProcessor} instance at a time for each {@link Network}.
	* @return PacProcessor instance for the specified network.		* This method will create a new instance if one did not already exist, or
	* @see Network#getNetworkHandle		* if the previous instance was released with {@link #releasePacProcessor}.
	* @see Network#fromNetworkHandle		*
			* <p> The {@link PacProcessor} instance needs to be released manually with
			* {@link #releasePacProcessor} when the associated {@link Network} goes away.
			*
			* @param network a {@link Network} which this {@link PacProcessor}
			* will use for host/address resolution.
			* If {@code null} this method is equivalent to {@link #getInstance}.
			* @return {@link PacProcessor} instance for the specified network.
	*/		*/
	@NonNull		@NonNull
	static PacProcessor getInstanceForNetwork(long networkHandle) {		static PacProcessor getInstanceForNetwork(@Nullable Network network) {
	return WebViewFactory.getProvider().getPacProcessorForNetwork(networkHandle);		return WebViewFactory.getProvider().getPacProcessorForNetwork(network);
	}		}

	/**		/**
	@@ -73,19 +84,22 @@ public interface PacProcessor {
	/**		/**
	* Stops support for this {@link PacProcessor} and release its resources.		* Stops support for this {@link PacProcessor} and release its resources.
	* No methods of this class must be called after calling this method.		* No methods of this class must be called after calling this method.
			*
			* <p> Released instances will not be reused; a subsequent call to
			* {@link #getInstance} and {@link #getInstanceForNetwork}
			* for the same network will create a new instance.
	*/		*/
	default void releasePacProcessor() {		default void releasePacProcessor() {
	throw new UnsupportedOperationException("Not implemented");		throw new UnsupportedOperationException("Not implemented");
	}		}

	/**		/**
	* Returns a network handle associated with this {@link PacProcessor}.		* Returns a {@link Network} associated with this {@link PacProcessor}.
	*		*
	* @return a network handle or 0 if a network is unspecified.		* @return an associated {@link Network} or {@code null} if a network is unspecified.
	* @see Network#getNetworkHandle
	* @see Network#fromNetworkHandle
	*/		*/
	default long getNetworkHandle() {		@Nullable
			default Network getNetwork() {
	throw new UnsupportedOperationException("Not implemented");		throw new UnsupportedOperationException("Not implemented");
	}		}
	}		}

core/java/android/webkit/WebViewFactoryProvider.java

+5 −4

Original line number	Original line	Diff line number	Diff line
	@@ -17,6 +17,7 @@
	package android.webkit;		package android.webkit;

	import android.annotation.NonNull;		import android.annotation.NonNull;
			import android.annotation.Nullable;
	import android.annotation.SystemApi;		import android.annotation.SystemApi;
	import android.content.Context;		import android.content.Context;
	import android.content.Intent;		import android.content.Intent;
	@@ -188,13 +189,13 @@ public interface WebViewFactoryProvider {
	* Returns PacProcessor instance associated with the {@link Network}.		* Returns PacProcessor instance associated with the {@link Network}.
	* The host resolution is done on this {@link Network}.		* The host resolution is done on this {@link Network}.
	*		*
	* @param networkHandle a network handle representing the {@link Network}.		* @param network a {@link Network} which needs to be associated
			* with the returned {@link PacProcessor}.
			* If {@code null} the method returns default {@link PacProcessor}.
	* @return the {@link PacProcessor} instance associated with {@link Network}.		* @return the {@link PacProcessor} instance associated with {@link Network}.
	* @see Network#getNetworkHandle
	* @see Network#fromNetworkHandle
	*/		*/
	@NonNull		@NonNull
	default PacProcessor getPacProcessorForNetwork(long networkHandle) {		default PacProcessor getPacProcessorForNetwork(@Nullable Network network) {
	throw new UnsupportedOperationException("Not implemented");		throw new UnsupportedOperationException("Not implemented");
	}		}

non-updatable-api/system-current.txt

+3 −3