Jeff Sharkey 0ab7007631 resolve merge conflicts of 358f0d4fc8 to master ...

Bug: 174932174
Test: I solemnly swear I tested this conflict resolution.
Exempt-From-Owner-Approval: refactoring with team leads buy-in
Change-Id: I9262a08ffc1ccede8e519d0eed90ed2bfcf0232c

2020-12-08 11:01:05 -07:00

..

apk

Add @Nullable annotation to the parameter of Object.equals() methods.

2020-10-15 10:48:01 -07:00

imetracing

Add InputConnection app and service dump

2020-12-02 14:08:04 +00:00

jar

Add @Nullable annotation to the parameter of Object.equals() methods.

2020-10-15 10:48:01 -07:00

proto

resolve merge conflicts of 358f0d4fc8 to master

2020-12-08 11:01:05 -07:00

AndroidException.java

…

AndroidRuntimeException.java

…

ArrayMap.java

Add @Nullable annotation to the parameter of Object.equals() methods.

2020-10-15 10:48:01 -07:00

ArraySet.java

Add @Nullable annotation to the parameter of Object.equals() methods.

2020-10-15 10:48:01 -07:00

AtomicFile.java

Merge "Properly keep compatibility with openRead() during a write." into rvc-dev am: beac47b12e am: 2e7334ebd3 am: ca13677e7d am: 2fe9669565

2020-05-21 00:09:30 +00:00

AttributeSet.java

…

BackupUtils.java

…

Base64.java

Use new UnsupportedAppUsage annotation.

2020-01-09 15:08:18 +00:00

Base64DataException.java

…

Base64InputStream.java

…

Base64OutputStream.java

Use new UnsupportedAppUsage annotation.

2020-01-09 15:08:18 +00:00

CharsetUtils.java

Consistent handling of modified UTF-8.

2020-11-13 14:11:41 -07:00

CloseGuard.java

CloseGuard: Fix JavaDoc code sample to use correct API

2020-01-27 14:41:16 -08:00

Config.java

…

ContainerHelpers.java

…

DataUnit.java

…

DayOfMonthCursor.java

…

DebugUtils.java

Added support to more @DevicePolicyOperation operations.

2020-12-01 10:34:22 -08:00

DisplayMetrics.java

Add @Nullable annotation to the parameter of Object.equals() methods.

2020-10-15 10:48:01 -07:00

EventLog.java

Add maxTargetSdk restriction to unused APIs.

2020-11-04 09:45:53 +00:00

EventLogTags.java

…

ExceptionUtils.java

…

FastImmutableArraySet.java

…

FeatureFlagUtils.java

Make provider feature flag persistent

2020-11-05 22:04:37 -08:00

FloatMath.java

…

FloatProperty.java

…

Half.java

…

HashedStringCache.java

…

IconDrawableFactory.java

Add maxTargetSdk restriction to unused APIs.

2020-11-04 09:45:53 +00:00

IndentingPrintWriter.java

Move IndentingPrintWriter to android.util

2020-05-21 10:36:53 -07:00

IntArray.java

Refactor PermissionsState to be a data class for migration.

2020-09-21 22:25:50 -07:00

IntProperty.java

…

JsonReader.java

…

JsonScope.java

…

JsonToken.java

…

JsonWriter.java

…

KeyValueListParser.java

…

KeyValueSettingObserver.java

…

LauncherIcons.java

Introduce user types

2019-11-14 10:00:50 -08:00

LayoutDirection.java

…

LocalLog.java

Add maxTargetSdk restriction to unused APIs.

2020-11-04 09:45:53 +00:00

Log.java

Remove incorrect statement from Log docs.

2020-10-13 15:30:39 -04:00

LogPrinter.java

…

LogWriter.java

Add maxTargetSdk restriction to unused APIs.

2020-11-04 09:45:53 +00:00

LongArray.java

Add maxTargetSdk restriction to unused APIs.

2020-11-04 09:45:53 +00:00

LongArrayQueue.java

Overriding toString method.

2019-12-16 13:27:32 -08:00

LongSparseArray.java

Update language to comply with Android's inclusive language guidance

2020-09-14 10:00:02 -06:00

LongSparseLongArray.java

Update language to comply with Android's inclusive language guidance

2020-09-14 10:00:02 -06:00

LruCache.java

Use new UnsupportedAppUsage annotation.

2020-01-09 15:08:18 +00:00

