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

Commit b07c8fb2 authored by vichang's avatar vichang Committed by Gerrit Code Review
Browse files

Merge "Link CalendarAstronomer statically in the system server"

parents ce4d7d94 1bc37069

services/core/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ java_library_static { 
        "android.hardware.contexthub-V1.0-java",

        "android.hidl.manager-V1.2-java",

        "dnsresolver_aidl_interface-java",

        "icu4j_calendar_astronomer",

        "netd_aidl_interfaces-platform-java",

    ],

}

services/core/java/com/android/server/twilight/TwilightService.java

+2 −1
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ import android.content.BroadcastReceiver; 
import android.content.Context;

import android.content.Intent;

import android.content.IntentFilter;

import android.icu.impl.CalendarAstronomer;

import android.icu.util.Calendar;

import android.location.Location;

import android.location.LocationListener;
@@ -37,6 +36,8 @@ import android.util.Slog; 
import com.android.internal.annotations.GuardedBy;

import com.android.server.SystemService;



import com.ibm.icu.impl.CalendarAstronomer;



import java.util.Objects;



/**