commit 6a0664d702364dc91061d0684e2e3ced02688bdf
author Neil Fuller <nfuller@google.com> Tue Jan 28 15:24:15 2020 +0000
committer Neil Fuller <nfuller@google.com> Tue Jan 28 15:24:15 2020 +0000
tree fba3ce46184c5acfcfb6e56e6c8720b8649fc79d
parent 147863d9fc8c6b5790cb866ec31f34ebd70990dc

Tidy up module-lib API and locks

Fixing various nits.

Test: treehugger
Change-Id: I636d1b9ef084be58ea07caa0a04ba70de18a030b

core/java/android/timezone/TelephonyLookup.java

diff --git a/core/java/android/timezone/TelephonyLookup.java b/core/java/android/timezone/TelephonyLookup.java
index eebccf4..8a5864e 100644
--- a/core/java/android/timezone/TelephonyLookup.java
+++ b/core/java/android/timezone/TelephonyLookup.java
@@ -30,9 +30,9 @@
  * @hide
  */
 @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
-public class TelephonyLookup {
+public final class TelephonyLookup {
 
-    private static Object sLock = new Object();
+    private static final Object sLock = new Object();
     @GuardedBy("sLock")
     private static TelephonyLookup sInstance;
 

core/java/android/timezone/TelephonyNetwork.java

diff --git a/core/java/android/timezone/TelephonyNetwork.java b/core/java/android/timezone/TelephonyNetwork.java
index ae39fbd..487b3f2 100644
--- a/core/java/android/timezone/TelephonyNetwork.java
+++ b/core/java/android/timezone/TelephonyNetwork.java
@@ -27,7 +27,7 @@
  * @hide
  */
 @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
-public class TelephonyNetwork {
+public final class TelephonyNetwork {
 
     @NonNull
     private final libcore.timezone.TelephonyNetwork mDelegate;

core/java/android/timezone/TelephonyNetworkFinder.java

diff --git a/core/java/android/timezone/TelephonyNetworkFinder.java b/core/java/android/timezone/TelephonyNetworkFinder.java
index 079d088..2ddd3d9 100644
--- a/core/java/android/timezone/TelephonyNetworkFinder.java
+++ b/core/java/android/timezone/TelephonyNetworkFinder.java
@@ -28,7 +28,7 @@
  * @hide
  */
 @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
-public class TelephonyNetworkFinder {
+public final class TelephonyNetworkFinder {
 
     @NonNull
     private final libcore.timezone.TelephonyNetworkFinder mDelegate;

core/java/android/timezone/TimeZoneFinder.java

diff --git a/core/java/android/timezone/TimeZoneFinder.java b/core/java/android/timezone/TimeZoneFinder.java
index 9327b00..c76bb1d 100644
--- a/core/java/android/timezone/TimeZoneFinder.java
+++ b/core/java/android/timezone/TimeZoneFinder.java
@@ -32,7 +32,7 @@
 @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
 public final class TimeZoneFinder {
 
-    private static Object sLock = new Object();
+    private static final Object sLock = new Object();
     @GuardedBy("sLock")
     private static TimeZoneFinder sInstance;
 

core/java/android/timezone/TzDataSetVersion.java

diff --git a/core/java/android/timezone/TzDataSetVersion.java b/core/java/android/timezone/TzDataSetVersion.java
index aba7c4c..605155e 100644
--- a/core/java/android/timezone/TzDataSetVersion.java
+++ b/core/java/android/timezone/TzDataSetVersion.java
@@ -89,7 +89,7 @@
      * @hide
      */
     @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
-    public static class TzDataSetException extends Exception {
+    public static final class TzDataSetException extends Exception {
 
         /** Creates an instance with a message. */
         public TzDataSetException(String message) {

core/java/android/timezone/ZoneInfoDb.java

diff --git a/core/java/android/timezone/ZoneInfoDb.java b/core/java/android/timezone/ZoneInfoDb.java
index eb191e8..84e9b75 100644
--- a/core/java/android/timezone/ZoneInfoDb.java
+++ b/core/java/android/timezone/ZoneInfoDb.java
@@ -32,7 +32,7 @@
 @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
 public final class ZoneInfoDb {
 
-    private static Object sLock = new Object();
+    private static final Object sLock = new Object();
     @GuardedBy("sLock")
     private static ZoneInfoDb sInstance;