diff options
| author | Dianne Hackborn <hackbod@google.com> | 2009-09-01 19:21:08 -0700 |
|---|---|---|
| committer | Dianne Hackborn <hackbod@google.com> | 2009-09-01 19:21:08 -0700 |
| commit | e1b4437dba7c33566af55d4e5d27d35729678684 (patch) | |
| tree | b19d6696816a2892cea093dab422becd50e9a21f | |
| parent | c804efe278fa33555e6e836504a467cb14505eb3 (diff) | |
| download | base-e1b4437dba7c33566af55d4e5d27d35729678684.tar.gz | |
Revert "Fix content provider"
Argh!
This reverts commit da706900f45dca82d89f090e4e52fa5d1772c495.
| -rw-r--r-- | services/java/com/android/server/am/ActivityManagerService.java | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/services/java/com/android/server/am/ActivityManagerService.java b/services/java/com/android/server/am/ActivityManagerService.java index ad4d5dad8ac6..5d34d002f76d 100644 --- a/services/java/com/android/server/am/ActivityManagerService.java +++ b/services/java/com/android/server/am/ActivityManagerService.java @@ -7325,8 +7325,6 @@ 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 { @@ -7437,8 +7435,6 @@ 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 { @@ -7494,7 +7490,7 @@ public final class ActivityManagerService extends ActivityManagerNative implemen ContentProviderRecord cpr = (ContentProviderRecord)mProvidersByName.get(name); if(cpr == null) { //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; } final ProcessRecord r = getRecordForAppLocked(caller); @@ -7505,11 +7501,11 @@ public final class ActivityManagerService extends ActivityManagerNative implemen } //update content provider record entry info ContentProviderRecord localCpr = (ContentProviderRecord) mProvidersByClass.get(cpr.info.name); - if(true) Log.v(TAG, "Removing content provider requested by "+ - r.processName+" from process "+localCpr.info.processName); - if(localCpr.app == r) { + 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) { //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; } else { localCpr.clients.remove(r); |