Valentin Iftime 67d9805fed resolve merge conflicts of 484e166df3 to master ...

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

2019-10-08 22:21:44 +02:00

..

apk

Merge "Fix that the update to v1 signed version fails if apk verity is enabled" am: 0b3fe647ef am: b6fd88c4fc

2019-03-05 18:21:49 -08:00

jar

…

proto

Rename ProtoInputStream.isNextField to nextField.

2019-07-12 17:10:39 -07:00

AndroidException.java

…

AndroidRuntimeException.java

…

ArrayMap.java

Address static cache access issues.

2019-08-20 19:13:15 -07:00

ArraySet.java

resolve merge conflicts of 484e166df3 to master

2019-10-08 22:21:44 +02:00

AtomicFile.java

…

AttributeSet.java

…

BackupUtils.java

…

Base64.java

…

Base64DataException.java

…

Base64InputStream.java

…

Base64OutputStream.java

…

Config.java

…

ContainerHelpers.java

…

DataUnit.java

…

DayOfMonthCursor.java

…

DebugUtils.java

ServiceConnector impl + migration of RemoteFillService

2019-04-24 10:32:14 -07:00

DisplayMetrics.java

DO NOT MERGE: Add DENSITY_450

2019-06-14 15:41:13 -07:00

EventLog.java

…

EventLogTags.java

…

ExceptionUtils.java

…

FastImmutableArraySet.java

…

FeatureFlagUtils.java

Turn on feature flag to use bugreport API by default

2019-08-08 15:09:33 +01:00

FloatMath.java

…

FloatProperty.java

…

Half.java

Move Half implementations to libcore to allow ART optimizations

2019-08-14 14:07:44 +00:00

HashedStringCache.java

Fast follow-on unit tests for HashedStringCache

2019-04-04 15:15:33 -04:00

IconDrawableFactory.java

…

IntArray.java

…

IntProperty.java

…

JsonReader.java

…

JsonScope.java

…

JsonToken.java

…

JsonWriter.java

…

KeyValueListParser.java

Fix job scheduler constant

2019-01-25 15:18:48 -08:00

KeyValueSettingObserver.java

…

LauncherIcons.java

ic_corp_badge shape change on adaptive icon shape change

2019-05-06 02:13:58 -07:00

LayoutDirection.java

…

LocalLog.java

Added new dump method with indent for LocalLog.

2019-08-16 13:27:13 -07:00

Log.java

…

LogPrinter.java

…

LogWriter.java

…

LongArray.java

…

LongArrayQueue.java

Implementing app standby quotas for alarms

2019-01-23 13:50:12 -08:00

LongSparseArray.java

Add extra comment for implementation.

2019-04-29 11:47:41 -07:00

LongSparseLongArray.java

Add extra comment for implementation.

2019-04-29 11:47:41 -07:00

LruCache.java

Create general callback for changes to RecentTaskList

2019-07-26 12:10:47 -07:00

MalformedJsonException.java

…

MapCollections.java

…

MathUtils.java

Adds lerpInv, saturate, lerpInvSat and constrainedMap to MathUtils.

2019-02-11 15:01:52 -08:00

MemoryIntArray.aidl

…

MemoryIntArray.java

MemoryIntArray: dup in writeToParcel.

2019-05-15 14:05:26 -07:00

MergedConfiguration.aidl

…

MergedConfiguration.java

All Parcelable CREATOR fields are @NonNull.

2019-02-28 23:29:04 -07:00

MonthDisplayHelper.java

…

MutableBoolean.java

…

MutableByte.java

…

MutableChar.java

…

MutableDouble.java

…

MutableFloat.java

…

MutableInt.java

…

MutableLong.java

…

MutableShort.java

…

NoSuchPropertyException.java

…

NtpTrustedTime.java

…

OWNERS

Change owner

2019-10-07 17:54:51 +08:00

package.html

…

PackageUtils.java

Switch to HexEncoding from ByteStringUtils

2019-04-08 21:57:53 +01:00

Pair.java

…

PathParser.java

…

Patterns.java

…

Pools.java

…

PrefixPrinter.java

…

Printer.java

…

PrintStreamPrinter.java

…

PrintWriterPrinter.java

…

Property.java

…

Range.java

Range.java:Correct sign error in description

2019-01-03 00:27:06 +00:00

Rational.java

…

RecurrenceRule.java

All Parcelable CREATOR fields are @NonNull.

2019-02-28 23:29:04 -07:00

ReflectiveProperty.java

…

Singleton.java

…

Size.java

…

SizeF.java

…

Slog.java

Limit access to suspected false positives.

2018-12-28 14:26:35 +00:00

SparseArray.java

Add extra comment for implementation.

2019-04-29 11:47:41 -07:00

SparseBooleanArray.java

Add extra comment for implementation.

2019-04-29 11:47:41 -07:00

SparseIntArray.java

Add extra comment for implementation.

2019-04-29 11:47:41 -07:00

SparseLongArray.java

Add extra comment for implementation.

2019-04-29 11:47:41 -07:00

SparseSetArray.java

Fix QuotaController job spam throttling.

2019-04-22 11:06:15 -07:00

Spline.java

…

StateSet.java

…

StatsEvent.java

First draft of StatsEvent.java

2019-10-07 16:02:00 -07:00

StatsLog.java

Statsd: Add watchdog rollback to experiment ids

2019-05-20 22:52:40 +00:00

StringBuilderPrinter.java

…

SuperNotCalledException.java

…

TimedRemoteCaller.java

…

TimeFormatException.java

…

TimestampedValue.java

…

TimeUtils.java

Track changes to CountryTimeZones API

2019-09-10 11:57:48 +01:00

TimingLogger.java

…

TimingsTraceLog.java

Improved TimingsTraceLog performance by using arrays, instead of Deque of Pairs.

2019-06-25 15:34:02 -07:00

TrustedTime.java

…

TypedValue.java

Update TypedArray and TypedValue to store source layouts.

2019-01-31 15:44:51 -08:00

UtilConfig.java

Gating OutOfBoundsException on targetSdkVersion.

2019-04-26 12:22:16 -07:00

Xml.java

…

XmlPullAttributes.java

Add @UnsupportedAppUsage annotations

2019-03-22 11:43:11 +00:00