commit 95be178dafd0dfefcae060f65df296cb523f82a4
author Justin Harrison <astyrrian@google.com> Thu Jun 04 05:32:58 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Jun 04 05:32:58 2015 +0000
tree a60d771e77bdf23b7adbcca42744a4ab3e70483c
parent 34bebb044062ebb783705c420b8a2e6b38d6af04
parent c4d7c826486868e31bacfe2265b96af1ff3115ea

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 'c4d7c826486868e31bacfe2265b96af1ff3115ea':
  Revert "During early boot, send LOCALE_CHANGED only to registered receivers"

services/core/java/com/android/server/am/ActivityManagerService.java

diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index b1fea1c..6e3f564 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -16853,9 +16853,6 @@
                 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);