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

Commit dc20cafc authored by Neil Fuller's avatar Neil Fuller Committed by Gerrit Code Review
Browse files

Merge "Remove wake lock checks from TimeDetectorStrategy"

parents 8027ca9b b85d31d4

services/core/java/com/android/server/timedetector/TimeDetectorStrategy.java

+2 −2
Original line number Diff line number Diff line
@@ -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

+0 −2
Original line number Diff line number Diff line
@@ -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

+0 −1
Original line number Diff line number Diff line
@@ -651,7 +651,6 @@ public class TimeDetectorStrategyImplTest { 


        @Override

        public long systemClockMillis() {

            assertWakeLockAcquired();

            return mSystemClockMillis;

        }