diff options
| author | Justin Harrison <astyrrian@google.com> | 2015-06-03 19:20:43 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-03 19:20:45 +0000 |
| commit | 127d0b8065cb87fafddd0cf65a33e42afac69672 (patch) | |
| tree | e1c438e7cc64235adb0480e3e63be729daa7102c | |
| parent | 29b988846721eb870df9813a950ef31a2ecacebd (diff) | |
| parent | aa9a679b00ea62677cb213fcca6af501870e4daf (diff) | |
| download | frameworks_base-127d0b8065cb87fafddd0cf65a33e42afac69672.zip frameworks_base-127d0b8065cb87fafddd0cf65a33e42afac69672.tar.gz frameworks_base-127d0b8065cb87fafddd0cf65a33e42afac69672.tar.bz2 | |
Merge "Revert "Revert "During early boot, send LOCALE_CHANGED only to registered receivers""" into lmp-mr1-dev
| -rwxr-xr-x | services/core/java/com/android/server/am/ActivityManagerService.java | 3 |
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 14e2d55..4844aa9 100755 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -16757,6 +16757,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); |