Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Improve event time crash logging" into udc-dev

Browse Source
This commit is contained in:
Josep del Río
2023-03-02 17:57:31 +00:00
committed by Android (Google) Code Review
parent 627b877cb1 b56a64a37e
commit 16c6737def
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
services/core/java/com/android/server/power/PowerManagerService.java
View File

@@ -5693,6 +5693,7 @@ public final class PowerManagerService extends SystemService
} }
if (eventTime > now) { 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"); throw new IllegalArgumentException("event time must not be in the future");
} }
@@ -5708,7 +5709,9 @@ public final class PowerManagerService extends SystemService
@Override // Binder call @Override // Binder call
public void wakeUp(long eventTime, @WakeReason int reason, String details, public void wakeUp(long eventTime, @WakeReason int reason, String details,
String opPackageName) { 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"); throw new IllegalArgumentException("event time must not be in the future");
} }
@@ -5760,7 +5763,9 @@ public final class PowerManagerService extends SystemService
@Override // Binder call @Override // Binder call
public void nap(long eventTime) { 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"); throw new IllegalArgumentException("event time must not be in the future");
} }
@@ -6525,7 +6530,9 @@ public final class PowerManagerService extends SystemService
@Override // Binder call @Override // Binder call
public void boostScreenBrightness(long eventTime) { public void boostScreenBrightness(long eventTime) {
final long now = mClock.uptimeMillis();
if (eventTime > 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"); 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) @RequiresPermission(android.Manifest.permission.DEVICE_POWER)
private void goToSleepInternal(IntArray groupIds, long eventTime, int reason, int flags) { 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"); throw new IllegalArgumentException("event time must not be in the future");
} }