Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix reboot loop when "password to boot" is enabled on ..." into nyc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2016-05-05 18:14:29 +00:00
committed by Android (Google) Code Review
parent cac9495030 8ac7f2134c
commit 8318223a6e
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/am/ActivityManagerService.java
View File

@@ -18220,8 +18220,11 @@ public final class ActivityManagerService extends ActivityManagerNative
// Tell the shortcut manager that the system locale changed. It needs to know // Tell the shortcut manager that the system locale changed. It needs to know
// it before any other apps receive ACTION_LOCALE_CHANGED, which is why // it before any other apps receive ACTION_LOCALE_CHANGED, which is why
// we "push" from here, rather than having the service listen to the broadcast. // we "push" from here, rather than having the service listen to the broadcast.
LocalServices.getService(ShortcutServiceInternal.class) final ShortcutServiceInternal shortcutService =
.onSystemLocaleChangedNoLock(); LocalServices.getService(ShortcutServiceInternal.class);
if (shortcutService != null) {
shortcutService.onSystemLocaleChangedNoLock();
}
intent = new Intent(Intent.ACTION_LOCALE_CHANGED); intent = new Intent(Intent.ACTION_LOCALE_CHANGED);
intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND); intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND);