From b85d31d459b83fa25468dba9a75f7f086b963bec Mon Sep 17 00:00:00 2001 From: Neil Fuller Date: Mon, 13 Jan 2020 20:28:15 +0000 Subject: [PATCH] Remove wake lock checks from TimeDetectorStrategy Remove wake lock checks from TimeDetectorStrategyCallbackImpl since they're no longer valid in all cases. Originally the code that performed time calcs were the only callers but that first changed in commit 312da9b9fcb65 and since then calls have been added to dumpsys too. Bug: 140712361 Bug: 147585410 Test: boot Change-Id: I725699d81815eedc570d648dde7ed425009fb3bd --- .../com/android/server/timedetector/TimeDetectorStrategy.java | 4 ++-- .../server/timedetector/TimeDetectorStrategyCallbackImpl.java | 2 -- .../server/timedetector/TimeDetectorStrategyImplTest.java | 1 - 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/services/core/java/com/android/server/timedetector/TimeDetectorStrategy.java b/services/core/java/com/android/server/timedetector/TimeDetectorStrategy.java index c96479543b3a4..468b806d6dceb 100644 --- a/services/core/java/com/android/server/timedetector/TimeDetectorStrategy.java +++ b/services/core/java/com/android/server/timedetector/TimeDetectorStrategy.java @@ -61,10 +61,10 @@ public interface TimeDetectorStrategy { /** Acquire a suitable wake lock. Must be followed by {@link #releaseWakeLock()} */ void acquireWakeLock(); - /** Returns the elapsedRealtimeMillis clock value. The WakeLock must be held. */ + /** Returns the elapsedRealtimeMillis clock value. */ long elapsedRealtimeMillis(); - /** Returns the system clock value. The WakeLock must be held. */ + /** Returns the system clock value. */ long systemClockMillis(); /** Sets the device system clock. The WakeLock must be held. */ diff --git a/services/core/java/com/android/server/timedetector/TimeDetectorStrategyCallbackImpl.java b/services/core/java/com/android/server/timedetector/TimeDetectorStrategyCallbackImpl.java index 9b89d9437fc3c..19484db149b16 100644 --- a/services/core/java/com/android/server/timedetector/TimeDetectorStrategyCallbackImpl.java +++ b/services/core/java/com/android/server/timedetector/TimeDetectorStrategyCallbackImpl.java @@ -88,13 +88,11 @@ public final class TimeDetectorStrategyCallbackImpl implements TimeDetectorStrat @Override public long elapsedRealtimeMillis() { - checkWakeLockHeld(); return SystemClock.elapsedRealtime(); } @Override public long systemClockMillis() { - checkWakeLockHeld(); return System.currentTimeMillis(); } diff --git a/services/tests/servicestests/src/com/android/server/timedetector/TimeDetectorStrategyImplTest.java b/services/tests/servicestests/src/com/android/server/timedetector/TimeDetectorStrategyImplTest.java index 8a3183f7abbd9..d940a6a320f2a 100644 --- a/services/tests/servicestests/src/com/android/server/timedetector/TimeDetectorStrategyImplTest.java +++ b/services/tests/servicestests/src/com/android/server/timedetector/TimeDetectorStrategyImplTest.java @@ -651,7 +651,6 @@ public class TimeDetectorStrategyImplTest { @Override public long systemClockMillis() { - assertWakeLockAcquired(); return mSystemClockMillis; }