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

Commit dc39d0f2 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Remove wake lock checks from TimeDetectorStrategy" am: dc20cafc am: 258588ec 

Change-Id: I0c98a75165e8b289a45044cb43ef22678c81a935
parents 2ba0fb04 258588ec

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -61,10 +61,10 @@ public interface TimeDetectorStrategy { 
        /** Acquire a suitable wake lock. Must be followed by {@link #releaseWakeLock()} */

        /** Acquire a suitable wake lock. Must be followed by {@link #releaseWakeLock()} */

        void acquireWakeLock();

        void acquireWakeLock();





        /** Returns the elapsedRealtimeMillis clock value. The WakeLock must be held. */

        /** Returns the elapsedRealtimeMillis clock value. */

        long elapsedRealtimeMillis();

        long elapsedRealtimeMillis();





        /** Returns the system clock value. The WakeLock must be held. */

        /** Returns the system clock value. */

        long systemClockMillis();

        long systemClockMillis();





        /** Sets the device system clock. The WakeLock must be held. */

        /** Sets the device system clock. The WakeLock must be held. */

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

+0 −2
Original line number Original line Diff line number Diff line
@@ -88,13 +88,11 @@ public final class TimeDetectorStrategyCallbackImpl implements TimeDetectorStrat 




    @Override

    @Override

    public long elapsedRealtimeMillis() {

    public long elapsedRealtimeMillis() {

        checkWakeLockHeld();

        return SystemClock.elapsedRealtime();

        return SystemClock.elapsedRealtime();

    }

    }





    @Override

    @Override

    public long systemClockMillis() {

    public long systemClockMillis() {

        checkWakeLockHeld();

        return System.currentTimeMillis();

        return System.currentTimeMillis();

    }

    }

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

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




        @Override

        @Override

        public long systemClockMillis() {

        public long systemClockMillis() {

            assertWakeLockAcquired();

            return mSystemClockMillis;

            return mSystemClockMillis;

        }

        }