summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorOla Olsson <ola1.olsson@sonyericsson.com>2010-12-20 16:45:35 +0100
committerJohan Redestig <johan.redestig@sonyericsson.com>2010-12-21 08:52:22 +0100
commit145e6c4975536d927e506634514a06c43313df17 (patch)
treece7ac693829007d3a9289b2b1f5ac918e12b4d33 /core/java/android
parente78a000955c283509ee8a21b8b7e448060ac8dd8 (diff)
The phone is crashing when unknown mime content is transferred.
The content resolver does not take care of the IllegalStateException that is thrown in getType and that needs to be fixed. Change-Id: I3e66f1aa259ab91fb9233e1ba07faa1ab6c3f2dd
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/content/ContentResolver.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/core/java/android/content/ContentResolver.java b/core/java/android/content/ContentResolver.java
index 81ff41434edc..1f3426e97bcd 100644
--- a/core/java/android/content/ContentResolver.java
+++ b/core/java/android/content/ContentResolver.java
@@ -201,6 +201,7 @@ public abstract class ContentResolver {
} catch (RemoteException e) {
return null;
} catch (java.lang.Exception e) {
+ Log.w(TAG, "Failed to get type for: " + url + " (" + e.getMessage() + ")");
return null;
} finally {
releaseProvider(provider);
@@ -216,6 +217,9 @@ public abstract class ContentResolver {
return type;
} catch (RemoteException e) {
return null;
+ } catch (java.lang.Exception e) {
+ Log.w(TAG, "Failed to get type for: " + url + " (" + e.getMessage() + ")");
+ return null;
}
}