From 4f3d0c6caab16a7296ad46179762e0c80e55e130 Mon Sep 17 00:00:00 2001 From: Deepanshu Gupta Date: Fri, 22 Jan 2016 11:11:57 -0800 Subject: Remove GregorianCalendar hack Bug: http://b.android.com/199424 Change-Id: I589d153e1f57b6302c6fe3c031c5c63e33ad9996 --- .../libcore/util/ZoneInfo_WallTime_Delegate.java | 32 ---------------------- .../android/tools/layoutlib/create/CreateInfo.java | 1 - 2 files changed, 33 deletions(-) delete mode 100644 tools/layoutlib/bridge/src/libcore/util/ZoneInfo_WallTime_Delegate.java (limited to 'tools') diff --git a/tools/layoutlib/bridge/src/libcore/util/ZoneInfo_WallTime_Delegate.java b/tools/layoutlib/bridge/src/libcore/util/ZoneInfo_WallTime_Delegate.java deleted file mode 100644 index f29c5c05fcac..000000000000 --- a/tools/layoutlib/bridge/src/libcore/util/ZoneInfo_WallTime_Delegate.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright (C) 2014 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package libcore.util; - -import com.android.tools.layoutlib.annotations.LayoutlibDelegate; - -import java.util.GregorianCalendar; - -/** - * Delegate used to provide alternate implementation of select methods in {@link ZoneInfo.WallTime} - */ -public class ZoneInfo_WallTime_Delegate { - - @LayoutlibDelegate - static GregorianCalendar createGregorianCalendar() { - return new GregorianCalendar(); - } -} diff --git a/tools/layoutlib/create/src/com/android/tools/layoutlib/create/CreateInfo.java b/tools/layoutlib/create/src/com/android/tools/layoutlib/create/CreateInfo.java index c9bc62ec3bcb..7c838e97cd63 100644 --- a/tools/layoutlib/create/src/com/android/tools/layoutlib/create/CreateInfo.java +++ b/tools/layoutlib/create/src/com/android/tools/layoutlib/create/CreateInfo.java @@ -200,7 +200,6 @@ public final class CreateInfo implements ICreateInfo { "libcore.io.MemoryMappedFile#mmapRO", "libcore.io.MemoryMappedFile#close", "libcore.io.MemoryMappedFile#bigEndianIterator", - "libcore.util.ZoneInfo$WallTime#createGregorianCalendar", }; /** -- cgit v1.2.3-59-g8ed1b