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

Commit 0f18e61c authored by Makoto Onuki's avatar Makoto Onuki Committed by android-build-merger
Browse files

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

Merge "Fix reboot loop when "password to boot" is enabled on ..." into nyc-dev am: 8318223a am: 30ead056
am: b673fcf0

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

Change-Id: Iebee0e188b2cb26d2215de838c68e11d5005744c
parents 9bdc9672 b673fcf0

services/core/java/com/android/server/am/ActivityManagerService.java

+5 −2
Original line number Diff line number Diff line
@@ -18224,8 +18224,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);