MalformedJsonException.java

…

MapCollections.java

Add @Nullable annotation to the parameter of Object.equals() methods.

2020-10-15 10:48:01 -07:00

MathUtils.java

Use new UnsupportedAppUsage annotation.

2020-01-09 15:08:18 +00:00

MemoryIntArray.aidl

…

MemoryIntArray.java

Add @Nullable annotation to the parameter of Object.equals() methods.

2020-10-15 10:48:01 -07:00

MergedConfiguration.aidl

…

MergedConfiguration.java

Add @Nullable annotation to the parameter of Object.equals() methods.

2020-10-15 10:48:01 -07:00

MonthDisplayHelper.java

…

MutableBoolean.java

…

MutableByte.java

…

MutableChar.java

…

MutableDouble.java

…

MutableFloat.java

…

MutableInt.java

…

MutableLong.java

…

MutableShort.java

…

NoSuchPropertyException.java

…

NtpTrustedTime.java

Add maxTargetSdk restriction to unused APIs.

2020-11-04 09:45:53 +00:00

OWNERS

…

package.html

…

PackageUtils.java

…

Pair.java

Add @Nullable annotation to the parameter of Object.equals() methods.

2020-10-15 10:48:01 -07:00

PathParser.java

Add maxTargetSdk restriction to unused APIs.

2020-11-04 09:45:53 +00:00

Patterns.java

Add "ftp" to the list of URL schemes that get linkified.

2020-03-31 21:40:41 +02:00

Pools.java

Use new UnsupportedAppUsage annotation.

2020-01-09 15:08:18 +00:00

PrefixPrinter.java

…

Printer.java

…

PrintStreamPrinter.java

…

PrintWriterPrinter.java

…

Property.java

…

Range.java

Add @Nullable annotation to the parameter of Object.equals() methods.

2020-10-15 10:48:01 -07:00

Rational.java

Add maxTargetSdk restriction to unused APIs.

2020-11-04 09:45:53 +00:00

RecurrenceRule.java

Add maxTargetSdk restriction to unused APIs.

2020-11-04 09:45:53 +00:00

ReflectiveProperty.java

…

RotationUtils.java

Make WmDisplayCutout support waterfall and long edge cutout

2020-01-31 19:52:52 +08:00

Singleton.java

Use new UnsupportedAppUsage annotation.

2020-01-09 15:08:18 +00:00

Size.java

…

SizeF.java

…

Slog.java

Add maxTargetSdk restriction to unused APIs.

2020-11-04 09:45:53 +00:00

SparseArray.java

Use new UnsupportedAppUsage annotation.

2020-01-09 15:08:18 +00:00

SparseArrayMap.java

Generalize SparseArrayMap.

2020-09-16 10:07:55 -07:00

SparseBooleanArray.java

Add @Nullable annotation to the parameter of Object.equals() methods.

2020-10-15 10:48:01 -07:00

SparseIntArray.java

Use new UnsupportedAppUsage annotation.

2020-01-09 15:08:18 +00:00

SparseLongArray.java

…

SparseSetArray.java

Fixes SparseSetArray#add return logic

2020-01-16 14:58:28 -08:00

Spline.java

…

StateSet.java

…

StringBuilderPrinter.java

…

SuperNotCalledException.java

…

SystemConfigFileCommitEventLogger.java

Add SystemApi(MODULE_LIBRARIES) to AtomicFile API

2020-05-14 20:29:18 +00:00

TimedRemoteCaller.java

…

TimeFormatException.java

…

TimeUtils.java

Add maxTargetSdk restriction to unused APIs.

2020-11-04 09:45:53 +00:00

TimingLogger.java

Deprecate TimingLogger

2019-11-18 10:51:17 -08:00

TimingsTraceLog.java

…

TrustedTime.java

Add maxTargetSdk restriction to unused APIs.

2020-11-04 09:45:53 +00:00

TypedValue.java

…

TypedXmlPullParser.java

Refine TypedXmlPullParser API interface.

2020-11-16 14:43:29 -07:00

TypedXmlSerializer.java

Refine TypedXmlPullParser API interface.

2020-11-16 14:43:29 -07:00

UtilConfig.java

…

Xml.java

Additional hand-migration to TypedXml interface.

2020-11-30 20:45:25 -07:00

XmlPullAttributes.java

Use new UnsupportedAppUsage annotation.

2020-01-09 15:08:18 +00:00