Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don't crash activity manager when supplying invalid URI" into nyc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2016-06-01 18:37:34 +00:00
committed by Android (Google) Code Review
parent 28ed18877b cc64dfcf66
commit 13d534e7f2
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/am/ActivityManagerService.java
View File

@@ -11272,6 +11272,9 @@ public final class ActivityManagerService extends ActivityManagerNative
} catch (RemoteException e) { } catch (RemoteException e) {
Log.w(TAG, "Content provider dead retrieving " + uri, e); Log.w(TAG, "Content provider dead retrieving " + uri, e);
return null; return null;
} catch (Exception e) {
Log.w(TAG, "Exception while determining type of " + uri, e);
return null;
} finally { } finally {
// We need to clear the identity to call removeContentProviderExternalUnchecked // We need to clear the identity to call removeContentProviderExternalUnchecked
if (!clearedIdentity) { if (!clearedIdentity) {