Merge "More API council tidy up"
diff --git a/apex/tests/Android.bp b/apex/tests/Android.bp
index 133f2e2..c4435d3 100644
--- a/apex/tests/Android.bp
+++ b/apex/tests/Android.bp
@@ -24,11 +24,11 @@
srcs: ["src/**/*.java"],
// TODO Switch to sdk_version for the module-libs stubs when it is implemented
- // and remove the framework-res / framework_module_lib_stubs_current below.
+ // and remove the framework-res / android_module_lib_stubs_current below.
sdk_version: "core_platform",
libs: [
"android.test.base.stubs",
- "framework_module_lib_stubs_current",
+ "android_module_lib_stubs_current",
"framework-res",
],
diff --git a/debug_tools/host/main/java/ZoneSplitter.java b/debug_tools/host/main/java/ZoneSplitter.java
index 3dd30ff..a8b72e6 100644
--- a/debug_tools/host/main/java/ZoneSplitter.java
+++ b/debug_tools/host/main/java/ZoneSplitter.java
@@ -29,7 +29,7 @@
* tzdata file. This enables easier debugging / inspection of Android's tzdata file with standard
* tools like zdump or Android tools like TzFileDumper.
*
- * <p>This class contains a copy of logic found in Android's ZoneInfoDB.
+ * <p>This class contains a copy of logic found in Android's ZoneInfoDb.
*/
public class ZoneSplitter {
diff --git a/distro/installer/src/main/com/android/timezone/distro/installer/TimeZoneDistroInstaller.java b/distro/installer/src/main/com/android/timezone/distro/installer/TimeZoneDistroInstaller.java
index abcfb8a..aa3b377 100644
--- a/distro/installer/src/main/com/android/timezone/distro/installer/TimeZoneDistroInstaller.java
+++ b/distro/installer/src/main/com/android/timezone/distro/installer/TimeZoneDistroInstaller.java
@@ -34,7 +34,7 @@
import libcore.timezone.TzDataSetVersion;
import libcore.timezone.TzDataSetVersion.TzDataSetException;
import libcore.timezone.TimeZoneFinder;
-import libcore.timezone.ZoneInfoDB;
+import libcore.timezone.ZoneInfoDb;
/**
* A distro-validation / extraction class. Separate from the services code that uses it for easier
@@ -209,7 +209,7 @@
// Validate the tzdata file.
File zoneInfoFile = new File(workingDir, TimeZoneDistro.TZDATA_FILE_NAME);
- ZoneInfoDB tzData = ZoneInfoDB.loadTzData(zoneInfoFile.getPath());
+ ZoneInfoDb tzData = ZoneInfoDb.loadTzData(zoneInfoFile.getPath());
if (tzData == null) {
Slog.i(logTag, "Update not applied: " + zoneInfoFile + " could not be loaded");
return INSTALL_FAIL_VALIDATION_ERROR;
@@ -440,7 +440,7 @@
Slog.i(logTag, "Reading base time zone rules version");
TzDataSetVersion baseVersion = readBaseVersion(baseVersionFile);
- String baseRulesVersion = baseVersion.rulesVersion;
+ String baseRulesVersion = baseVersion.getRulesVersion();
String distroRulesVersion = distroVersion.rulesVersion;
// canApply = distroRulesVersion >= baseRulesVersion
boolean canApply = distroRulesVersion.compareTo(baseRulesVersion) >= 0;
diff --git a/distro/installer/src/test/com/android/timezone/distro/installer/TimeZoneDistroInstallerTest.java b/distro/installer/src/test/com/android/timezone/distro/installer/TimeZoneDistroInstallerTest.java
index 0ffecea..70ccb6d 100644
--- a/distro/installer/src/test/com/android/timezone/distro/installer/TimeZoneDistroInstallerTest.java
+++ b/distro/installer/src/test/com/android/timezone/distro/installer/TimeZoneDistroInstallerTest.java
@@ -539,7 +539,7 @@
public void testReadBaseRulesVersion() throws Exception {
TzDataSetVersion actualBaseVersion = installer.readBaseVersion();
- assertEquals(BASE_RULES_VERSION, actualBaseVersion.rulesVersion);
+ assertEquals(BASE_RULES_VERSION, actualBaseVersion.getRulesVersion());
}
public void testGetInstalledDistroVersion() throws Exception {
diff --git a/distro/tools/src/main/com/android/timezone/distro/tools/CreateTimeZoneDistro.java b/distro/tools/src/main/com/android/timezone/distro/tools/CreateTimeZoneDistro.java
index 22c1ccc..e518437 100644
--- a/distro/tools/src/main/com/android/timezone/distro/tools/CreateTimeZoneDistro.java
+++ b/distro/tools/src/main/com/android/timezone/distro/tools/CreateTimeZoneDistro.java
@@ -96,10 +96,10 @@
// Create a DistroVersion from the TzDataSetVersion.
DistroVersion distroVersion = new DistroVersion(
- tzDataSetVersion.formatMajorVersion,
- tzDataSetVersion.formatMinorVersion,
- tzDataSetVersion.rulesVersion,
- tzDataSetVersion.revision);
+ tzDataSetVersion.getFormatMajorVersion(),
+ tzDataSetVersion.getFormatMinorVersion(),
+ tzDataSetVersion.getRulesVersion(),
+ tzDataSetVersion.getRevision());
TimeZoneDistroBuilder builder = new TimeZoneDistroBuilder()
.setDistroVersion(distroVersion)
.setTzDataFile(getMandatoryPropertyFile(properties, "tzdata.file"))
