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

am f52e9f70: am e1b4437d: Revert "Fix content provider"

Browse Source 
Merge commit 'f52e9f703305a03e76f59ad41094c5bc8636d31c' into eclair-plus-aosp

* commit 'f52e9f703305a03e76f59ad41094c5bc8636d31c':
  Revert "Fix content provider"
This commit is contained in:
Dianne Hackborn
2009-09-02 15:37:43 -07:00
committed by Android Git Automerger
parent 4e016f2000 f52e9f7033
commit d79d627b60
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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