diff options
| author | 2020-07-29 10:38:51 +0000 | |
|---|---|---|
| committer | 2020-07-29 10:38:51 +0000 | |
| commit | 84e70df9d49bcb88c4ee3afc40a09f25c7ff193a (patch) | |
| tree | 152826ff8d6965f46a314d29551e8e03d60bc48a | |
| parent | 6117d617e911f76ca71c464179442441245afe49 (diff) | |
| parent | c375c03678ef5c6d3e856c6b0ddd715dbf1d357f (diff) | |
Merge "Link CalendarAstronomer statically in the system server" am: b07c8fb2ac am: 0a6a977dfe am: a153245a75 am: 5c287bfd37 am: c375c03678
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1374276
Change-Id: Id4fce6757d3927376882bf40efd920f16a9b3f19
| -rw-r--r-- | services/core/Android.bp | 1 | ||||
| -rw-r--r-- | services/core/java/com/android/server/twilight/TwilightService.java | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/services/core/Android.bp b/services/core/Android.bp index 64d0e911652e..1093515ac525 100644 --- a/services/core/Android.bp +++ b/services/core/Android.bp @@ -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", diff --git a/services/core/java/com/android/server/twilight/TwilightService.java b/services/core/java/com/android/server/twilight/TwilightService.java index 88a60ddc5a1e..47ab12742e9d 100644 --- a/services/core/java/com/android/server/twilight/TwilightService.java +++ b/services/core/java/com/android/server/twilight/TwilightService.java @@ -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; /** |