summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Tate <ctate@google.com>2015-05-12 16:17:47 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-05-12 16:17:47 +0000
commitc7374318a69d4341235bd143b9fdae2cabcea3e9 (patch)
tree6314a13cf13fb19f5ca10381b9a57b627da61aa4
parent14dcb5f13852619e68a22446ee37510191718c3a (diff)
parent7a4cfa58b1421f95266acc4f6a1683804726a0e0 (diff)
downloadframeworks_base-c7374318a69d4341235bd143b9fdae2cabcea3e9.zip
frameworks_base-c7374318a69d4341235bd143b9fdae2cabcea3e9.tar.gz
frameworks_base-c7374318a69d4341235bd143b9fdae2cabcea3e9.tar.bz2
am 7a4cfa58: am 960cb481: am 613626b7: am afd883f8: During early boot, send LOCALE_CHANGED only to registered receivers
* commit '7a4cfa58b1421f95266acc4f6a1683804726a0e0': 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, 3 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index d035c92..c38fc8d 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -16906,6 +16906,9 @@ 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);