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

Merge "Track move of timezone classes to libcore.timezone"

Browse Source 
am: d48dbc9a34

Change-Id: I9ca335cc35c51450658a05e46d1ee438ace333b1
This commit is contained in:
Neil Fuller
2018-11-28 07:46:20 -08:00
committed by android-build-merger
parent 0a4727721a d48dbc9a34
commit f79ecf7c82
7 changed files with 26 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
config/boot-image-profile.txt
View File

@@ -51890,6 +51890,22 @@ HSPLlibcore/timezone/TimeZoneFinder;->parseLongAttribute(Lorg/xmlpull/v1/XmlPull
HSPLlibcore/timezone/TimeZoneFinder;->parseTimeZoneMappings(Lorg/xmlpull/v1/XmlPullParser;)Ljava/util/List; HSPLlibcore/timezone/TimeZoneFinder;->parseTimeZoneMappings(Lorg/xmlpull/v1/XmlPullParser;)Ljava/util/List;
HSPLlibcore/timezone/TimeZoneFinder;->processCountryZones(Lorg/xmlpull/v1/XmlPullParser;Llibcore/timezone/TimeZoneFinder$TimeZonesProcessor;)Z HSPLlibcore/timezone/TimeZoneFinder;->processCountryZones(Lorg/xmlpull/v1/XmlPullParser;Llibcore/timezone/TimeZoneFinder$TimeZonesProcessor;)Z
HSPLlibcore/timezone/TimeZoneFinder;->processXml(Llibcore/timezone/TimeZoneFinder$TimeZonesProcessor;)V HSPLlibcore/timezone/TimeZoneFinder;->processXml(Llibcore/timezone/TimeZoneFinder$TimeZonesProcessor;)V
HSPLlibcore/timezone/ZoneInfoDB$TzData$1;->create(Ljava/lang/Object;)Ljava/lang/Object;
HSPLlibcore/timezone/ZoneInfoDB$TzData$1;->create(Ljava/lang/String;)Llibcore/util/ZoneInfo;
HSPLlibcore/timezone/ZoneInfoDB$TzData;->close()V
HSPLlibcore/timezone/ZoneInfoDB$TzData;->finalize()V
HSPLlibcore/timezone/ZoneInfoDB$TzData;->getAvailableIDs()[Ljava/lang/String;
HSPLlibcore/timezone/ZoneInfoDB$TzData;->getBufferIterator(Ljava/lang/String;)Llibcore/io/BufferIterator;
HSPLlibcore/timezone/ZoneInfoDB$TzData;->hasTimeZone(Ljava/lang/String;)Z
HSPLlibcore/timezone/ZoneInfoDB$TzData;->loadData(Ljava/lang/String;)Z
HSPLlibcore/timezone/ZoneInfoDB$TzData;->loadTzDataWithFallback([Ljava/lang/String;)Llibcore/timezone/ZoneInfoDB$TzData;
HSPLlibcore/timezone/ZoneInfoDB$TzData;->makeTimeZone(Ljava/lang/String;)Llibcore/util/ZoneInfo;
HSPLlibcore/timezone/ZoneInfoDB$TzData;->makeTimeZoneUncached(Ljava/lang/String;)Llibcore/util/ZoneInfo;
HSPLlibcore/timezone/ZoneInfoDB$TzData;->readHeader()V
HSPLlibcore/timezone/ZoneInfoDB$TzData;->readIndex(Llibcore/io/BufferIterator;II)V
HSPLlibcore/timezone/ZoneInfoDB$TzData;->readZoneTab(Llibcore/io/BufferIterator;II)V
HSPLlibcore/timezone/ZoneInfoDB$TzData;->validateOffset(II)V
HSPLlibcore/timezone/ZoneInfoDB;->getInstance()Llibcore/timezone/ZoneInfoDB$TzData;
HSPLlibcore/util/BasicLruCache;-><init>(I)V HSPLlibcore/util/BasicLruCache;-><init>(I)V
HSPLlibcore/util/BasicLruCache;->create(Ljava/lang/Object;)Ljava/lang/Object; HSPLlibcore/util/BasicLruCache;->create(Ljava/lang/Object;)Ljava/lang/Object;
HSPLlibcore/util/BasicLruCache;->entryEvicted(Ljava/lang/Object;Ljava/lang/Object;)V HSPLlibcore/util/BasicLruCache;->entryEvicted(Ljava/lang/Object;Ljava/lang/Object;)V
@@ -51943,22 +51959,6 @@ HSPLlibcore/util/ZoneInfo;->hasSameRules(Ljava/util/TimeZone;)Z
HSPLlibcore/util/ZoneInfo;->hashCode()I HSPLlibcore/util/ZoneInfo;->hashCode()I
HSPLlibcore/util/ZoneInfo;->inDaylightTime(Ljava/util/Date;)Z HSPLlibcore/util/ZoneInfo;->inDaylightTime(Ljava/util/Date;)Z
HSPLlibcore/util/ZoneInfo;->readTimeZone(Ljava/lang/String;Llibcore/io/BufferIterator;J)Llibcore/util/ZoneInfo; HSPLlibcore/util/ZoneInfo;->readTimeZone(Ljava/lang/String;Llibcore/io/BufferIterator;J)Llibcore/util/ZoneInfo;
HSPLlibcore/util/ZoneInfoDB$TzData$1;->create(Ljava/lang/Object;)Ljava/lang/Object;
HSPLlibcore/util/ZoneInfoDB$TzData$1;->create(Ljava/lang/String;)Llibcore/util/ZoneInfo;
HSPLlibcore/util/ZoneInfoDB$TzData;->close()V
HSPLlibcore/util/ZoneInfoDB$TzData;->finalize()V
HSPLlibcore/util/ZoneInfoDB$TzData;->getAvailableIDs()[Ljava/lang/String;
HSPLlibcore/util/ZoneInfoDB$TzData;->getBufferIterator(Ljava/lang/String;)Llibcore/io/BufferIterator;
HSPLlibcore/util/ZoneInfoDB$TzData;->hasTimeZone(Ljava/lang/String;)Z
HSPLlibcore/util/ZoneInfoDB$TzData;->loadData(Ljava/lang/String;)Z
HSPLlibcore/util/ZoneInfoDB$TzData;->loadTzDataWithFallback([Ljava/lang/String;)Llibcore/util/ZoneInfoDB$TzData;
HSPLlibcore/util/ZoneInfoDB$TzData;->makeTimeZone(Ljava/lang/String;)Llibcore/util/ZoneInfo;
HSPLlibcore/util/ZoneInfoDB$TzData;->makeTimeZoneUncached(Ljava/lang/String;)Llibcore/util/ZoneInfo;
HSPLlibcore/util/ZoneInfoDB$TzData;->readHeader()V
HSPLlibcore/util/ZoneInfoDB$TzData;->readIndex(Llibcore/io/BufferIterator;II)V
HSPLlibcore/util/ZoneInfoDB$TzData;->readZoneTab(Llibcore/io/BufferIterator;II)V
HSPLlibcore/util/ZoneInfoDB$TzData;->validateOffset(II)V
HSPLlibcore/util/ZoneInfoDB;->getInstance()Llibcore/util/ZoneInfoDB$TzData;
HSPLorg/apache/harmony/dalvik/ddmc/Chunk;-><init>(ILjava/nio/ByteBuffer;)V HSPLorg/apache/harmony/dalvik/ddmc/Chunk;-><init>(ILjava/nio/ByteBuffer;)V
HSPLorg/apache/harmony/dalvik/ddmc/ChunkHandler;->putString(Ljava/nio/ByteBuffer;Ljava/lang/String;)V HSPLorg/apache/harmony/dalvik/ddmc/ChunkHandler;->putString(Ljava/nio/ByteBuffer;Ljava/lang/String;)V
HSPLorg/apache/harmony/dalvik/ddmc/ChunkHandler;->type(Ljava/lang/String;)I HSPLorg/apache/harmony/dalvik/ddmc/ChunkHandler;->type(Ljava/lang/String;)I
@@ -63399,6 +63399,9 @@ Llibcore/timezone/TimeZoneFinder$ReaderSupplier;
Llibcore/timezone/TimeZoneFinder$SelectiveCountryTimeZonesExtractor; Llibcore/timezone/TimeZoneFinder$SelectiveCountryTimeZonesExtractor;
Llibcore/timezone/TimeZoneFinder$TimeZonesProcessor; Llibcore/timezone/TimeZoneFinder$TimeZonesProcessor;
Llibcore/timezone/TimeZoneFinder; Llibcore/timezone/TimeZoneFinder;
Llibcore/timezone/ZoneInfoDB$TzData$1;
Llibcore/timezone/ZoneInfoDB$TzData;
Llibcore/timezone/ZoneInfoDB;
Llibcore/util/BasicLruCache; Llibcore/util/BasicLruCache;
Llibcore/util/CharsetUtils; Llibcore/util/CharsetUtils;
Llibcore/util/CollectionUtils; Llibcore/util/CollectionUtils;
@@ -63413,9 +63416,6 @@ Llibcore/util/ZoneInfo$CheckedArithmeticException;
Llibcore/util/ZoneInfo$OffsetInterval; Llibcore/util/ZoneInfo$OffsetInterval;
Llibcore/util/ZoneInfo$WallTime; Llibcore/util/ZoneInfo$WallTime;
Llibcore/util/ZoneInfo; Llibcore/util/ZoneInfo;
Llibcore/util/ZoneInfoDB$TzData$1;
Llibcore/util/ZoneInfoDB$TzData;
Llibcore/util/ZoneInfoDB;
Lorg/apache/harmony/dalvik/NativeTestTarget; Lorg/apache/harmony/dalvik/NativeTestTarget;
Lorg/apache/harmony/dalvik/ddmc/Chunk; Lorg/apache/harmony/dalvik/ddmc/Chunk;
Lorg/apache/harmony/dalvik/ddmc/ChunkHandler; Lorg/apache/harmony/dalvik/ddmc/ChunkHandler;

1
config/hiddenapi-light-greylist.txt
View File

@@ -4740,7 +4740,6 @@ Llibcore/util/BasicLruCache;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lan
Llibcore/util/EmptyArray;->BYTE:[B Llibcore/util/EmptyArray;->BYTE:[B
Llibcore/util/EmptyArray;->INT:[I Llibcore/util/EmptyArray;->INT:[I
Llibcore/util/EmptyArray;->OBJECT:[Ljava/lang/Object; Llibcore/util/EmptyArray;->OBJECT:[Ljava/lang/Object;
Llibcore/util/ZoneInfoDB$TzData;-><init>()V
Lorg/apache/harmony/dalvik/ddmc/Chunk;-><init>(ILjava/nio/ByteBuffer;)V Lorg/apache/harmony/dalvik/ddmc/Chunk;-><init>(ILjava/nio/ByteBuffer;)V
Lorg/apache/harmony/dalvik/ddmc/ChunkHandler;->CHUNK_ORDER:Ljava/nio/ByteOrder; Lorg/apache/harmony/dalvik/ddmc/ChunkHandler;->CHUNK_ORDER:Ljava/nio/ByteOrder;
Lorg/apache/harmony/dalvik/ddmc/DdmServer;->broadcast(I)V Lorg/apache/harmony/dalvik/ddmc/DdmServer;->broadcast(I)V

6
config/preloaded-classes
View File

@@ -6163,6 +6163,9 @@ libcore.reflect.TypeVariableImpl
libcore.reflect.Types libcore.reflect.Types
libcore.reflect.WildcardTypeImpl libcore.reflect.WildcardTypeImpl
libcore.timezone.TimeZoneDataFiles libcore.timezone.TimeZoneDataFiles
libcore.timezone.ZoneInfoDB
libcore.timezone.ZoneInfoDB$TzData
libcore.timezone.ZoneInfoDB$TzData$1
libcore.util.BasicLruCache libcore.util.BasicLruCache
libcore.util.CharsetUtils libcore.util.CharsetUtils
libcore.util.CollectionUtils libcore.util.CollectionUtils
@@ -6175,9 +6178,6 @@ libcore.util.SneakyThrow
libcore.util.ZoneInfo libcore.util.ZoneInfo
libcore.util.ZoneInfo$CheckedArithmeticException libcore.util.ZoneInfo$CheckedArithmeticException
libcore.util.ZoneInfo$WallTime libcore.util.ZoneInfo$WallTime
libcore.util.ZoneInfoDB
libcore.util.ZoneInfoDB$TzData
libcore.util.ZoneInfoDB$TzData$1
org.apache.harmony.dalvik.NativeTestTarget org.apache.harmony.dalvik.NativeTestTarget
org.apache.harmony.dalvik.ddmc.Chunk org.apache.harmony.dalvik.ddmc.Chunk
org.apache.harmony.dalvik.ddmc.ChunkHandler org.apache.harmony.dalvik.ddmc.ChunkHandler

2
core/java/android/app/AlarmManager.java
View File

@@ -35,7 +35,7 @@ import android.util.ArrayMap;
import android.util.Log; import android.util.Log;
import android.util.proto.ProtoOutputStream; import android.util.proto.ProtoOutputStream;
import libcore.util.ZoneInfoDB; import libcore.timezone.ZoneInfoDB;
import java.io.IOException; import java.io.IOException;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;

2
core/java/android/text/format/Time.java
View File

@@ -18,8 +18,8 @@ package android.text.format;
import android.util.TimeFormatException; import android.util.TimeFormatException;
import libcore.timezone.ZoneInfoDB;
import libcore.util.ZoneInfo; import libcore.util.ZoneInfo;
import libcore.util.ZoneInfoDB;
import java.io.IOException; import java.io.IOException;
import java.util.Locale; import java.util.Locale;

2
core/java/android/util/TimeUtils.java
View File

@@ -24,7 +24,7 @@ import android.os.SystemClock;
import libcore.timezone.CountryTimeZones; import libcore.timezone.CountryTimeZones;
import libcore.timezone.CountryTimeZones.TimeZoneMapping; import libcore.timezone.CountryTimeZones.TimeZoneMapping;
import libcore.timezone.TimeZoneFinder; import libcore.timezone.TimeZoneFinder;
import libcore.util.ZoneInfoDB; import libcore.timezone.ZoneInfoDB;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;

2
services/core/java/com/android/server/timezone/RulesManagerService.java
View File

@@ -49,7 +49,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
import libcore.icu.ICU; import libcore.icu.ICU;
import libcore.timezone.TzDataSetVersion; import libcore.timezone.TzDataSetVersion;
import libcore.timezone.TimeZoneFinder; import libcore.timezone.TimeZoneFinder;
import libcore.util.ZoneInfoDB; import libcore.timezone.ZoneInfoDB;
import static android.app.timezone.RulesState.DISTRO_STATUS_INSTALLED; import static android.app.timezone.RulesState.DISTRO_STATUS_INSTALLED;
import static android.app.timezone.RulesState.DISTRO_STATUS_NONE; import static android.app.timezone.RulesState.DISTRO_STATUS_NONE;