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

Commit 7c6a3bdd authored by Josep del Río's avatar Josep del Río Committed by Automerger Merge Worker
Browse files

Merge "Improve event time crash logging" into udc-dev am: 16c6737d 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21609428



Change-Id: Ib5016618e5e2451560f143547bd810c9f08ccd80
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8df86ad4 16c6737d

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

+12 −3
Original line number Diff line number Diff line
@@ -5693,6 +5693,7 @@ public final class PowerManagerService extends SystemService 
            }



            if (eventTime > now) {

                Slog.e(TAG, "Event time " + eventTime + " cannot be newer than " + now);

                throw new IllegalArgumentException("event time must not be in the future");

            }
@@ -5708,7 +5709,9 @@ public final class PowerManagerService extends SystemService 
        @Override // Binder call

        public void wakeUp(long eventTime, @WakeReason int reason, String details,

                String opPackageName) {

            if (eventTime > mClock.uptimeMillis()) {

            final long now = mClock.uptimeMillis();

            if (eventTime > now) {

                Slog.e(TAG, "Event time " + eventTime + " cannot be newer than " + now);

                throw new IllegalArgumentException("event time must not be in the future");

            }
@@ -5760,7 +5763,9 @@ public final class PowerManagerService extends SystemService 


        @Override // Binder call

        public void nap(long eventTime) {

            if (eventTime > mClock.uptimeMillis()) {

            final long now = mClock.uptimeMillis();

            if (eventTime > now) {

                Slog.e(TAG, "Event time " + eventTime + " cannot be newer than " + now);

                throw new IllegalArgumentException("event time must not be in the future");

            }
@@ -6525,7 +6530,9 @@ public final class PowerManagerService extends SystemService 


        @Override // Binder call

        public void boostScreenBrightness(long eventTime) {

            final long now = mClock.uptimeMillis();

            if (eventTime > mClock.uptimeMillis()) {

                Slog.e(TAG, "Event time " + eventTime + " cannot be newer than " + now);

                throw new IllegalArgumentException("event time must not be in the future");

            }
@@ -6684,7 +6691,9 @@ public final class PowerManagerService extends SystemService 


    @RequiresPermission(android.Manifest.permission.DEVICE_POWER)

    private void goToSleepInternal(IntArray groupIds, long eventTime, int reason, int flags) {

        if (eventTime > mClock.uptimeMillis()) {

        final long now = mClock.uptimeMillis();

        if (eventTime > now) {

            Slog.e(TAG, "Event time " + eventTime + " cannot be newer than " + now);

            throw new IllegalArgumentException("event time must not be in the future");

        }