diff options
| author | Amith Yamasani <yamasani@google.com> | 2012-10-30 10:00:00 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-30 10:00:04 -0700 |
| commit | 13a6df91d9016063057aed07d21c8135f22f7f18 (patch) | |
| tree | 906fc8cfcff4cff8ce49d8244b9b5eae536d0c51 | |
| parent | 825a094eda418b230199aea0f940a881197ea5d3 (diff) | |
| parent | e6687942308b64e32d292ae1e5d38beeb86c951f (diff) | |
| download | frameworks_base-13a6df91d9016063057aed07d21c8135f22f7f18.zip frameworks_base-13a6df91d9016063057aed07d21c8135f22f7f18.tar.gz frameworks_base-13a6df91d9016063057aed07d21c8135f22f7f18.tar.bz2 | |
Merge "Only send broadcasts to registered receivers" into jb-mr1-dev
| -rw-r--r-- | core/java/android/server/search/SearchManagerService.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/core/java/android/server/search/SearchManagerService.java b/core/java/android/server/search/SearchManagerService.java index affeb90..4a21374 100644 --- a/core/java/android/server/search/SearchManagerService.java +++ b/core/java/android/server/search/SearchManagerService.java @@ -74,7 +74,7 @@ public class SearchManagerService extends ISearchManager.Stub { mContext = context; mContext.registerReceiver(new BootCompletedReceiver(), new IntentFilter(Intent.ACTION_BOOT_COMPLETED)); - mContext.registerReceiver(new UserReceiver(), + mContext.registerReceiver(new UserReceiver(), new IntentFilter(Intent.ACTION_USER_REMOVED)); new MyPackageMonitor().register(context, null, UserHandle.ALL, true); } @@ -161,7 +161,8 @@ public class SearchManagerService extends ISearchManager.Stub { } // Inform all listeners that the list of searchables has been updated. Intent intent = new Intent(SearchManager.INTENT_ACTION_SEARCHABLES_CHANGED); - intent.addFlags(Intent.FLAG_RECEIVER_REPLACE_PENDING); + intent.addFlags(Intent.FLAG_RECEIVER_REPLACE_PENDING + | Intent.FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT); mContext.sendBroadcastAsUser(intent, new UserHandle(changingUserId)); } } |