Merge "Remove wake lock checks from TimeDetectorStrategy" am: dc20cafcc1 am: 258588ecb9 am: dc39d0f25f

Change-Id: I5481acc660b14c86cbedbb819c16a858e1c26c23

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. */

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();
     }
 

services/tests/servicestests/src/com/android/server/timedetector/TimeDetectorStrategyImplTest.java

@@ -651,7 +651,6 @@ public class TimeDetectorStrategyImplTest {
 
         @Override
         public long systemClockMillis() {
-            assertWakeLockAcquired();
             return mSystemClockMillis;
         }