From 1bc370696c2dfa9307e0b73984a6013aa6acb52c Mon Sep 17 00:00:00 2001
From: Victor Chang <vichang@google.com>
Date: Tue, 28 Jul 2020 11:48:48 +0100
Subject: 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
---
 services/core/Android.bp                                            | 1 +
 services/core/java/com/android/server/twilight/TwilightService.java | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/services/core/Android.bp b/services/core/Android.bp
index 2aa15d022468..e258735c17cd 100644
--- a/services/core/Android.bp
+++ b/services/core/Android.bp
@@ -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",
     ],
 }
diff --git a/services/core/java/com/android/server/twilight/TwilightService.java b/services/core/java/com/android/server/twilight/TwilightService.java
index e4cb19e3eb21..9464dbf44e9e 100644
--- a/services/core/java/com/android/server/twilight/TwilightService.java
+++ b/services/core/java/com/android/server/twilight/TwilightService.java
@@ -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;
 
 /**
-- 
cgit v1.2.3-59-g8ed1b