From 3350b5e00f1013b8af6b64827a54fd8306abf6d3 Mon Sep 17 00:00:00 2001 From: Neil Fuller Date: Tue, 29 Sep 2020 22:32:25 +0100 Subject: [PATCH] Fix some errorprone warnings This fixes various error prone warnings. All appear to be minor / changes that won't affect functionality. Test: build only Change-Id: I693e0fcff489a522860bf90fd745f8c182699241 --- .../com/android/server/timedetector/TimeDetectorService.java | 1 + .../android/server/timedetector/TimeDetectorStrategyImpl.java | 4 ++-- .../server/timezonedetector/TimeZoneDetectorCallbackImpl.java | 2 ++ .../server/timezonedetector/TimeZoneDetectorService.java | 2 +- .../server/timezonedetector/TimeZoneDetectorStrategyImpl.java | 4 ++-- 5 files changed, 8 insertions(+), 5 deletions(-) diff --git a/services/core/java/com/android/server/timedetector/TimeDetectorService.java b/services/core/java/com/android/server/timedetector/TimeDetectorService.java index 3406bd99c8839..70ab48b9005b2 100644 --- a/services/core/java/com/android/server/timedetector/TimeDetectorService.java +++ b/services/core/java/com/android/server/timedetector/TimeDetectorService.java @@ -84,6 +84,7 @@ public final class TimeDetectorService extends ITimeDetectorService.Stub { contentResolver.registerContentObserver( Settings.Global.getUriFor(Settings.Global.AUTO_TIME), true, new ContentObserver(handler) { + @Override public void onChange(boolean selfChange) { timeDetectorService.handleAutoTimeDetectionChanged(); } diff --git a/services/core/java/com/android/server/timedetector/TimeDetectorStrategyImpl.java b/services/core/java/com/android/server/timedetector/TimeDetectorStrategyImpl.java index fe0e82e660935..9c18aadb79ecd 100644 --- a/services/core/java/com/android/server/timedetector/TimeDetectorStrategyImpl.java +++ b/services/core/java/com/android/server/timedetector/TimeDetectorStrategyImpl.java @@ -572,7 +572,7 @@ public final class TimeDetectorStrategyImpl implements TimeDetectorStrategy { */ @VisibleForTesting @Nullable - public NetworkTimeSuggestion findLatestValidNetworkSuggestionForTests() { + public synchronized NetworkTimeSuggestion findLatestValidNetworkSuggestionForTests() { return findLatestValidNetworkSuggestion(); } @@ -590,7 +590,7 @@ public final class TimeDetectorStrategyImpl implements TimeDetectorStrategy { */ @VisibleForTesting @Nullable - public NetworkTimeSuggestion getLatestNetworkSuggestion() { + public synchronized NetworkTimeSuggestion getLatestNetworkSuggestion() { return mLastNetworkSuggestion.get(); } diff --git a/services/core/java/com/android/server/timezonedetector/TimeZoneDetectorCallbackImpl.java b/services/core/java/com/android/server/timezonedetector/TimeZoneDetectorCallbackImpl.java index 6a12b7c8f9a5b..0a4f5474e4b4b 100644 --- a/services/core/java/com/android/server/timezonedetector/TimeZoneDetectorCallbackImpl.java +++ b/services/core/java/com/android/server/timezonedetector/TimeZoneDetectorCallbackImpl.java @@ -87,6 +87,7 @@ public final class TimeZoneDetectorCallbackImpl implements TimeZoneDetectorStrat contentResolver.registerContentObserver( Settings.Global.getUriFor(Settings.Global.AUTO_TIME_ZONE), true, new ContentObserver(mHandler) { + @Override public void onChange(boolean selfChange) { handleConfigChangeOnHandlerThread(); } @@ -97,6 +98,7 @@ public final class TimeZoneDetectorCallbackImpl implements TimeZoneDetectorStrat Settings.Secure.getUriFor(Settings.Secure.LOCATION_TIME_ZONE_DETECTION_ENABLED), true, new ContentObserver(mHandler) { + @Override public void onChange(boolean selfChange) { handleConfigChangeOnHandlerThread(); } diff --git a/services/core/java/com/android/server/timezonedetector/TimeZoneDetectorService.java b/services/core/java/com/android/server/timezonedetector/TimeZoneDetectorService.java index 73322a6987dfe..b72cb546aae46 100644 --- a/services/core/java/com/android/server/timezonedetector/TimeZoneDetectorService.java +++ b/services/core/java/com/android/server/timezonedetector/TimeZoneDetectorService.java @@ -333,7 +333,7 @@ public final class TimeZoneDetectorService extends ITimeZoneDetectorService.Stub public void onShellCommand(FileDescriptor in, FileDescriptor out, FileDescriptor err, String[] args, ShellCallback callback, ResultReceiver resultReceiver) { - (new TimeZoneDetectorShellCommand(this)).exec( + new TimeZoneDetectorShellCommand(this).exec( this, in, out, err, args, callback, resultReceiver); } } diff --git a/services/core/java/com/android/server/timezonedetector/TimeZoneDetectorStrategyImpl.java b/services/core/java/com/android/server/timezonedetector/TimeZoneDetectorStrategyImpl.java index 8a42b18b514fc..743baedb00e1a 100644 --- a/services/core/java/com/android/server/timezonedetector/TimeZoneDetectorStrategyImpl.java +++ b/services/core/java/com/android/server/timezonedetector/TimeZoneDetectorStrategyImpl.java @@ -644,7 +644,7 @@ public final class TimeZoneDetectorStrategyImpl implements TimeZoneDetectorStrat * A method used to inspect strategy state during tests. Not intended for general use. */ @VisibleForTesting - public GeolocationTimeZoneSuggestion getLatestGeolocationSuggestion() { + public synchronized GeolocationTimeZoneSuggestion getLatestGeolocationSuggestion() { return mLatestGeoLocationSuggestion.get(); } @@ -652,7 +652,7 @@ public final class TimeZoneDetectorStrategyImpl implements TimeZoneDetectorStrat * A {@link TelephonyTimeZoneSuggestion} with additional qualifying metadata. */ @VisibleForTesting - public static class QualifiedTelephonyTimeZoneSuggestion { + public static final class QualifiedTelephonyTimeZoneSuggestion { @VisibleForTesting public final TelephonyTimeZoneSuggestion suggestion;