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

Merge "Merge "Switch to use tz data module tz files, not runtime module" am: 1c5515c76a am: dfaa438238" into qt-dev-plus-aosp

Browse Source
This commit is contained in:
Android Build Merger (Role)
2019-06-10 17:38:53 +00:00
committed by Android (Google) Code Review
parent e1422bca65 1bfb1f9e3c
commit 0b81bdb1b0
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -108,7 +108,7 @@ public final class RulesManagerService extends IRulesManager.Stub {
private static RulesManagerService create(Context context) { private static RulesManagerService create(Context context) {
RulesManagerServiceHelperImpl helper = new RulesManagerServiceHelperImpl(context); RulesManagerServiceHelperImpl helper = new RulesManagerServiceHelperImpl(context);
File baseVersionFile = new File(TimeZoneDataFiles.getRuntimeModuleTzVersionFile()); File baseVersionFile = new File(TimeZoneDataFiles.getTimeZoneModuleTzVersionFile());
File tzDataDir = new File(TimeZoneDataFiles.getDataTimeZoneRootDir()); File tzDataDir = new File(TimeZoneDataFiles.getDataTimeZoneRootDir());
return new RulesManagerService( return new RulesManagerService(
helper /* permissionHelper */, helper /* permissionHelper */,