Merge commit 'goog/master' into froyo-release (f32c7291) · Commits · e / os / android_frameworks_base

api/current.xml

+60 −3

Original line number	Diff line number	Diff line
		@@ -193673,6 +193673,17 @@
		visibility="public"
		>
		</method>
		<method name="getPluginState"
		return="android.webkit.WebSettings.PluginState"
		abstract="false"
		native="false"
		synchronized="true"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		</method>
		<method name="getPluginsEnabled"
		return="boolean"
		abstract="false"
		@@ -193680,7 +193691,7 @@
		synchronized="true"
		static="false"
		final="false"
		deprecated="not deprecated"
		deprecated="deprecated"
		visibility="public"
		>
		</method>
		@@ -194206,7 +194217,7 @@
		<parameter name="flag" type="boolean">
		</parameter>
		</method>
		<method name="setPluginsEnabled"
		<method name="setPluginState"
		return="void"
		abstract="false"
		native="false"
		@@ -194216,6 +194227,19 @@
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="state" type="android.webkit.WebSettings.PluginState">
		</parameter>
		</method>
		<method name="setPluginsEnabled"
		return="void"
		abstract="false"
		native="false"
		synchronized="true"
		static="false"
		final="false"
		deprecated="deprecated"
		visibility="public"
		>
		<parameter name="flag" type="boolean">
		</parameter>
		</method>
		@@ -194525,6 +194549,39 @@
		>
		</method>
		</class>
		<class name="WebSettings.PluginState"
		extends="java.lang.Enum"
		abstract="false"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		<method name="valueOf"
		return="android.webkit.WebSettings.PluginState"
		abstract="false"
		native="false"
		synchronized="false"
		static="true"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="name" type="java.lang.String">
		</parameter>
		</method>
		<method name="values"
		return="android.webkit.WebSettings.PluginState[]"
		abstract="false"
		native="false"
		synchronized="false"
		static="true"
		final="true"
		deprecated="not deprecated"
		visibility="public"
		>
		</method>
		</class>
		<class name="WebSettings.RenderPriority"
		extends="java.lang.Enum"
		abstract="false"
		@@ -195424,7 +195481,7 @@
		</parameter>
		<parameter name="encoding" type="java.lang.String">
		</parameter>
		<parameter name="failUrl" type="java.lang.String">
		<parameter name="historyUrl" type="java.lang.String">
		</parameter>
		</method>
		<method name="loadUrl"

core/java/android/app/ActivityThread.java

+5 −1

Original line number	Diff line number	Diff line
		@@ -278,6 +278,10 @@ public final class ActivityThread {

		int mClientCount = 0;

		Application getApplication() {
		return mApplication;
		}

		public PackageInfo(ActivityThread activityThread, ApplicationInfo aInfo,
		ActivityThread mainThread, ClassLoader baseLoader,
		boolean securityViolation, boolean includeCode) {

core/java/android/app/ContextImpl.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -260,7 +260,8 @@ class ContextImpl extends Context {

		@Override
		public Context getApplicationContext() {
		return mMainThread.getApplication();
		return (mPackageInfo != null) ?
		mPackageInfo.getApplication() : mMainThread.getApplication();
		}

		@Override

core/java/android/database/sqlite/SQLiteCursor.java

+4 −2

Original line number	Diff line number	Diff line
		@@ -579,10 +579,12 @@ public class SQLiteCursor extends AbstractWindowedCursor {
		try {
		// if the cursor hasn't been closed yet, close it first
		if (mWindow != null) {
		close();
		int len = mQuery.mSql.length();
		Log.e(TAG, "Finalizing a Cursor that has not been deactivated or closed. " +
		"database = " + mDatabase.getPath() + ", table = " + mEditTable +
		", query = " + mQuery.mSql, mStackTrace);
		", query = " + mQuery.mSql.substring(0, (len > 100) ? 100 : len),
		mStackTrace);
		close();
		SQLiteDebug.notifyActiveCursorFinalized();
		} else {
		if (Config.LOGV) {

core/java/android/net/http/Headers.java

+19 −2

Original line number	Diff line number	Diff line
		@@ -72,6 +72,7 @@ public final class Headers {
		public final static String SET_COOKIE = "set-cookie";
		public final static String PRAGMA = "pragma";
		public final static String REFRESH = "refresh";
		public final static String X_PERMITTED_CROSS_DOMAIN_POLICIES = "x-permitted-cross-domain-policies";

		// following hash are generated by String.hashCode()
		private final static int HASH_TRANSFER_ENCODING = 1274458357;
		@@ -92,6 +93,7 @@ public final class Headers {
		private final static int HASH_SET_COOKIE = 1237214767;
		private final static int HASH_PRAGMA = -980228804;
		private final static int HASH_REFRESH = 1085444827;
		private final static int HASH_X_PERMITTED_CROSS_DOMAIN_POLICIES = -1345594014;

		// keep any headers that require direct access in a presized
		// string array
		@@ -113,8 +115,9 @@ public final class Headers {
		private final static int IDX_SET_COOKIE = 15;
		private final static int IDX_PRAGMA = 16;
		private final static int IDX_REFRESH = 17;
		private final static int IDX_X_PERMITTED_CROSS_DOMAIN_POLICIES = 18;

		private final static int HEADER_COUNT = 18;
		private final static int HEADER_COUNT = 19;

		/* parsed values */
		private long transferEncoding;
		@@ -141,7 +144,8 @@ public final class Headers {
		ETAG,
		SET_COOKIE,
		PRAGMA,
		REFRESH
		REFRESH,
		X_PERMITTED_CROSS_DOMAIN_POLICIES
		};

		// Catch-all for headers not explicitly handled
		@@ -287,6 +291,11 @@ public final class Headers {
		mHeaders[IDX_REFRESH] = val;
		}
		break;
		case HASH_X_PERMITTED_CROSS_DOMAIN_POLICIES:
		if (name.equals(X_PERMITTED_CROSS_DOMAIN_POLICIES)) {
		mHeaders[IDX_X_PERMITTED_CROSS_DOMAIN_POLICIES] = val;
		}
		break;
		default:
		mExtraHeaderNames.add(name);
		mExtraHeaderValues.add(val);
		@@ -361,6 +370,10 @@ public final class Headers {
		return mHeaders[IDX_REFRESH];
		}

		public String getXPermittedCrossDomainPolicies() {
		return mHeaders[IDX_X_PERMITTED_CROSS_DOMAIN_POLICIES];
		}

		public void setContentLength(long value) {
		this.contentLength = value;
		}
		@@ -409,6 +422,10 @@ public final class Headers {
		mHeaders[IDX_ETAG] = value;
		}

		public void setXPermittedCrossDomainPolicies(String value) {
		mHeaders[IDX_X_PERMITTED_CROSS_DOMAIN_POLICIES] = value;
		}

		public interface HeaderCallback {
		public void header(String name, String value);
		}