merge from froyo-plus-aosp (864c68ea) · Commits · e / os / android_frameworks_base

api/current.xml

+26 −0

Original line number	Diff line number	Diff line
		@@ -202787,6 +202787,32 @@
		<parameter name="object" type="T">
		</parameter>
		</method>
		<method name="addAll"
		return="void"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="collection" type="java.util.Collection<? extends T>">
		</parameter>
		</method>
		<method name="addAll"
		return="void"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="items" type="T...">
		</parameter>
		</method>
		<method name="clear"
		return="void"
		abstract="false"

+2 −2

Original line number	Diff line number	Diff line
		@@ -3534,7 +3534,7 @@ public final class Settings {
		while (intent == null && c.moveToNext()) {
		try {
		String intentURI = c.getString(c.getColumnIndexOrThrow(INTENT));
		intent = Intent.getIntent(intentURI);
		intent = Intent.parseUri(intentURI, 0);
		} catch (java.net.URISyntaxException e) {
		// The stored URL is bad... ignore it.
		} catch (IllegalArgumentException e) {
		@@ -3644,7 +3644,7 @@ public final class Settings {

		Intent intent;
		try {
		intent = Intent.getIntent(intentUri);
		intent = Intent.parseUri(intentUri, 0);
		} catch (URISyntaxException e) {
		return "";
		}

+10 −0

Original line number	Diff line number	Diff line
		@@ -3831,6 +3831,16 @@ public class WebView extends AbsoluteLayout
		}
		}

		if (keyCode == KeyEvent.KEYCODE_PAGE_UP) {
		pageUp(false);
		return true;
		}

		if (keyCode == KeyEvent.KEYCODE_PAGE_DOWN) {
		pageDown(false);
		return true;
		}

		if (keyCode >= KeyEvent.KEYCODE_DPAD_UP
		&& keyCode <= KeyEvent.KEYCODE_DPAD_RIGHT) {
		switchOutDrawHistory();

+41 −2

Original line number	Diff line number	Diff line
		@@ -24,6 +24,7 @@ import android.view.ViewGroup;

		import java.util.ArrayList;
		import java.util.Arrays;
		import java.util.Collection;
		import java.util.List;
		import java.util.Comparator;
		import java.util.Collections;
		@@ -180,6 +181,44 @@ public class ArrayAdapter<T> extends BaseAdapter implements Filterable {
		}
		}

		/**
		* Adds the specified Collection at the end of the array.
		*
		* @param collection The Collection to add at the end of the array.
		*/
		public void addAll(Collection<? extends T> collection) {
		if (mOriginalValues != null) {
		synchronized (mLock) {
		mOriginalValues.addAll(collection);
		if (mNotifyOnChange) notifyDataSetChanged();
		}
		} else {
		mObjects.addAll(collection);
		if (mNotifyOnChange) notifyDataSetChanged();
		}
		}

		/**
		* Adds the specified items at the end of the array.
		*
		* @param items The items to add at the end of the array.
		*/
		public void addAll(T ... items) {
		if (mOriginalValues != null) {
		synchronized (mLock) {
		for (T item : items) {
		mOriginalValues.add(item);
		}
		if (mNotifyOnChange) notifyDataSetChanged();
		}
		} else {
		for (T item : items) {
		mObjects.add(item);
		}
		if (mNotifyOnChange) notifyDataSetChanged();
		}
		}

		/**
		* Inserts the specified object at the specified index in the array.
		*

+7 −0

Original line number	Diff line number	Diff line
		@@ -161,6 +161,13 @@ public class PduParser {
		// The MMS content type must be "application/vnd.wap.multipart.mixed"
		// or "application/vnd.wap.multipart.related"
		return retrieveConf;
		} else if (ctTypeStr.equals(ContentType.MULTIPART_ALTERNATIVE)) {
		// "application/vnd.wap.multipart.alternative"
		// should take only the first part.
		PduPart firstPart = mBody.getPart(0);
		mBody.removeAll();
		mBody.addPart(0, firstPart);
		return retrieveConf;
		}
		return null;
		case PduHeaders.MESSAGE_TYPE_DELIVERY_IND: