Merge commit 'goog/master' into merge_master (13b3b5c9) · Commits · e / os / android_frameworks_base

api/3.xml

+71 −11

Original line number	Diff line number	Diff line
		@@ -57915,7 +57915,7 @@
		type="float"
		transient="false"
		volatile="false"
		value="0.0010f"
		value="0.001f"
		static="true"
		final="true"
		deprecated="not deprecated"
		@@ -69483,16 +69483,6 @@
		>
		<implements name="android.os.Parcelable">
		</implements>
		<constructor name="NetworkInfo"
		type="android.net.NetworkInfo"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="type" type="int">
		</parameter>
		</constructor>
		<method name="describeContents"
		return="int"
		abstract="false"
		@@ -69548,6 +69538,28 @@
		visibility="public"
		>
		</method>
		<method name="getSubtype"
		return="int"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		</method>
		<method name="getSubtypeName"
		return="java.lang.String"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		</method>
		<method name="getType"
		return="int"
		abstract="false"
		@@ -69614,6 +69626,17 @@
		visibility="public"
		>
		</method>
		<method name="isRoaming"
		return="boolean"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		</method>
		<method name="writeToParcel"
		return="void"
		abstract="false"
		@@ -72469,6 +72492,21 @@
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="lockType" type="int">
		</parameter>
		<parameter name="tag" type="java.lang.String">
		</parameter>
		</method>
		<method name="createWifiLock"
		return="android.net.wifi.WifiManager.WifiLock"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="tag" type="java.lang.String">
		</parameter>
		</method>
		@@ -72847,6 +72885,28 @@
		visibility="public"
		>
		</field>
		<field name="WIFI_MODE_FULL"
		type="int"
		transient="false"
		volatile="false"
		value="1"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="WIFI_MODE_SCAN_ONLY"
		type="int"
		transient="false"
		volatile="false"
		value="2"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</field>
		<field name="WIFI_STATE_CHANGED_ACTION"
		type="java.lang.String"
		transient="false"

api/current.xml

+10489 −10

File changed.

Preview size limit exceeded, changes collapsed.

core/java/android/net/NetworkInfo.java

+3 −7

Original line number	Diff line number	Diff line
		@@ -114,8 +114,10 @@ public class NetworkInfo implements Parcelable {
		private boolean mIsAvailable;

		/**
		* TODO This is going away as soon as API council review happens.
		* @param type network type
		* @deprecated
		* @hide because this constructor was only meant for internal use (and
		* has now been superseded by the package-private constructor below).
		*/
		public NetworkInfo(int type) {}

		@@ -146,8 +148,6 @@ public class NetworkInfo implements Parcelable {
		* Return a network-type-specific integer describing the subtype
		* of the network.
		* @return the network subtype
		*
		* @hide pending API council review
		*/
		public int getSubtype() {
		return mSubtype;
		@@ -170,8 +170,6 @@ public class NetworkInfo implements Parcelable {
		/**
		* Return a human-readable name describing the subtype of the network.
		* @return the name of the network subtype
		*
		* @hide pending API council review
		*/
		public String getSubtypeName() {
		return mSubtypeName;
		@@ -251,8 +249,6 @@ public class NetworkInfo implements Parcelable {
		* When {@code true}, it suggests that use of data on this network
		* may incur extra costs.
		* @return {@code true} if roaming is in effect, {@code false} otherwise.
		*
		* @hide pending API council
		*/
		public boolean isRoaming() {
		return mIsRoaming;

core/java/android/webkit/LoadListener.java

+11 −8

Original line number	Diff line number	Diff line
		@@ -314,14 +314,14 @@ class LoadListener extends Handler implements EventHandler {

		// If we have one of "generic" MIME types, try to deduce
		// the right MIME type from the file extension (if any):
		if (mMimeType.equalsIgnoreCase("text/plain") \|\|
		mMimeType.equalsIgnoreCase("application/octet-stream")) {
		if (mMimeType.equals("text/plain") \|\|
		mMimeType.equals("application/octet-stream")) {

		String newMimeType = guessMimeTypeFromExtension();
		if (newMimeType != null) {
		mMimeType = newMimeType;
		}
		} else if (mMimeType.equalsIgnoreCase("text/vnd.wap.wml")) {
		} else if (mMimeType.equals("text/vnd.wap.wml")) {
		// As we don't support wml, render it as plain text
		mMimeType = "text/plain";
		} else {
		@@ -329,7 +329,7 @@ class LoadListener extends Handler implements EventHandler {
		// text/html, treat application/xhtml+xml as text/html.
		// It seems that xhtml+xml and vnd.wap.xhtml+xml mime
		// subtypes are used interchangeably. So treat them the same.
		if (mMimeType.equalsIgnoreCase("application/xhtml+xml") \|\|
		if (mMimeType.equals("application/xhtml+xml") \|\|
		mMimeType.equals("application/vnd.wap.xhtml+xml")) {
		mMimeType = "text/html";
		}
		@@ -525,7 +525,7 @@ class LoadListener extends Handler implements EventHandler {
		// Note: It's fine that we only decode base64 here and not in the other
		// data call because the only caller of the stream version is not
		// base64 encoded.
		if ("base64".equalsIgnoreCase(mTransferEncoding)) {
		if ("base64".equals(mTransferEncoding)) {
		if (length < data.length) {
		byte[] trimmedData = new byte[length];
		System.arraycopy(data, 0, trimmedData, 0, length);
		@@ -1224,13 +1224,14 @@ class LoadListener extends Handler implements EventHandler {
		mEncoding = contentType.substring(i + 1);
		}
		// Trim excess whitespace.
		mEncoding = mEncoding.trim();
		mEncoding = mEncoding.trim().toLowerCase();

		if (i < contentType.length() - 1) {
		// for data: uri the mimeType and encoding have
		// the form image/jpeg;base64 or text/plain;charset=utf-8
		// or text/html;charset=utf-8;base64
		mTransferEncoding = contentType.substring(i + 1).trim();
		mTransferEncoding =
		contentType.substring(i + 1).trim().toLowerCase();
		}
		} else {
		mMimeType = contentType;
		@@ -1250,6 +1251,8 @@ class LoadListener extends Handler implements EventHandler {
		guessMimeType();
		}
		}
		// Ensure mMimeType is lower case.
		mMimeType = mMimeType.toLowerCase();
		}

		/**

core/java/android/webkit/WebView.java

+17 −0

Original line number	Diff line number	Diff line
		@@ -3430,6 +3430,7 @@ public class WebView extends AbsoluteLayout
		if (mNativeClass != 0) {
		nativeRecordButtons(true, false, true);
		}
		setFocusControllerActive(true);
		} else {
		// If our window gained focus, but we do not have it, do not
		// draw the focus ring.
		@@ -3455,11 +3456,22 @@ public class WebView extends AbsoluteLayout
		if (mNativeClass != 0) {
		nativeRecordButtons(false, false, true);
		}
		setFocusControllerActive(false);
		}
		invalidate();
		super.onWindowFocusChanged(hasWindowFocus);
		}

		/*
		* Pass a message to WebCore Thread, determining whether the WebCore::Page's
		* FocusController is "active" so that it will draw the blinking cursor.
		*/
		private void setFocusControllerActive(boolean active) {
		if (mWebViewCore != null) {
		mWebViewCore.sendMessage(EventHub.SET_ACTIVE, active ? 1 : 0, 0);
		}
		}

		@Override
		protected void onFocusChanged(boolean focused, int direction,
		Rect previouslyFocusedRect) {
		@@ -3478,6 +3490,10 @@ public class WebView extends AbsoluteLayout
		if (mNativeClass != 0) {
		nativeRecordButtons(true, false, true);
		}
		// FIXME: This is unnecessary if we are gaining focus from the
		// TextDialog. How can we tell if it was the last thing in
		// focus?
		setFocusControllerActive(true);
		//} else {
		// The WebView has gained focus while we do not have
		// windowfocus. When our window lost focus, we should have
		@@ -3491,6 +3507,7 @@ public class WebView extends AbsoluteLayout
		if (mNativeClass != 0) {
		nativeRecordButtons(false, false, true);
		}
		setFocusControllerActive(false);
		}
		mGotKeyDown = false;
		}