merge from open-source master (007ad770) · Commits · e / os / android_frameworks_base

core/java/android/inputmethodservice/InputMethodService.java

+10 −6

Original line number	Diff line number	Diff line
		@@ -1988,17 +1988,21 @@ public class InputMethodService extends AbstractInputMethodService {
		ei.inputType != InputType.TYPE_NULL);
		if (hasAction) {
		mExtractAccessories.setVisibility(View.VISIBLE);
		if (mExtractAction != null) {
		if (ei.actionLabel != null) {
		mExtractAction.setText(ei.actionLabel);
		} else {
		mExtractAction.setText(getTextForImeAction(ei.imeOptions));
		}
		mExtractAction.setOnClickListener(mActionClickListener);
		}
		} else {
		mExtractAccessories.setVisibility(View.GONE);
		if (mExtractAction != null) {
		mExtractAction.setOnClickListener(null);
		}
		}
		}

		/**
		* This is called when, while currently displayed in extract mode, the

+1 −0

Original line number	Diff line number	Diff line
		@@ -26,6 +26,7 @@ public class ContentType {
		public static final String MMS_GENERIC = "application/vnd.wap.mms-generic";
		public static final String MULTIPART_MIXED = "application/vnd.wap.multipart.mixed";
		public static final String MULTIPART_RELATED = "application/vnd.wap.multipart.related";
		public static final String MULTIPART_ALTERNATIVE = "application/vnd.wap.multipart.alternative";

		public static final String TEXT_PLAIN = "text/plain";
		public static final String TEXT_HTML = "text/html";

+36 −17

Original line number	Diff line number	Diff line
		@@ -200,7 +200,18 @@ public class PduParser {
		PduHeaders headers = new PduHeaders();

		while (keepParsing && (pduDataStream.available() > 0)) {
		pduDataStream.mark(1);
		int headerField = extractByteValue(pduDataStream);
		/* parse custom text header */
		if ((headerField >= TEXT_MIN) && (headerField <= TEXT_MAX)) {
		pduDataStream.reset();
		byte [] bVal = parseWapString(pduDataStream, TYPE_TEXT_STRING);
		if (LOCAL_LOGV) {
		Log.v(LOG_TAG, "TextHeader: " + new String(bVal));
		}
		/* we should ignore it at the moment */
		continue;
		}
		switch (headerField) {
		case PduHeaders.MESSAGE_TYPE:
		{
		@@ -778,7 +789,14 @@ public class PduParser {
		/* get part's data */
		if (dataLength > 0) {
		byte[] partData = new byte[dataLength];
		String partContentType = new String(part.getContentType());
		pduDataStream.read(partData, 0, dataLength);
		if (partContentType.equalsIgnoreCase(ContentType.MULTIPART_ALTERNATIVE)) {
		// parse "multipart/vnd.wap.multipart.alternative".
		PduBody childBody = parseParts(new ByteArrayInputStream(partData));
		// take the first part of children.
		part = childBody.getPart(0);
		} else {
		// Check Content-Transfer-Encoding.
		byte[] partDataEncoding = part.getContentTransferEncoding();
		if (null != partDataEncoding) {
		@@ -799,6 +817,7 @@ public class PduParser {
		}
		part.setData(partData);
		}
		}

		/* add this part to body */
		if (THE_FIRST_PART == checkPartPosition(part)) {

+1 −1

Original line number	Diff line number	Diff line
		@@ -2363,7 +2363,7 @@ class PackageManagerService extends IPackageManager.Stub {
		&& (p.applicationInfo.flags&ApplicationInfo.FLAG_PERSISTENT) != 0
		&& (!mSafeMode \|\| (p.applicationInfo.flags
		&ApplicationInfo.FLAG_SYSTEM) != 0)) {
		finalList.add(p.applicationInfo);
		finalList.add(PackageParser.generateApplicationInfo(p, flags));
		}
		}
		}