Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d494a3cb authored by Ola Olsson's avatar Ola Olsson Committed by Steve Kondik
Browse files

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
parent 64ec00ee

core/java/android/content/ContentResolver.java

+4 −0
Original line number Diff line number Diff line
@@ -206,6 +206,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);
@@ -221,6 +222,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;

        }

    }