yuanjiahsu 8eb9d4711b resolve merge conflicts of 2cb9a70cac to master ...

Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ic1db72d57f3003bcec0fd8f7fbb2dc4ec7b5dcf3

2018-09-17 23:46:14 +08:00

..

apk

Avoid using 0 for fs-verity extension ID

2018-05-02 16:40:34 +00:00

jar

Merge "Remove dependency on InflaterInputStream.closed field."

2018-07-24 02:27:35 -07:00

proto

Intial ProtoInputStream checkin

2018-09-12 18:54:19 -07:00

AndroidException.java

…

AndroidRuntimeException.java

…

ArrayMap.java

Add @UnsupportedAppUsage annotations

2018-08-14 17:32:44 +01:00

ArraySet.java

Add @UnsupportedAppUsage annotations

2018-08-14 17:32:44 +01:00

AtomicFile.java

Reduce pss collection amount, improve logging.

2018-01-26 15:15:04 -08:00

AttributeSet.java

Add AttributeSet.getAttributeNamespace().

2018-02-09 12:51:58 -08:00

BackupUtils.java

…

Base64.java

Add @UnsupportedAppUsage annotations

2018-08-14 17:32:44 +01:00

Base64DataException.java

…

Base64InputStream.java

…

Base64OutputStream.java

Add @UnsupportedAppUsage annotations

2018-08-14 17:32:44 +01:00

ByteStringUtils.java

ByteStringUtils: fix hex parsing to include lowercase input.

2018-02-08 17:06:05 -08:00

Config.java

…

ContainerHelpers.java

…

DataUnit.java

API council requested tweaks to DataUnit.

2018-03-26 13:37:20 -06:00

DayOfMonthCursor.java

…

DebugUtils.java

Add @UnsupportedAppUsage annotations

2018-08-14 17:32:44 +01:00

DisplayMetrics.java

Add DENSITY_600

2018-08-20 02:23:42 +00:00

EventLog.java

Add @UnsupportedAppUsage annotations

2018-08-14 17:32:44 +01:00

EventLogTags.java

…

ExceptionUtils.java

Couple fixes for M11nGestureHandler

2018-02-14 17:44:28 -08:00

FastImmutableArraySet.java

…

FeatureFlagUtils.java

resolve merge conflicts of 2cb9a70cac to master

2018-09-17 23:46:14 +08:00

FloatMath.java

…

FloatProperty.java

…

Half.java

Make Half class use public APIs

2018-07-02 12:04:39 +01:00

IconDrawableFactory.java

Add @UnsupportedAppUsage annotations

2018-08-14 17:32:44 +01:00

IntArray.java

Track changes in libcore to remove a constructor

2018-07-04 09:11:08 +01:00

IntProperty.java

…

JsonReader.java

…

JsonScope.java

…

JsonToken.java

…

JsonWriter.java

…

KeyValueListParser.java

…

KeyValueSettingObserver.java

DO NOT MERGE Create a key value settings observer for backup parameters

2018-03-13 18:47:46 +00:00

LauncherIcons.java

Blue work profile badge - Blue is the new orange

2018-02-23 18:03:49 +00:00

LayoutDirection.java

…

LocalLog.java

Add @UnsupportedAppUsage annotations

2018-08-14 17:32:44 +01:00

Log.java

Add @UnsupportedAppUsage annotations

2018-08-14 17:32:44 +01:00

LogPrinter.java

…

LogWriter.java

Add @UnsupportedAppUsage annotations

2018-08-14 17:32:44 +01:00

LongArray.java

Add @UnsupportedAppUsage annotations

2018-08-14 17:32:44 +01:00

LongSparseArray.java

…

LongSparseLongArray.java

Add @UnsupportedAppUsage annotations

2018-08-14 17:32:44 +01:00

LruCache.java

Add @UnsupportedAppUsage annotations

2018-08-14 17:32:44 +01:00

MalformedJsonException.java

…

MapCollections.java

Remove uses of libcore.util.Objects.hashCode / equals.

2018-02-19 14:12:01 +00:00

MathUtils.java

Add @UnsupportedAppUsage annotations

