Merge change 9693 (1c2a8963) · Commits · e / os / android_frameworks_base

core/java/android/provider/ContactsContract.java

+12 −0

Original line number	Diff line number	Diff line
		@@ -873,6 +873,18 @@ public final class ContactsContract {
		public static final int TYPE_FAX_HOME = 5;
		public static final int TYPE_PAGER = 6;
		public static final int TYPE_OTHER = 7;
		public static final int TYPE_CALLBACK = 8;
		public static final int TYPE_CAR = 9;
		public static final int TYPE_COMPANY_MAIN = 10;
		public static final int TYPE_ISDN = 11;
		public static final int TYPE_MAIN = 12;
		public static final int TYPE_OTHER_FAX = 13;
		public static final int TYPE_RADIO = 14;
		public static final int TYPE_TELEX = 15;
		public static final int TYPE_TTY_TDD = 16;
		public static final int TYPE_WORK_MOBILE = 17;
		public static final int TYPE_WORK_PAGER = 18;
		public static final int TYPE_ASSISTANT = 19;

		/**
		* The phone number as the user entered it.

core/java/com/google/android/gdata2/client/AndroidGDataClient.java

+11 −6

Original line number	Diff line number	Diff line
		@@ -15,6 +15,8 @@ import org.apache.http.Header;
		import org.apache.http.HttpEntity;
		import org.apache.http.HttpResponse;
		import org.apache.http.StatusLine;
		import org.apache.http.params.HttpParams;
		import org.apache.http.params.BasicHttpParams;
		import org.apache.http.client.methods.HttpGet;
		import org.apache.http.client.methods.HttpPost;
		import org.apache.http.client.methods.HttpUriRequest;
		@@ -238,12 +240,16 @@ public class AndroidGDataClient implements GDataClient {
		// while by default we have a 2.0 in this variable, it is possible to construct
		// a client that has an empty version field, to work with 1.0 services.
		if (!TextUtils.isEmpty(mGDataVersion)) {
		request.addHeader("GData-Version", mGDataVersion);
		request.addHeader("GDataVersion", mGDataVersion);
		}

		// if we have a passed down eTag value, we need to add several headers
		if (!TextUtils.isEmpty(eTag)) {
		String method = request.getMethod();
		Header overrideMethodHeader = request.getFirstHeader(X_HTTP_METHOD_OVERRIDE);
		if (overrideMethodHeader != null) {
		method = overrideMethodHeader.getValue();
		}
		if ("GET".equals(method)) {
		// add the none match header, if the resource is not changed
		// this request will result in a 304 now.
		@@ -252,13 +258,12 @@ public class AndroidGDataClient implements GDataClient {
		\|\| "PUT".equals(method)) {
		// now we send an if-match, but only if the passed in eTag is a strong eTag
		// as this only makes sense for a strong eTag
		if (eTag.startsWith("W/") == false) {
		if (!eTag.startsWith("W/")) {
		request.addHeader("If-Match", eTag);
		}
		}
		}


		if (LOCAL_LOGV) {
		for (Header h : request.getAllHeaders()) {
		Log.v(TAG, h.getName() + ": " + h.getValue());