diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-12-28 11:00:39 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-12-28 11:00:39 -0800 |
| commit | 03ee779b28227e75f16cb6240c5c667d097e59d1 (patch) | |
| tree | c63b34ee683140169b7598b2069e2fe46504a949 /core | |
| parent | 550c2b7d39ef43f9a049fc65544f6d3f094f2fab (diff) | |
| parent | e90a1b16a3d6c559cb7fc47ad967a1810d88e923 (diff) | |
| download | frameworks_base-03ee779b28227e75f16cb6240c5c667d097e59d1.zip frameworks_base-03ee779b28227e75f16cb6240c5c667d097e59d1.tar.gz frameworks_base-03ee779b28227e75f16cb6240c5c667d097e59d1.tar.bz2 | |
am e90a1b16: am 752942ec: Merge "The phone is crashing when unknown mime content is transferred."
* commit 'e90a1b16a3d6c559cb7fc47ad967a1810d88e923':
The phone is crashing when unknown mime content is transferred.
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/content/ContentResolver.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/core/java/android/content/ContentResolver.java b/core/java/android/content/ContentResolver.java index da1aac4..d034229 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; } } |