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

am 358d12a0: Merge "Fix lost singleton provider after force-stopping user or package." into mnc-dev

Browse Source 
* commit '358d12a06c31c1471cffe2584715f2f8836e1abd':
  Fix lost singleton provider after force-stopping user or package.
This commit is contained in:
Olawale Ogunwale
2015-05-15 20:43:39 +00:00
committed by Android Git Automerger
parent bb1a0d83fb 358d12a06c
commit 4fa63b43af
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/am/ProviderMap.java
View File

@@ -210,8 +210,11 @@ public final class ProviderMap {
boolean collectPackageProvidersLocked(String packageName, Set<String> filterByClasses,
boolean doit, boolean evenPersistent, int userId,
ArrayList<ContentProviderRecord> result) {
boolean didSomething = collectPackageProvidersLocked(packageName, filterByClasses,
doit, evenPersistent, mSingletonByClass, result);
boolean didSomething = false;
if (userId == UserHandle.USER_ALL || userId == UserHandle.USER_OWNER) {
didSomething = collectPackageProvidersLocked(packageName, filterByClasses,
doit, evenPersistent, mSingletonByClass, result);
}
if (!doit && didSomething) {
return true;
}