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

Merge "Use new package name for ZoneInfo and libcore.timezone" am: af6f8e2301 am: 64937407f2

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

Change-Id: I5ded5092e4c7706f58417a5c97f3207524b44a95
This commit is contained in:
vichang
2020-06-30 17:23:46 +00:00
committed by Automerger Merge Worker
parent 7ac8fcba2c 64937407f2
commit 26ed852eaf
10 changed files with 69 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/java/com/android/server/SystemServer.java
View File

@@ -80,6 +80,7 @@ import android.util.Pair;
import android.util.Slog;
import android.view.contentcapture.ContentCaptureManager;
import com.android.i18n.timezone.ZoneInfoDb;
import com.android.internal.R;
import com.android.internal.notification.SystemNotificationChannels;
import com.android.internal.os.BinderInternal;
@@ -180,8 +181,6 @@ import com.android.server.wm.ActivityTaskManagerService;
import com.android.server.wm.WindowManagerGlobalLock;
import com.android.server.wm.WindowManagerService;
import libcore.timezone.ZoneInfoDb;
import dalvik.system.VMRuntime;
import com.google.android.startop.iorap.IorapForwardingService;