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 
am: 8318223a6e

* commit '8318223a6e2a8d5d8b39e0a81ce6fe09150ae100':
  Fix reboot loop when "password to boot" is enabled on ...

Change-Id: Ic65eb1cde386c9175dd2bfe46384e13ef22dbe67
This commit is contained in:
Makoto Onuki
2016-05-05 18:32:14 +00:00
committed by android-build-merger
parent f94da7ef7f 8318223a6e
commit d33737502f
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
// 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.
LocalServices.getService(ShortcutServiceInternal.class)
.onSystemLocaleChangedNoLock();
final ShortcutServiceInternal shortcutService =
LocalServices.getService(ShortcutServiceInternal.class);
if (shortcutService != null) {
shortcutService.onSystemLocaleChangedNoLock();
}
intent = new Intent(Intent.ACTION_LOCALE_CHANGED);
intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND);