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

Commit 84e70df9 authored by vichang's avatar vichang Committed by Automerger Merge Worker
Browse files

Merge "Link CalendarAstronomer statically in the system server" am: b07c8fb2... 

Merge "Link CalendarAstronomer statically in the system server" am: b07c8fb2 am: 0a6a977d am: a153245a am: 5c287bfd am: c375c036

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1374276

Change-Id: Id4fce6757d3927376882bf40efd920f16a9b3f19
parents 6117d617 c375c036

services/core/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -128,6 +128,7 @@ java_library_static { 
        "android.hidl.manager-V1.2-java",

        "capture_state_listener-aidl-java",

        "dnsresolver_aidl_interface-java",

        "icu4j_calendar_astronomer",

        "netd_aidl_interfaces-platform-java",

        "overlayable_policy_aidl-java",

        "SurfaceFlingerProperties",

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

+2 −1
Original line number Diff line number Diff line
@@ -23,7 +23,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;
@@ -38,6 +37,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;



/**