Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Link CalendarAstronomer statically in the system server" am: b07c8fb2ac am: 0a6a977dfe

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

Change-Id: I1c53ba090973c6c52f945da83dccaced247fa24f
This commit is contained in:
vichang
2020-07-29 09:32:30 +00:00
committed by Automerger Merge Worker
parent 608d002021 0a6a977dfe
commit a153245a75
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
services/core/Android.bp
View File

@@ -128,6 +128,7 @@ java_library_static {
"android.hidl.manager-V1.2-java", "android.hidl.manager-V1.2-java",
"capture_state_listener-aidl-java", "capture_state_listener-aidl-java",
"dnsresolver_aidl_interface-java", "dnsresolver_aidl_interface-java",
"icu4j_calendar_astronomer",
"netd_aidl_interfaces-platform-java", "netd_aidl_interfaces-platform-java",
"overlayable_policy_aidl-java", "overlayable_policy_aidl-java",
"SurfaceFlingerProperties", "SurfaceFlingerProperties",

3
services/core/java/com/android/server/twilight/TwilightService.java
View File

@@ -23,7 +23,6 @@ import android.content.BroadcastReceiver;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.IntentFilter; import android.content.IntentFilter;
import android.icu.impl.CalendarAstronomer;
import android.icu.util.Calendar; import android.icu.util.Calendar;
import android.location.Location; import android.location.Location;
import android.location.LocationListener; import android.location.LocationListener;
@@ -38,6 +37,8 @@ import android.util.Slog;
import com.android.internal.annotations.GuardedBy; import com.android.internal.annotations.GuardedBy;
import com.android.server.SystemService; import com.android.server.SystemService;
import com.ibm.icu.impl.CalendarAstronomer;
import java.util.Objects; import java.util.Objects;
/** /**