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

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

Browse Source 
Change-Id: I0c98a75165e8b289a45044cb43ef22678c81a935
This commit is contained in:
Automerger Merge Worker
2020-01-14 23:59:27 +00:00
parent 2ba0fb04a4 258588ecb9
commit dc39d0f25f
3 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/timedetector/TimeDetectorStrategy.java
View File

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

2
services/core/java/com/android/server/timedetector/TimeDetectorStrategyCallbackImpl.java
View File

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

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

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