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

Merge "Obtain the ICU version from ICU4J instead of ICU4C" am: 552bd08fa5

Browse Source 
am: 819d8043bf

Change-Id: I28d7a4098ae0b7aadaafc3eb5be9f14cbb5c4ae5
This commit is contained in:
vichang
2019-11-11 09:25:18 -08:00
committed by android-build-merger
parent a9b90e91bf 819d8043bf
commit de6997d351
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/timezone/RulesManagerService.java
View File

@@ -32,6 +32,7 @@ import android.app.timezone.IRulesManager;
import android.app.timezone.RulesManager; import android.app.timezone.RulesManager;
import android.app.timezone.RulesState; import android.app.timezone.RulesState;
import android.content.Context; import android.content.Context;
import android.icu.util.TimeZone;
import android.os.ParcelFileDescriptor; import android.os.ParcelFileDescriptor;
import android.os.RemoteException; import android.os.RemoteException;
import android.util.Slog; import android.util.Slog;
@@ -45,7 +46,6 @@ import com.android.timezone.distro.StagedDistroOperation;
import com.android.timezone.distro.TimeZoneDistro; import com.android.timezone.distro.TimeZoneDistro;
import com.android.timezone.distro.installer.TimeZoneDistroInstaller; import com.android.timezone.distro.installer.TimeZoneDistroInstaller;
import libcore.icu.ICU;
import libcore.timezone.TimeZoneDataFiles; import libcore.timezone.TimeZoneDataFiles;
import libcore.timezone.TimeZoneFinder; import libcore.timezone.TimeZoneFinder;
import libcore.timezone.TzDataSetVersion; import libcore.timezone.TzDataSetVersion;
@@ -519,7 +519,7 @@ public final class RulesManagerService extends IRulesManager.Stub {
// Report the active rules version (i.e. the rules in use by the current // Report the active rules version (i.e. the rules in use by the current
// process). // process).
pw.println("Active rules version (ICU, ZoneInfoDB, TimeZoneFinder): " pw.println("Active rules version (ICU, ZoneInfoDB, TimeZoneFinder): "
+ ICU.getTZDataVersion() + "," + TimeZone.getTZDataVersion() + ","
+ ZoneInfoDB.getInstance().getVersion() + "," + ZoneInfoDB.getInstance().getVersion() + ","
+ TimeZoneFinder.getInstance().getIanaVersion()); + TimeZoneFinder.getInstance().getIanaVersion());
break; break;
@@ -535,7 +535,7 @@ public final class RulesManagerService extends IRulesManager.Stub {
pw.println("RulesManagerService state: " + toString()); pw.println("RulesManagerService state: " + toString());
pw.println("Active rules version (ICU, ZoneInfoDB, TimeZoneFinder): " pw.println("Active rules version (ICU, ZoneInfoDB, TimeZoneFinder): "
+ ICU.getTZDataVersion() + "," + TimeZone.getTZDataVersion() + ","
+ ZoneInfoDB.getInstance().getVersion() + "," + ZoneInfoDB.getInstance().getVersion() + ","
+ TimeZoneFinder.getInstance().getIanaVersion()); + TimeZoneFinder.getInstance().getIanaVersion());
pw.println("Distro state: " + rulesState.toString()); pw.println("Distro state: " + rulesState.toString());