tree 95ea87be48c4f1905debaf2d006b51c05b44588b
parent 1dbc25002d2f2372af37aa54654266163de64de3
parent ccddc1757c84d75b1cfb758b2e98534eaf44f608
author Paul Duffin <paulduffin@google.com> 1714403814 +0100
committer Paul Duffin <paulduffin@google.com> 1714403814 +0100

Merge remote-tracking branch 'aosp/metalava-main' into 'aosp/main'

Merge performed by:
  scripts/merge-from-metalava-main.sh

Changes includes in this merge (from newest to oldest):
* Prevent "sdks" containing SDK extension later than "since"
  - https://r.android.com/3065006
* Add tests for when API is included in later SDK than dessert release
  - https://r.android.com/3065005
* Avoid `Extract System Api` test depending on deprecated behavior
  - https://r.android.com/3065004
* Remove duplicate test for canManageMedia(...)
  - https://r.android.com/3065003
* Correct the test for SDKs separate from Android dessert releases
  - https://r.android.com/3065002
* Add tests about actual inline
  - https://r.android.com/3061867

This merge includes a number of changes so this contains a list of all
the affected bugs in order from oldest to newest.

Bug: 336816056
Bug: 336993217
Test: m checkapi
Change-Id: I8f062d778655a72ee90c1e3525aff67f120315d1