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

Merge "Remove GregorianCalendar hack"

Browse Source 
am: 187c022bf1

* commit '187c022bf187f137d48d9031c43cfc233c9fc158':
  Remove GregorianCalendar hack
This commit is contained in:
Deepanshu Gupta
2016-01-23 00:02:05 +00:00
committed by android-build-merger
parent afbf1570ac 187c022bf1
commit 08f736e7b1
2 changed files with 0 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
tools/layoutlib/bridge/src/libcore/util/ZoneInfo_WallTime_Delegate.java
View File

@@ -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();
}
}

1
tools/layoutlib/create/src/com/android/tools/layoutlib/create/CreateInfo.java
View File

@@ -200,7 +200,6 @@ public final class CreateInfo implements ICreateInfo {
"libcore.io.MemoryMappedFile#mmapRO", "libcore.io.MemoryMappedFile#mmapRO",
"libcore.io.MemoryMappedFile#close", "libcore.io.MemoryMappedFile#close",
"libcore.io.MemoryMappedFile#bigEndianIterator", "libcore.io.MemoryMappedFile#bigEndianIterator",
"libcore.util.ZoneInfo$WallTime#createGregorianCalendar",
}; };
/** /**