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

Merge "[ActivityManager] Ensure provider external access count will be released."

Browse Source
This commit is contained in:
Craig Mautner
2014-12-01 00:20:33 +00:00
committed by Gerrit Code Review
parent 2559637429 98f1f3400d
commit c4cf78f4d3
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10054,10 +10054,9 @@ public final class ActivityManagerService extends ActivityManagerNative
} finally { } finally {
// Ensure that whatever happens, we clean up the identity state // Ensure that whatever happens, we clean up the identity state
sCallerIdentity.remove(); sCallerIdentity.remove();
// Ensure we're done with the provider.
removeContentProviderExternalUnchecked(name, null, userId);
} }
// We've got the fd now, so we're done with the provider.
removeContentProviderExternalUnchecked(name, null, userId);
} else { } else {
Slog.d(TAG, "Failed to get provider for authority '" + name + "'"); Slog.d(TAG, "Failed to get provider for authority '" + name + "'");
} }