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

Merge "Rename SimpleTimeZoneDetectorStrategy"

Browse Source 
am: dd69aac761

Change-Id: If356ea6ec3097ef03a64ef89f39e735fa1363ea5
This commit is contained in:
Neil Fuller
2019-12-12 06:09:42 -08:00
committed by android-build-merger
parent c06f69d2b4 dd69aac761
commit 65eda642e7
4 changed files with 11 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
services/core/java/com/android/server/timedetector/TimeDetectorService.java
View File

@@ -31,7 +31,6 @@ import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.util.DumpUtils;
import com.android.server.FgThread;
import com.android.server.SystemService;
import com.android.server.timedetector.TimeDetectorStrategy.Callback;
import java.io.FileDescriptor;
import java.io.PrintWriter;
@@ -58,17 +57,16 @@ public final class TimeDetectorService extends ITimeDetectorService.Stub {
@NonNull private final Handler mHandler;
@NonNull private final Context mContext;
@NonNull private final Callback mCallback;
@NonNull private final TimeDetectorStrategy mTimeDetectorStrategy;
private static TimeDetectorService create(@NonNull Context context) {
TimeDetectorStrategy timeDetector = new SimpleTimeDetectorStrategy();
TimeDetectorStrategy timeDetectorStrategy = new TimeDetectorStrategyImpl();
TimeDetectorStrategyCallbackImpl callback = new TimeDetectorStrategyCallbackImpl(context);
timeDetector.initialize(callback);
timeDetectorStrategy.initialize(callback);
Handler handler = FgThread.getHandler();
TimeDetectorService timeDetectorService =
new TimeDetectorService(context, handler, callback, timeDetector);
new TimeDetectorService(context, handler, timeDetectorStrategy);
// Wire up event listening.
ContentResolver contentResolver = context.getContentResolver();
@@ -85,10 +83,9 @@ public final class TimeDetectorService extends ITimeDetectorService.Stub {
@VisibleForTesting
public TimeDetectorService(@NonNull Context context, @NonNull Handler handler,
@NonNull Callback callback, @NonNull TimeDetectorStrategy timeDetectorStrategy) {
@NonNull TimeDetectorStrategy timeDetectorStrategy) {
mContext = Objects.requireNonNull(context);
mHandler = Objects.requireNonNull(handler);
mCallback = Objects.requireNonNull(callback);
mTimeDetectorStrategy = Objects.requireNonNull(timeDetectorStrategy);
}

2
services/core/java/com/android/server/timedetector/SimpleTimeDetectorStrategy.java → services/core/java/com/android/server/timedetector/TimeDetectorStrategyImpl.java
View File

@@ -46,7 +46,7 @@ import java.util.Map;
*
* <p>Most public methods are marked synchronized to ensure thread safety around internal state.
*/
public final class SimpleTimeDetectorStrategy implements TimeDetectorStrategy {
public final class TimeDetectorStrategyImpl implements TimeDetectorStrategy {
private static final boolean DBG = false;
private static final String LOG_TAG = "SimpleTimeDetectorStrategy";

7
services/tests/servicestests/src/com/android/server/timedetector/TimeDetectorServiceTest.java
View File

@@ -38,8 +38,6 @@ import android.util.TimestampedValue;
import androidx.test.runner.AndroidJUnit4;
import com.android.server.timedetector.TimeDetectorStrategy.Callback;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -52,7 +50,6 @@ public class TimeDetectorServiceTest {
private Context mMockContext;
private StubbedTimeDetectorStrategy mStubbedTimeDetectorStrategy;
private Callback mMockCallback;
private TimeDetectorService mTimeDetectorService;
private HandlerThread mHandlerThread;
@@ -68,12 +65,10 @@ public class TimeDetectorServiceTest {
mHandlerThread.start();
mTestHandler = new TestHandler(mHandlerThread.getLooper());
mMockCallback = mock(Callback.class);
mStubbedTimeDetectorStrategy = new StubbedTimeDetectorStrategy();
mTimeDetectorService = new TimeDetectorService(
mMockContext, mTestHandler, mMockCallback,
mStubbedTimeDetectorStrategy);
mMockContext, mTestHandler, mStubbedTimeDetectorStrategy);
}
@After

10
services/tests/servicestests/src/com/android/server/timedetector/SimpleTimeDetectorStrategyTest.java → services/tests/servicestests/src/com/android/server/timedetector/TimeDetectorStrategyImplTest.java
View File

@@ -40,7 +40,7 @@ import org.junit.runner.RunWith;
import java.time.Duration;
@RunWith(AndroidJUnit4.class)
public class SimpleTimeDetectorStrategyTest {
public class TimeDetectorStrategyImplTest {
private static final TimestampedValue<Long> ARBITRARY_CLOCK_INITIALIZATION_INFO =
new TimestampedValue<>(
@@ -213,7 +213,7 @@ public class SimpleTimeDetectorStrategyTest {
}
// Let enough time pass that phone1Id's suggestion should now be too old.
mScript.simulateTimePassing(SimpleTimeDetectorStrategy.PHONE_BUCKET_SIZE_MILLIS);
mScript.simulateTimePassing(TimeDetectorStrategyImpl.PHONE_BUCKET_SIZE_MILLIS);
// Make another suggestion with phone2Id. It should be used because the phoneId1
// is in an older "bucket".
@@ -394,7 +394,7 @@ public class SimpleTimeDetectorStrategyTest {
assertEquals(phoneSuggestion, mScript.peekBestPhoneSuggestion());
// Simulate time passing, long enough that phoneSuggestion is now too old.
mScript.simulateTimePassing(SimpleTimeDetectorStrategy.PHONE_MAX_AGE_MILLIS);
mScript.simulateTimePassing(TimeDetectorStrategyImpl.PHONE_MAX_AGE_MILLIS);
// Look inside and check what the strategy considers the current best phone suggestion. It
// should still be the, it's just no longer used.
@@ -631,11 +631,11 @@ public class SimpleTimeDetectorStrategyTest {
private class Script {
private final FakeCallback mFakeCallback;
private final SimpleTimeDetectorStrategy mTimeDetectorStrategy;
private final TimeDetectorStrategyImpl mTimeDetectorStrategy;
Script() {
mFakeCallback = new FakeCallback();
mTimeDetectorStrategy = new SimpleTimeDetectorStrategy();
mTimeDetectorStrategy = new TimeDetectorStrategyImpl();
mTimeDetectorStrategy.initialize(mFakeCallback);
}