Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8ac7f213 authored by Makoto Onuki's avatar Makoto Onuki
Browse files

Fix reboot loop when "password to boot" is enabled on ...

a non english locale.

Bug 28607673

Change-Id: I316f348305238616e8254bb878b66099015a3793
parent a75d4877
Loading
Loading
Loading
Loading
+5 −2
Original line number Diff line number Diff line
@@ -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);