Mms: findPart may still be null

This partially reverts 2757db88a16af8197243025a9393367a6ebba3e1 commit, because
pb.getPartByContentId("<" + src + ">"); may return null. Throw the old IllegalArgumentException
if this happens.

Change-Id: Iaa2dbfb6d872d5e34908d5835ec5112ff965561d
JIRA: CYAN-2100
Issue: https://jira.cyanogenmod.org/browse/CYAN-2100
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>

1 files changed, 7 insertions, 1 deletions

diff --git a/src/com/android/mms/model/SmilHelper.java b/src/com/android/mms/model/SmilHelper.java
index c8e03f3..699c507 100755
--- a/src/com/android/mms/model/SmilHelper.java
+++ b/src/com/android/mms/model/SmilHelper.java
@@ -191,7 +191,11 @@ public class SmilHelper {
             }
         }
 
-        return part;
+        if (part != null) {
+            return part;
+        }
+
+        throw new IllegalArgumentException("No part found for the model.");
     }
 
     private static String unescapeXML(String str) {
@@ -227,6 +231,8 @@ public class SmilHelper {
             Log.e(TAG, "Failed to parse SMIL document.", e);
         } catch (MmsException e) {
             Log.e(TAG, "Failed to parse SMIL document.", e);
+        } catch (IllegalArgumentException e) {
+            Log.e(TAG, "Failed to parse SMIL document.", e);
         }
         return null;
     }