2018-08-14 17:32:44 +01:00

MemoryIntArray.aidl

…

MemoryIntArray.java

MemoryIntArray: track the owned file descriptor in a PFD.

2018-08-09 16:32:42 -07:00

MergedConfiguration.aidl

…

MergedConfiguration.java

…

MonthDisplayHelper.java

…

MutableBoolean.java

Deprecate android.util.Mutable*.

2018-01-25 12:29:40 +00:00

MutableByte.java

Deprecate android.util.Mutable*.

2018-01-25 12:29:40 +00:00

MutableChar.java

Deprecate android.util.Mutable*.

2018-01-25 12:29:40 +00:00

MutableDouble.java

Deprecate android.util.Mutable*.

2018-01-25 12:29:40 +00:00

MutableFloat.java

Deprecate android.util.Mutable*.

2018-01-25 12:29:40 +00:00

MutableInt.java

Deprecate android.util.Mutable*.

2018-01-25 12:29:40 +00:00

MutableLong.java

Deprecate android.util.Mutable*.

2018-01-25 12:29:40 +00:00

MutableShort.java

Deprecate android.util.Mutable*.

2018-01-25 12:29:40 +00:00

NoSuchPropertyException.java

…

NtpTrustedTime.java

Add @UnsupportedAppUsage annotations

2018-08-14 17:32:44 +01:00

OWNERS

Add owner files for feature flag utils

2018-02-14 15:17:27 -08:00

package.html

…

PackageUtils.java

Add API to expose signing certificate proof-of-rotation.

2018-01-23 09:10:13 -08:00

Pair.java

…

PathParser.java

Add @UnsupportedAppUsage annotations

2018-08-14 17:32:44 +01:00

Patterns.java

…

Pools.java

Add @UnsupportedAppUsage annotations

2018-08-14 17:32:44 +01:00

PrefixPrinter.java

…

Printer.java

…

PrintStreamPrinter.java

…

PrintWriterPrinter.java

…

Property.java

…

Range.java

…

Rational.java

Add @UnsupportedAppUsage annotations

2018-08-14 17:32:44 +01:00

RecurrenceRule.java

Add @UnsupportedAppUsage annotations

2018-08-14 17:32:44 +01:00

ReflectiveProperty.java

…

Singleton.java

Add @UnsupportedAppUsage annotations

2018-08-14 17:32:44 +01:00

Size.java

…

SizeF.java

…

Slog.java

Add @UnsupportedAppUsage annotations

2018-08-14 17:32:44 +01:00

SparseArray.java

Merge "Add @UnsupportedAppUsage annotations" am: 06f2e6b7c8

2018-08-16 03:01:23 -07:00

SparseBooleanArray.java

Add @UnsupportedAppUsage annotations

2018-08-14 17:32:44 +01:00

SparseIntArray.java

Add @UnsupportedAppUsage annotations

2018-08-14 17:32:44 +01:00

SparseLongArray.java

…

SparseSetArray.java

Do not throttle EXEMPT apps on battery saver

2018-01-25 14:54:14 -08:00

Spline.java

…

StateSet.java

…

StatsLog.java

Re-enable the logging of APP_BREADCRUMB_REPORTED atom

2018-05-06 22:25:05 -07:00

StringBuilderPrinter.java

…

SuperNotCalledException.java

…

TimedRemoteCaller.java

…

TimeFormatException.java

…

TimestampedValue.java

Add more behavior to TimeDetectorService

2018-06-25 19:34:05 +01:00

TimeUtils.java

Add @UnsupportedAppUsage annotations

2018-08-14 17:32:44 +01:00

TimingLogger.java

…

TimingsTraceLog.java

…

TrustedTime.java

Add @UnsupportedAppUsage annotations

2018-08-14 17:32:44 +01:00

TypedValue.java

Fix javadoc syntax in TypedValue

2018-09-06 19:06:51 -04:00

Xml.java

Move XML object factory logic to libcore

2018-07-11 14:02:00 +01:00

XmlPullAttributes.java

Add AttributeSet.getAttributeNamespace().

2018-02-09 12:51:58 -08:00