summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Justin Harrison <astyrrian@google.com> 2015-06-06 00:17:27 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2015-06-06 00:17:27 +0000
commit51436d3ae35816f9c8b668d6b51cce91c0d54e3f (patch)
tree740c2f23444f3fb027d2d945d65672c639d39e9e
parent45352a32905de1b1b618edb93c38d7c6b0e0aedc (diff)
parent9445df6f0b2c6e623e9773bb8a5a1f51cc75ff76 (diff)
am 9445df6f: am 95be178d: am c4d7c826: am f8c2ffef: am c8fd50b1: am 29b98884: Merge "Revert "During early boot, send LOCALE_CHANGED only to registered receivers"" into lmp-mr1-dev
* commit '9445df6f0b2c6e623e9773bb8a5a1f51cc75ff76': Revert "During early boot, send LOCALE_CHANGED only to registered receivers"
-rw-r--r--services/core/java/com/android/server/am/ActivityManagerService.java3
1 files changed, 0 insertions, 3 deletions
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index efc38e2d3658..7f691958fbd9 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -17175,9 +17175,6 @@ public final class ActivityManagerService extends ActivityManagerNative
if ((changes&ActivityInfo.CONFIG_LOCALE) != 0) {
intent = new Intent(Intent.ACTION_LOCALE_CHANGED);
intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND);
- if (!mProcessesReady) {
- intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY);
- }
broadcastIntentLocked(null, null, intent,
null, null, 0, null, null, null, AppOpsManager.OP_NONE,
false, false, MY_PID, Process.SYSTEM_UID, UserHandle.USER_ALL);