Merge branch 'eclair' of git://github.com/takuo/android_frameworks_base into HEAD (eec1d955) · Commits · e / os / android_frameworks_base

core/java/com/google/android/mms/ContentType.java

+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";

core/java/com/google/android/mms/pdu/CharacterSets.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -39,6 +39,7 @@ public class CharacterSets {
		public static final int ISO_8859_7 = 0x0A;
		public static final int ISO_8859_8 = 0x0B;
		public static final int ISO_8859_9 = 0x0C;
		public static final int ISO_2022_JP = 0x27;
		public static final int SHIFT_JIS = 0x11;
		public static final int UTF_8 = 0x6A;
		public static final int BIG5 = 0x07EA;
		@@ -65,6 +66,7 @@ public class CharacterSets {
		ISO_8859_7,
		ISO_8859_8,
		ISO_8859_9,
		ISO_2022_JP,
		SHIFT_JIS,
		UTF_8,
		BIG5,
		@@ -86,6 +88,7 @@ public class CharacterSets {
		public static final String MIMENAME_ISO_8859_7 = "iso-8859-7";
		public static final String MIMENAME_ISO_8859_8 = "iso-8859-8";
		public static final String MIMENAME_ISO_8859_9 = "iso-8859-9";
		public static final String MIMENAME_ISO_2022_JP = "iso-2022-jp";
		public static final String MIMENAME_SHIFT_JIS = "shift_JIS";
		public static final String MIMENAME_UTF_8 = "utf-8";
		public static final String MIMENAME_BIG5 = "big5";
		@@ -109,6 +112,7 @@ public class CharacterSets {
		MIMENAME_ISO_8859_7,
		MIMENAME_ISO_8859_8,
		MIMENAME_ISO_8859_9,
		MIMENAME_ISO_2022_JP,
		MIMENAME_SHIFT_JIS,
		MIMENAME_UTF_8,
		MIMENAME_BIG5,

core/java/com/google/android/mms/pdu/PduParser.java

+10 −1

Original line number	Diff line number	Diff line
		@@ -157,6 +157,7 @@ public class PduParser {
		}
		String ctTypeStr = new String(contentType);
		if (ctTypeStr.equals(ContentType.MULTIPART_MIXED)
		\|\| ctTypeStr.equals(ContentType.MULTIPART_ALTERNATIVE)
		\|\| ctTypeStr.equals(ContentType.MULTIPART_RELATED)) {
		// The MMS content type must be "application/vnd.wap.multipart.mixed"
		// or "application/vnd.wap.multipart.related"
		@@ -698,7 +699,8 @@ public class PduParser {
		case PduHeaders.ADDITIONAL_HEADERS:
		case PduHeaders.ATTRIBUTES:
		default: {
		log("Unknown header");
		log("Unknown header: '" + headerField + "', exit parsing.");
		keepParsing = false;
		}
		}
		}
		@@ -738,6 +740,7 @@ public class PduParser {
		} else {
		part.setContentType((PduContentTypes.contentTypes[0]).getBytes()); //"/"
		}
		String contentTypeStr = new String(part.getContentType());

		/* get name parameter */
		byte[] name = (byte[]) map.get(PduPart.P_NAME);
		@@ -779,6 +782,11 @@ public class PduParser {
		if (dataLength > 0) {
		byte[] partData = new byte[dataLength];
		pduDataStream.read(partData, 0, dataLength);
		if (contentTypeStr.equalsIgnoreCase(ContentType.MULTIPART_ALTERNATIVE)) {
		PduBody nestedBody = parseParts(new ByteArrayInputStream(partData));
		part = nestedBody.getPart(0);

		} else {
		// Check Content-Transfer-Encoding.
		byte[] partDataEncoding = part.getContentTransferEncoding();
		if (null != partDataEncoding) {
		@@ -798,6 +806,7 @@ public class PduParser {
		return null;
		}
		part.setData(partData);
		} /* multipart/alternative */
		}

		/* add this part to body */

core/res/res/values-ja/strings.xml

+9 −0

Original line number	Diff line number	Diff line
		@@ -123,8 +123,13 @@
		<string name="turn_off_radio" msgid="8198784949987062346">"ワイヤレス接続をOFFにする"</string>
		<string name="screen_lock" msgid="799094655496098153">"画面をロック"</string>
		<string name="power_off" msgid="4266614107412865048">"電源を切る"</string>
		<string name="reboot_system">"再起動する"</string>

		<string name="shutdown_progress" msgid="2281079257329981203">"シャットダウン中..."</string>
		<string name="reboot_progress">"再起動中..."</string>
		<string name="shutdown_confirm" msgid="649792175242821353">"携帯電話の電源を切ります。"</string>
		<string name="reboot_confirm">"携帯電話を再起動します。"</string>

		<string name="no_recent_tasks" msgid="279702952298056674">"最近使ったアプリケーションはありません。"</string>
		<string name="global_actions" msgid="2406416831541615258">"携帯電話オプション"</string>
		<string name="global_action_lock" msgid="2844945191792119712">"画面ロック"</string>
		@@ -135,6 +140,9 @@
		<string name="global_actions_toggle_airplane_mode" msgid="5884330306926307456">"機内モード"</string>
		<string name="global_actions_airplane_mode_on_status" msgid="2719557982608919750">"機内モードON"</string>
		<string name="global_actions_airplane_mode_off_status" msgid="5075070442854490296">"機内モードOFF"</string>

		<string name="global_action_reboot">"再起動する"</string>

		<string name="safeMode" msgid="2788228061547930246">"セーフモード"</string>
		<string name="android_system_label" msgid="6577375335728551336">"Androidシステム"</string>
		<string name="permgrouplab_costMoney" msgid="5429808217861460401">"料金の発生するサービス"</string>
		@@ -796,4 +804,5 @@
		<string name="l2tp_vpn_description" msgid="3750692169378923304">"レイヤー2トンネリングプロトコル"</string>
		<string name="l2tp_ipsec_psk_vpn_description" msgid="3945043564008303239">"L2TP/IPSec VPNベースの事前共有鍵"</string>
		<string name="l2tp_ipsec_crt_vpn_description" msgid="5382714073103653577">"L2TP/IPSec VPNベースの証明書"</string>
		<string name="openvpn_vpn_description">OpenVPN SSL VPN</string>
		</resources>