Dianne Hackborn 5101b95710 resolve merge conflicts of e174476 to master ...

Change-Id: I4005cf91b8a6bf3faa2301d8ce97ab1ad5eed94f

2016-06-01 12:01:38 -07:00

..

apk

Remove support for DSA with SHA-512 from v2 sig verification.

2016-03-31 12:06:18 -07:00

jar

Ignore signature stripping protection for preinstalled APKs.

2016-03-24 12:02:20 -07:00

AndroidException.java

…

AndroidRuntimeException.java

…

ArrayMap.java

Utility to detect lock inversions in system.

2016-02-27 21:15:01 -07:00

ArraySet.java

Utility to detect lock inversions in system.

2016-02-27 21:15:01 -07:00

AtomicFile.java

…

AttributeSet.java

…

BackupUtils.java

Enabling SoftAP Configuration Backup.

2016-02-08 10:33:13 +00:00

Base64.java

…

Base64DataException.java

…

Base64InputStream.java

…

Base64OutputStream.java

…

Config.java

…

ContainerHelpers.java

…

DayOfMonthCursor.java

…

DebugUtils.java

…

DisplayMetrics.java

Update docs for DisplayMetrics pixel size fields

2016-03-10 22:08:14 -08:00

EventLog.java

Add JNI bridge to the new logd security buffer.

2016-01-15 17:18:49 +00:00

EventLogTags.java

…

ExceptionUtils.java

…

FastImmutableArraySet.java

…

FloatMath.java

…

FloatProperty.java

Un-hide FloatProperty and IntProperty

2015-11-03 13:41:46 -08:00

IntArray.java

…

IntProperty.java

Un-hide FloatProperty and IntProperty

2015-11-03 13:41:46 -08:00

JsonReader.java

…

JsonScope.java

…

JsonToken.java

…

JsonWriter.java

…

KeyValueListParser.java

Work on issue #28942589: Tune job scheduler

2016-05-31 18:16:19 -07:00

LayoutDirection.java

…

LocalLog.java

Revert "DO NOT MERGE Enhance local log."

2015-07-29 14:11:23 -07:00

Log.java

When system server goes down, crash apps more.

2016-02-27 17:17:01 -07:00

LogPrinter.java

…

LogWriter.java

…

LongArray.java

…

LongSparseArray.java

…

LongSparseLongArray.java

…

LruCache.java

…

MalformedJsonException.java

…

MapCollections.java

…

MathUtils.java

Animate radial time picker selector during hour/minute transition

2015-10-02 15:29:43 -04:00

MemoryIntArray.aidl

Ensure local settings caches are not stale

2016-04-26 11:31:55 -07:00

MemoryIntArray.java

Make settings cahches generation mechanism robust.

2016-05-13 15:14:14 -07:00

MonthDisplayHelper.java

…

NoSuchPropertyException.java

…

NtpTrustedTime.java

…

package.html

…

Pair.java

Fix RootsCache invalidation bugs.

2016-03-30 17:14:25 -06:00

PathParser.java

Improve error logging for parsing failures

2016-04-08 18:01:54 +00:00

Patterns.java

Update autoLink URL regex to match empty path, $ and _

2016-04-13 20:10:47 +00:00

Pools.java

…

PrefixPrinter.java

…

Printer.java

…

PrintStreamPrinter.java

…

PrintWriterPrinter.java

…

Property.java

…

Range.java

…

Rational.java

…

ReflectiveProperty.java

…

Singleton.java

…

Size.java

…

SizeF.java

…

Slog.java

…

SparseArray.java

Fix a11y crash when window layer isn't unique.

2016-05-19 13:32:24 -07:00

SparseBooleanArray.java

Push equals impl into SparseBooleanArray.

2015-07-22 11:53:14 -07:00

SparseIntArray.java

More granular reporting of size configurations.

2015-10-30 10:14:17 -07:00

SparseLongArray.java

…

Spline.java

…

StateSet.java

Propagate TextView drawable state after resolving RTL drawables

2015-12-16 16:06:23 -05:00

StringBuilderPrinter.java

…

SuperNotCalledException.java

…

TimedRemoteCaller.java

…

TimeFormatException.java

…

TimeUtils.java

DO NOT MERGE Fix TimeUtils.formatDuration for exactly one of a unit

2015-12-10 16:06:50 -08:00

TimingLogger.java

…

TrustedTime.java

…

TypedValue.java

Ensure all Java-side usages of config flags are using Java flags

2016-03-11 15:15:51 -05:00

Xml.java

…

XmlPullAttributes.java

…