commit f3a572b5c0cab23a435bd90414d25de84e00398e
author Makoto Onuki <omakoto@google.com> Thu Mar 10 12:28:38 2016 -0800
committer Makoto Onuki <omakoto@google.com> Thu Mar 10 12:28:38 2016 -0800
tree 86f8534b3aed110940a989959a06326a1b6e97c1
parent 495d124a67daa1f070ca0ca0be0c14377675200a

Fix crash-loop on wiped FBE device.

Bug 27595678

Change-Id: I02708b3c9e5472c5548bda7e6e15189614056471

services/core/java/com/android/server/pm/ShortcutService.java

diff --git a/services/core/java/com/android/server/pm/ShortcutService.java b/services/core/java/com/android/server/pm/ShortcutService.java
index 9d8def6..c52fd0d 100644
--- a/services/core/java/com/android/server/pm/ShortcutService.java
+++ b/services/core/java/com/android/server/pm/ShortcutService.java
@@ -504,7 +504,7 @@
         }
 
         @Override
-        public void onStartUser(int userId) {
+        public void onUnlockUser(int userId) {
             synchronized (mService.mLock) {
                 mService.onStartUserLocked(userId);
             }
@@ -868,7 +868,6 @@
         if (DEBUG) {
             Slog.i(TAG, "Loading from " + path);
         }
-        path.mkdirs();
         final AtomicFile file = new AtomicFile(path);
 
         final FileInputStream in;