diff options
| author | 2020-07-29 09:52:50 +0000 | |
|---|---|---|
| committer | 2020-07-29 09:52:50 +0000 | |
| commit | 5c287bfd370416dfcb6a5a447beb6063f22448de (patch) | |
| tree | 4b1143368dcae5d7c46d5d32f304edc2665b42f6 | |
| parent | f6d7721f6399f316e702ee07a242eb2b0f1a2d47 (diff) | |
| parent | a153245a7554dfa6d174b47bbbd0690c8af47d80 (diff) | |
Merge "Link CalendarAstronomer statically in the system server" am: b07c8fb2ac am: 0a6a977dfe am: a153245a75
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1374276
Change-Id: I49e86b3372f5d3d628502a55dc2d39316fc062ae
| -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 4bba0d892f3b..776c8f5912ff 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; /** |