Merge "Track debug key changes in libcore/" am: 462331f40f am: 79f93feb49

am: 052b9d2433

Change-Id: Id5272fe9891efa3994aa939fa6bbabef0789735e
This commit is contained in:
Neil Fuller
2018-12-06 05:21:24 -08:00
committed by android-build-merger

View File

@@ -94,7 +94,7 @@ public class RuntimeService extends Binder {
// Add /data tz data set using the DistroVersion class (which libcore cannot use).
// This update mechanism will be removed after the time zone APEX is launched so this
// untidiness will disappear with it.
String debugKeyPrefix = "core_library.timezone.data_";
String debugKeyPrefix = "core_library.timezone.source.data_";
String versionFileName = TimeZoneDataFiles.getDataTimeZoneFile(
TimeZoneDistro.DISTRO_VERSION_FILE_NAME);
addDistroVersionDebugInfo(versionFileName, debugKeyPrefix, coreLibraryDebugInfo);