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

Commit 0b81bdb1 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

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

Merge "Merge "Switch to use tz data module tz files, not runtime module" am: 1c5515c7 am: dfaa4382" into qt-dev-plus-aosp
parents e1422bca 1bfb1f9e

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 */,