am: d4f437ae

Change-Id: I404d7994edff2b88c0d19912250677bceeea9289

Merge "72967236: @RequiresPermission support for carrier-privileged APIs" am: 2545ce87 am: 874eeceb
am: b3eebaeb

Change-Id: I76bdeb222132e67aac13168adce27376c705ae1d

am: 9deb8126

Change-Id: I620d78dba72ef13044eec72985520f4643261bf7

am: 874eeceb

Change-Id: I73634485c1ff8cec729b94b8d41b98e48d8b85f9

[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master am: aa5213c1 -s ours
am: 056bb0cf -s ours
am skip reason: subject contains skip directive

Change-Id: If3fe711505c0c0acd01240331a2822ce30223967

am: aa5213c1 -s ours
am skip reason: subject contains skip directive

Change-Id: Ib73d9bd5509a5ade104bd67b1669d0316f48bd4b

am: 0db0fbff

Change-Id: Iadde17172d42510ebe12a242dcdd011292ff6c9e

am: 2545ce87

Change-Id: I4f509e3da88aec4dbb4b78b02cb60082a8bf5481

Test: make update-api and make checkapi
Change-Id: I034f99483c53d86922f735143f6a16ef41d46093

am: 5359b3a9

Change-Id: Id0dc49f699d77f226a445bddce769a38b28dd1e3

Bug: 120848293
Change-Id: I2ef1c35ba393a68786739b73c8be62bf5071f9d6

am: a1b5f311

Change-Id: Ib3a4bcd7e6fde54f5b4ef57d91eef0ecbbd0254e

am: 77adac31

Change-Id: I505c2eb0e0527da6e1eebcace7cd141d75cfae47

Allow @RequiresPermission to use the special marker string
"carrier privileges" to indicate that the app having carrier
services will also satisfy the requirement.

Bug: 72967236
Test: Unit tests included
Change-Id: I1ae8ef8d70b20b24a2f907cd80a50011fa66625c

Fixes: 124811433
Test: in androidx-master-dev, ./gradlew :media2-widget:generateApi
Change-Id: I9e97d8c52b489b5b8a8f5b1ec49b9425c91125d6

am: 5d806b11

Change-Id: If782d85bdf182dc34ace6aeedfb901b81ea9ae65

am: 5d5a752b

Change-Id: Ib9399d80b7351068afa5d8f7bbf1d2836128e75c

am: bd606aec

Change-Id: I0173bcc2f1cdf042352292104f4cbd6034f3007a

This is intended for doclava and other tools to do their
own rendering of the doc content to describe a deprecation
level.

Also renames the @since tag to @apiSince to make it less
ambiguous and to not conflict with existing @since tags
that are present in various docs.

Also starts emitting @apiSince into package.html docs,
such that there is a concept of a package API level; this
is the lowest API level for any class in that package.

Also makes sure we don't emit @apiSince for SystemApi
docs, since we don't have accurate historical information
for SystemApi and TestApi sources.

Also starts writing @apiSince tags even when the since tag
is 1 (e.g. for the APIs added from the beginning). This
was omitted for optimization purposes earlier but is added
back to make the doc generation task easier.
I also added some optimizations for these two new tags since
they can be merged more quickly with some special handling
since they never appear in existing sources and can always
be listed last in the docs.

Finally, various fixes to the API lookup data base
generation; this makes the generated database more
closely mirror what's in android.jar, and, importantly
for doc generation, properly tracks in-development APIs,
such that generated docs at the moment shows up as "Q"
instead of "28".

Test: Unit test updated
Change-Id: If25a8075dc1bb2ace184d1b4d6f19717fae2bc83

am: 279ad4b9

Change-Id: I5e63af38784ce70c41eb4100401834a041feca85

am: b05456f4

Change-Id: Ic37cdf9f6100e2031781988ba26594b1e4c87e2e

am: 75985bdd

Change-Id: I2147a3fca7e583678538d5c18ba721a882888412

am: d0bab0c6

Change-Id: I2a81d987ccc04d7f1b40582ab6a8f2fb57b6596e

Test: Unit test updated
Change-Id: I7f0b859b5f70649c611706a065f5a6411345976d

am: 1a083dbc

Change-Id: Ie6d9dee0d57ff13f1e2458198762da64e718e0dc

am: f1713cec

Change-Id: Ideeae669a2732b7e913e5b78d3db342b4d60362c

This CL adds the following flag:
--subtract-api <api file>  Subtracts the API in the given signature or jar
                           file from the current API being emitted via
                           --api, --stubs, --doc-stubs, etc. Note that the
                           subtraction only applies to classes; it does not
                           subtract members.

This lets you limit the emitted API signature files, stub files, etc,
to be just the delta relative to a subset of the API, or an older
version of the API.

Bug: 119021844: Remove duplicate classes from org.apache.http.legacy stubs library
Test: Unit test included
Change-Id: I28a9f0f49ac42626a62f5ca4faa6c35e38554228

am: dd9e041c

Change-Id: I4e95588287d8b491f51e6e227f1b986d814d7830

am: a0524a0b

Change-Id: Ib9efacada67ef98a8171391c18b78c40c38bab1e

am: d3fe21fb

Change-Id: Ic04f7099e59f53083f46ef78f484da9a38f29397

This CL adds a new flag to tell metalava that it's invoked while
*only* checking compatibility. In that case it will ignore various
other flags being passed in to it (such as --stubs, which it's
currently unconditionally passed but is not useful and is costly
during compatibility checks.)  It also renames the --update-api
flag (meant for similar purpose during make update-api, where
we don't need to generate stubs) to be called --only-update-api
to make its purpose clearer.

Test: Unit test included
Change-Id: I3f105746c5f76356b8dca0f1709ee2a4413ff938

am: ecf8d612

Change-Id: Ie2f977d04f612f338720d71a34eac3647a7a4f34

am: 1bfbb626

Change-Id: I9d511cbe74d5190b110e031e3375e60c7044a664

am: 42a0adb7

Change-Id: If5a2802cc540b2e18734f082a23fbf41729cef02

This CL updates the handling of Kotlin-style null syntax (used
in format v3). It now does a much more accurate job formatting
types from Java syntax (and Java type use annotation syntax)
into Kotlin-style nullness syntax. This cannot be done with
simple things like replacing @Nullable with ? since the place
for the annotations in the type expression is not the same as
where the nullness suffix goes.

This CL also adds --format=latest as an alias for --format=v3
and --format=recommended as an alias for --format=v2.
(The alias values will change over time as the formats and
recommendations evolve.)

Bug: 123415058
Test: Many new unit tests
Change-Id: I6622041f0966b99157db4fe60d534a55e658bd10

am: 11b47c38

Change-Id: I4bd91ccc420e7ede8ae4c34664cc75f1a945f2fb

am: 19888c37

Change-Id: Ie90796815acf4adccfc2f731c8e1de91f37591c7

am: c01068d0

Change-Id: Ib5cc43ca6fcbf65eeeea4905ee9c8b58df3b166c