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

Commit c9c940aa authored by Mark Salyzyn's avatar Mark Salyzyn Committed by android-build-merger
Browse files

Merge "persist.sys.boot.reason is cleared once read by bootstat" am: 8ec0c6ba am: 660c145d 

am: 9aeef94b

Change-Id: Ie86a85efee460df082a3b114c38dea9ac444b1bf
parents 0dc344f4 9aeef94b

services/core/java/com/android/server/power/PowerManagerService.java

+3 −3
Original line number Diff line number Diff line
@@ -219,8 +219,8 @@ public final class PowerManagerService extends SystemService 
    private static final int HALT_MODE_REBOOT = 1;

    private static final int HALT_MODE_REBOOT_SAFE_MODE = 2;



    // Persistent property for last reboot reason

    private static final String LAST_REBOOT_PROPERTY = "persist.sys.boot.reason";

    // property for last reboot reason

    private static final String REBOOT_PROPERTY = "sys.boot.reason";



    private final Context mContext;

    private final ServiceThread mHandlerThread;
@@ -4398,7 +4398,7 @@ public final class PowerManagerService extends SystemService 


            final long ident = Binder.clearCallingIdentity();

            try {

                return getLastShutdownReasonInternal(LAST_REBOOT_PROPERTY);

                return getLastShutdownReasonInternal(REBOOT_PROPERTY);

            } finally {

                Binder.restoreCallingIdentity(ident);

            }