commit 9295d9b1c42d38f1611706a5f63d81dda7b44db4
author Makoto Onuki <omakoto@google.com> Thu May 05 10:03:09 2016 -0700
committer The Android Automerger <android-build@google.com> Thu May 05 14:51:54 2016 -0700
tree c22a633e204fab01302ab3097f5f1b1831b654d3
parent e241c636507e26505c787e513d8706a63c771933

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

a non english locale.

Bug 28607673

Change-Id: I316f348305238616e8254bb878b66099015a3793

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

diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index 2c46fbf..94118e6 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -18220,8 +18220,11 @@
                     // 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);