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

Commit 7abfe1b9 authored by Makoto Onuki's avatar Makoto Onuki Committed by Android (Google) Code Review
Browse files

Merge "Fix crash-loop on wiped FBE device." into nyc-dev

parents 5781e61c f3a572b5

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

+1 −2
Original line number Diff line number Diff line
@@ -504,7 +504,7 @@ public class ShortcutService extends IShortcutService.Stub { 
        }



        @Override

        public void onStartUser(int userId) {

        public void onUnlockUser(int userId) {

            synchronized (mService.mLock) {

                mService.onStartUserLocked(userId);

            }
@@ -868,7 +868,6 @@ public class ShortcutService extends IShortcutService.Stub { 
        if (DEBUG) {

            Slog.i(TAG, "Loading from " + path);

        }

        path.mkdirs();

        final AtomicFile file = new AtomicFile(path);



        final FileInputStream in;