drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 752942ec: Merge "The phone is crashing when unknown mime content is transferred."

Browse Source 
* commit '752942ec4719e6a274d6ab11103ac28459cb0f0c':
  The phone is crashing when unknown mime content is transferred.
This commit is contained in:
Jean-Baptiste Queru
2010-12-28 10:55:04 -08:00
committed by Android Git Automerger
parent 536feda7b1 752942ec47
commit e90a1b16a3
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/content/ContentResolver.java
View File

@ -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;
}
}