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

am 6a98f8d9: Merge change 23499 into donut

Browse Source 
Merge commit '6a98f8d93e4ddd407baad8d9b7481a892001d281' into eclair

* commit '6a98f8d93e4ddd407baad8d9b7481a892001d281':
  Fix content provider
This commit is contained in:
Dianne Hackborn
2009-09-01 19:11:44 -07:00
committed by Android Git Automerger
parent cc22efb52e 6a98f8d93e
commit ff0dc82c1c
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
services/java/com/android/server/am/ActivityManagerService.java
View File

@@ -7387,6 +7387,8 @@ public final class ActivityManagerService extends ActivityManagerNative implemen
// In this case the provider is a single instance, so we can
// return it right away.
if (r != null) {
if(true) Log.v(TAG, "Adding content provider requested by "+
r.processName +" from process "+cpr.info.processName);
r.conProviders.add(cpr);
cpr.clients.add(r);
} else {
@@ -7497,6 +7499,8 @@ public final class ActivityManagerService extends ActivityManagerNative implemen
mProvidersByName.put(name, cpr);
if (r != null) {
if(true) Log.v(TAG, "Adding content provider requested by "+
r.processName +" from process "+cpr.info.processName);
r.conProviders.add(cpr);
cpr.clients.add(r);
} else {
@@ -7552,7 +7556,7 @@ public final class ActivityManagerService extends ActivityManagerNative implemen
ContentProviderRecord cpr = (ContentProviderRecord)mProvidersByName.get(name);
if(cpr == null) {
//remove from mProvidersByClass
if(localLOGV) Log.v(TAG, name+" content provider not found in providers list");
if(true) Log.v(TAG, name+" content provider not found in providers list");
return;
}
final ProcessRecord r = getRecordForAppLocked(caller);
@@ -7563,11 +7567,11 @@ public final class ActivityManagerService extends ActivityManagerNative implemen
}
//update content provider record entry info
ContentProviderRecord localCpr = (ContentProviderRecord) mProvidersByClass.get(cpr.info.name);
if(localLOGV) Log.v(TAG, "Removing content provider requested by "+
r.info.processName+" from process "+localCpr.appInfo.processName);
if(localCpr.appInfo.processName == r.info.processName) {
if(true) Log.v(TAG, "Removing content provider requested by "+
r.processName+" from process "+localCpr.info.processName);
if(localCpr.app == r) {
//should not happen. taken care of as a local provider
if(localLOGV) Log.v(TAG, "local provider doing nothing Ignoring other names");
if(true) Log.v(TAG, "local provider doing nothing Ignoring other names");
return;
} else {
localCpr.clients.remove(r);