Merge "Fix constant name"
diff --git a/geolocation/locationtzprovider/src/main/java/com/android/timezone/geotz/provider/core/Mode.java b/geolocation/locationtzprovider/src/main/java/com/android/timezone/geotz/provider/core/Mode.java
index ad0f02b..2e8e9da 100644
--- a/geolocation/locationtzprovider/src/main/java/com/android/timezone/geotz/provider/core/Mode.java
+++ b/geolocation/locationtzprovider/src/main/java/com/android/timezone/geotz/provider/core/Mode.java
@@ -15,7 +15,7 @@
*/
package com.android.timezone.geotz.provider.core;
-import static com.android.timezone.geotz.provider.core.OfflineLocationTimeZoneDelegate.LISTEN_MODE_NA;
+import static com.android.timezone.geotz.provider.core.OfflineLocationTimeZoneDelegate.LOCATION_LISTEN_MODE_NA;
import static com.android.timezone.geotz.provider.core.OfflineLocationTimeZoneDelegate.LOCATION_LISTEN_MODE_HIGH;
import static com.android.timezone.geotz.provider.core.OfflineLocationTimeZoneDelegate.LOCATION_LISTEN_MODE_LOW;
import static com.android.timezone.geotz.provider.core.LogUtils.formatElapsedRealtimeMillis;
@@ -155,7 +155,7 @@
private String mTimeoutToken;
Mode(@ModeEnum int modeEnum, @NonNull String entryCause) {
- this(modeEnum, entryCause, LISTEN_MODE_NA);
+ this(modeEnum, entryCause, LOCATION_LISTEN_MODE_NA);
}
Mode(@ModeEnum int modeEnum, @NonNull String entryCause,
@@ -268,7 +268,7 @@
/** Returns a string representation of the {@link ListenModeEnum} value provided. */
static String prettyPrintListenModeEnum(@ListenModeEnum int listenMode) {
switch (listenMode) {
- case LISTEN_MODE_NA:
+ case LOCATION_LISTEN_MODE_NA:
return "LISTEN_MODE_NA";
case LOCATION_LISTEN_MODE_HIGH:
return "LOCATION_LISTEN_MODE_HIGH";
@@ -293,7 +293,7 @@
throw new IllegalArgumentException();
}
} else {
- if (listenMode != LISTEN_MODE_NA) {
+ if (listenMode != LOCATION_LISTEN_MODE_NA) {
throw new IllegalArgumentException();
}
}
diff --git a/geolocation/locationtzprovider/src/main/java/com/android/timezone/geotz/provider/core/OfflineLocationTimeZoneDelegate.java b/geolocation/locationtzprovider/src/main/java/com/android/timezone/geotz/provider/core/OfflineLocationTimeZoneDelegate.java
index fef030a..77b8865 100644
--- a/geolocation/locationtzprovider/src/main/java/com/android/timezone/geotz/provider/core/OfflineLocationTimeZoneDelegate.java
+++ b/geolocation/locationtzprovider/src/main/java/com/android/timezone/geotz/provider/core/OfflineLocationTimeZoneDelegate.java
@@ -81,7 +81,7 @@
/** Use when location listen mode is not applicable. */
@ListenModeEnum
- public static final int LISTEN_MODE_NA = 0;
+ public static final int LOCATION_LISTEN_MODE_NA = 0;
/** The most power-expensive and aggressive location detection mode. */
@ListenModeEnum