Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dfaa4382 authored by Neil Fuller's avatar Neil Fuller Committed by android-build-merger
Browse files

Merge "Switch to use tz data module tz files, not runtime module" 

am: 1c5515c7

Change-Id: I832044d65fdcb0323ae8eb2500586b12f2e7fae8
parents 244f2242 1c5515c7

services/core/java/com/android/server/timezone/RulesManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ public final class RulesManagerService extends IRulesManager.Stub { 


    private static RulesManagerService create(Context context) {

        RulesManagerServiceHelperImpl helper = new RulesManagerServiceHelperImpl(context);

        File baseVersionFile = new File(TimeZoneDataFiles.getRuntimeModuleTzVersionFile());

        File baseVersionFile = new File(TimeZoneDataFiles.getTimeZoneModuleTzVersionFile());

        File tzDataDir = new File(TimeZoneDataFiles.getDataTimeZoneRootDir());

        return new RulesManagerService(

                helper /* permissionHelper */,