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

Commit 1bfb1f9e 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 

am: dfaa4382

Change-Id: I5d06cdc406af437e08379dc1125d8ce682a88aae
parents 47e606e9 dfaa4382

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -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 */,