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 
am: 13d534e7f2

* commit '13d534e7f2419219e3e26e582b1f6f5ae79be408':
  Don't crash activity manager when supplying invalid URI

Change-Id: I1f87d39822fe9a938b511a2b55fda2338311290e
This commit is contained in:
Jorim Jaggi
2016-06-01 18:50:23 +00:00
committed by android-build-merger
parent 65436b097a 13d534e7f2
commit 859465c105
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) {