merge from open-source master

Change-Id: Ia4ff7a14539989ccd9347d132da2cae5cd521520

1 files changed, 9 insertions, 0 deletions

diff --git a/src/com/android/mms/model/MediaModelFactory.java b/src/com/android/mms/model/MediaModelFactory.java
index c9ec75e4..fa66f77b 100644
--- a/src/com/android/mms/model/MediaModelFactory.java
+++ b/src/com/android/mms/model/MediaModelFactory.java
@@ -61,6 +61,7 @@ public class MediaModelFactory {
         PduPart part = null;
 
         if (src != null) {
+            src = unescapeXML(src);
             if (src.startsWith("cid:")) {
                 part = pb.getPartByContentId("<" + src.substring("cid:".length()) + ">");
             } else {
@@ -81,6 +82,14 @@ public class MediaModelFactory {
         throw new IllegalArgumentException("No part found for the model.");
     }
 
+    private static String unescapeXML(String str) {
+        return str.replaceAll("&lt;","<")
+            .replaceAll("&gt;", ">")
+            .replaceAll("&quot;","\"")
+            .replaceAll("&apos;","'")
+            .replaceAll("&amp;", "&");
+    }
+
     private static MediaModel getRegionMediaModel(Context context,
             String tag, String src, SMILRegionMediaElement srme,
             LayoutModel layouts, PduPart part) throws DrmException, IOException, MmsException {