resolved conflicts from merge of c3b112ba to master (db87c0df) · Commits · e / os / android_frameworks_base

core/java/android/webkit/FrameLoader.java

+9 −0

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

		import android.net.http.EventHandler;
		import android.net.http.RequestHandle;
		import android.os.Build;
		import android.util.Log;
		import android.webkit.CacheManager.CacheResult;

		@@ -35,6 +36,7 @@ class FrameLoader {
		private int mCacheMode;
		private String mReferrer;
		private String mContentType;
		private final String mUaprofHeader;

		private static final int URI_PROTOCOL = 0x100;

		@@ -57,6 +59,8 @@ class FrameLoader {
		mMethod = method;
		mCacheMode = WebSettings.LOAD_NORMAL;
		mSettings = settings;
		mUaprofHeader = mListener.getContext().getResources().getString(
		com.android.internal.R.string.config_useragentprofile_url, Build.MODEL);
		}

		public void setReferrer(String ref) {
		@@ -356,6 +360,11 @@ class FrameLoader {
		}

		mHeaders.put("User-Agent", mSettings.getUserAgentString());

		// Set the x-wap-profile header
		if (mUaprofHeader != null && mUaprofHeader.length() > 0) {
		mHeaders.put("x-wap-profile", mUaprofHeader);
		}
		}

		/**

+8 −0

Original line number	Diff line number	Diff line
		@@ -451,4 +451,12 @@
		<!-- Number of database connections opened and managed by framework layer
		to handle queries on each database. -->
		<integer name="db_connection_pool_size">1</integer>

		<!-- The URL that should be sent in an x-wap-profile header with an HTTP request,
		as defined in the Open Mobile Alliance User Agent Profile specification
		OMA-TS-UAProf-V2_0-20060206-A Section 8.1.1.1. If the URL contains a '%s'
		format string then that substring will be replaced with the value of
		Build.MODEL. The format string shall not be escaped. -->
		<string name="config_useragentprofile_url"></string>

		</resources>