commit 210054712f7d25d2d7068d1572e788026ea92efb
author Neil Fuller <nfuller@google.com> Fri Dec 07 15:16:34 2018 +0000
committer Neil Fuller <nfuller@google.com> Mon Dec 10 18:12:21 2018 +0000
tree 477d2e4ee0a17634a6addcd114f9e88b174db48d
parent 411866086ef615f71b9761341fceeacac3539303

Add runtime module time zone file debug information

Add runtime module time zone file debug information to
CoreLibraryDebug. The information can be obtained using
adb shell dumpsys runtime.

Bug: 118242715
Test: Ran adb shell dumpsys runtime
Change-Id: I8f5c8d47769f2e14123f561973a36e9c12ff2b9e

luni/src/main/java/libcore/timezone/TimeZoneDataFiles.java

diff --git a/luni/src/main/java/libcore/timezone/TimeZoneDataFiles.java b/luni/src/main/java/libcore/timezone/TimeZoneDataFiles.java
index a7eb23a2..eb92459 100644
--- a/luni/src/main/java/libcore/timezone/TimeZoneDataFiles.java
+++ b/luni/src/main/java/libcore/timezone/TimeZoneDataFiles.java
@@ -62,7 +62,7 @@
         return "/apex/com.android.tzdata/etc/" + fileName;
     }
 
-    private static String getRuntimeModuleFile(String fileName) {
+    public static String getRuntimeModuleFile(String fileName) {
         return System.getenv(ANDROID_RUNTIME_ROOT_ENV) + "/etc/" + fileName;
     }
 

luni/src/main/java/libcore/util/CoreLibraryDebug.java

diff --git a/luni/src/main/java/libcore/util/CoreLibraryDebug.java b/luni/src/main/java/libcore/util/CoreLibraryDebug.java
index cdfc2d5..fd33baf 100644
--- a/luni/src/main/java/libcore/util/CoreLibraryDebug.java
+++ b/luni/src/main/java/libcore/util/CoreLibraryDebug.java
@@ -64,6 +64,14 @@
             addTzDataSetVersionDebugInfo(versionFileName, tzDataModulePrefix, debugInfo);
         }
 
+        // Runtime module tz data set.
+        {
+            String runtimeModulePrefix = debugKeyPrefix + "runtime_module_";
+            String versionFileName =
+                    TimeZoneDataFiles.getRuntimeModuleFile(TzDataSetVersion.DEFAULT_FILE_NAME);
+            addTzDataSetVersionDebugInfo(versionFileName, runtimeModulePrefix, debugInfo);
+        }
+
         // /system tz data set.
         {
             String systemDirPrefix = debugKeyPrefix + "system_";