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

Commit 1bc37069 authored by Victor Chang's avatar Victor Chang
Browse files

Link CalendarAstronomer statically in the system server 

Stop-gap measure to allow TwilightService to fork
the implementation of CalendarAstronomer or use its own
implementation, and remove the @CorePlatformApi.

Bug: 139480281
Bug: 134508682
Test: m droid
Change-Id: Id75fefe4f66a386a1c072f8b2e0bdbd0f642bb4b
parent 059739f3

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;



/**