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

Merge change 23811 into eclair

Browse Source 
* changes:
  Fix the registration of the package changes broadcast receiver.
This commit is contained in:
Android (Google) Code Review
2009-09-03 09:33:44 -07:00
parent b84138c72c c42c0dd1c4
commit 505cbb446d
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/content/pm/RegisteredServicesCache.java
View File

@@ -54,7 +54,7 @@ public abstract class RegisteredServicesCache<V> {
private final String mAttributesName; private final String mAttributesName;
// no need to be synchronized since the map is never changed once mService is written // no need to be synchronized since the map is never changed once mService is written
private volatile Map<V, ServiceInfo<V>> mServices; volatile Map<V, ServiceInfo<V>> mServices;
// synchronized on "this" // synchronized on "this"
private BroadcastReceiver mReceiver = null; private BroadcastReceiver mReceiver = null;
@@ -81,6 +81,7 @@ public abstract class RegisteredServicesCache<V> {
if (mReceiver == null) { if (mReceiver == null) {
synchronized (this) { synchronized (this) {
mReceiver = new BroadcastReceiver() { mReceiver = new BroadcastReceiver() {
@Override
public void onReceive(Context context, Intent intent) { public void onReceive(Context context, Intent intent) {
mServices = generateServicesMap(); mServices = generateServicesMap();
} }
@@ -91,6 +92,7 @@ public abstract class RegisteredServicesCache<V> {
intentFilter.addAction(Intent.ACTION_PACKAGE_ADDED); intentFilter.addAction(Intent.ACTION_PACKAGE_ADDED);
intentFilter.addAction(Intent.ACTION_PACKAGE_CHANGED); intentFilter.addAction(Intent.ACTION_PACKAGE_CHANGED);
intentFilter.addAction(Intent.ACTION_PACKAGE_REMOVED); intentFilter.addAction(Intent.ACTION_PACKAGE_REMOVED);
intentFilter.addDataScheme("package");
mContext.registerReceiver(mReceiver, intentFilter); mContext.registerReceiver(mReceiver, intentFilter);
return true; return true;
} }
@@ -122,6 +124,7 @@ public abstract class RegisteredServicesCache<V> {
this.uid = uid; this.uid = uid;
} }
@Override
public String toString() { public String toString() {
return "ServiceInfo: " + type + ", " + componentName; return "ServiceInfo: " + type + ", " + componentName;
} }
@@ -159,6 +162,7 @@ public abstract class RegisteredServicesCache<V> {
maybeUnregisterForPackageChanges(); maybeUnregisterForPackageChanges();
} }
@Override
protected void finalize() throws Throwable { protected void finalize() throws Throwable {
synchronized (this) { synchronized (this) {
if (mReceiver != null) { if (mReceiver != null) {
@@ -169,7 +173,7 @@ public abstract class RegisteredServicesCache<V> {
super.finalize(); super.finalize();
} }
private Map<V, ServiceInfo<V>> generateServicesMap() { Map<V, ServiceInfo<V>> generateServicesMap() {
Map<V, ServiceInfo<V>> services = Maps.newHashMap(); Map<V, ServiceInfo<V>> services = Maps.newHashMap();
PackageManager pm = mContext.getPackageManager(); PackageManager pm = mContext.getPackageManager();