231 Commits

Author SHA1 Message Date
Anton Hansson
a325ab1202 Merge "Add visibility rules to StubLibraries.bp" am: 6c57d63fcd am: d30fc17ddd am: 8a19796728
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675886

Change-Id: Id741b27d4497f0ed76474b9bfedecb3b114765a5
2021-04-16 10:11:31 +00:00
Anton Hansson
6c57d63fcd Merge "Add visibility rules to StubLibraries.bp" 2021-04-16 08:52:46 +00:00
Anton Hansson
28bbba90d0 Merge "Remove custom android_test.jar disting" am: 6339fba8a8 am: 8049f5cda2 am: 2b221cb6ef
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675507

Change-Id: Ib57ebd1d648b66caf8e71d617533c66169eb93a3
2021-04-14 18:35:35 +00:00
Anton Hansson
22efcf8590 Merge "Run bpfmt on StubLibraries.bp" am: cf54ae883b am: 38658a5658 am: 30d0c52c6a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675506

Change-Id: Ie936c09e70c22558cffdfae4648b99291a4d1c80
2021-04-14 18:35:07 +00:00
Anton Hansson
86925687e6 Add visibility rules to StubLibraries.bp
Stubs libraries are public, other stuff is not.

Bug: 185128417
Test: m nothing
Change-Id: I2c378e39995a88bb34a8f88819c05e75223734fd
2021-04-14 18:58:23 +01:00
Anton Hansson
68615ec0c8 Remove custom android_test.jar disting
This jar is dist already at apistubs/android/test/android.jar.

Bug: 185128417
Test: in production
Change-Id: Id972b3a8e4e6065bc09e4358e89c6423ed989295
2021-04-14 12:53:09 +01:00
Anton Hansson
240ee48eec Run bpfmt on StubLibraries.bp
It's part of the repo hooks now.

Test: No
Change-Id: Iccd07b1ce918fa50a166b106f281f31277391cea
2021-04-14 12:52:00 +01:00
Anton Hansson
1ea3057847 Merge "Update references incompatibilies files" 2021-04-13 18:03:59 +00:00
Anton Hansson
aec8866a37 Merge "Remove disabling of errorprone checks for stubs" am: 34fb03a88f am: 24eb9ef668 am: d7b991b329
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1671725

Change-Id: Ic64eec164c442ff8933d368e7ecda4d4266f4488
2021-04-13 16:30:32 +00:00
Anton Hansson
6b0e5aa9d5 Merge "Update references incompatibilies files" into sc-dev 2021-04-12 17:10:16 +00:00
Anton Hansson
65ffc7fabe Update references incompatibilies files
Use finer grain tracking targets, now they're available.

Bug: 178171189
Test: m android_{,system_,module_lib-}stubs_current \
        frameworks-base-api-{,system-,module-lib-}current-compat
Merged-In: I94e2ecd2075a577c5362293622ce5be5167cd91a
Change-Id: I94e2ecd2075a577c5362293622ce5be5167cd91a
2021-04-12 13:06:12 +01:00
Anton Hansson
7f3393d849 Update references incompatibilies files
Use finer grain tracking targets, now they're available.

Bug: 178171189
Test: m android_{,system_,module_lib-}stubs_current \
        frameworks-base-api-{,system-,module-lib-}current-compat
Change-Id: I94e2ecd2075a577c5362293622ce5be5167cd91a
2021-04-12 11:56:53 +01:00
Anton Hansson
d7440a1c68 Merge "Dist android-non-updatable.jar for sdk" am: e93771bfca am: 9ed545c4e7 am: 27fe7fa70e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1671727

Change-Id: I619111352f5510e69b6074ffcf11b8234fa3cc87
2021-04-12 10:39:12 +00:00
Anton Hansson
b63991e700 Merge "Compile android-non-updatable separately" am: e4d95a9e15 am: c26f163ad3 am: f2118995b2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1671726

Change-Id: I7b36622e3355c1c8eb365813579958b8260c8c17
2021-04-12 10:38:29 +00:00
Anton Hansson
b2f9756d70 Remove disabling of errorprone checks for stubs
Doesn't appear to be necessary (?).

Test: RUN_ERROR_PRONE=true m javac-check lint-check
Change-Id: Iabe61ae39e97a8e419a6c39bcba12f3ed0b24ee9
2021-04-12 11:12:12 +01:00
Anton Hansson
a410891802 Dist android-non-updatable.jar for sdk
So that it is recorded when we finalize the SDK.

Bug: 184839599
Test: (cd out/dist; diff -r apistubs /tmp/apistubs-before)
    Only in apistubs/android/module-lib: android-non-updatable.jar
    Only in apistubs/android/public: android-non-updatable.jar
    Only in apistubs/android/system: android-non-updatable.jar
    Only in apistubs/android/test: android-non-updatable.jar
Change-Id: I8fe2d46b4574e602f258ab6f941e07443dfdd2a7
2021-04-09 13:41:11 +01:00
Anton Hansson
a4748cd10d Compile android-non-updatable separately
The java stubs for android-non-updatable were previously only compiled
into the "main android stubs" target. This change refactors the build so
that we compile android-non-updatable stubs as a separate jar file. That
jar is then statically included into the main android stubs, making it
effectively a noop for the existing stub.

This has the benefit of making it possible to finalize the
android-non-updatable when the rest of the SDK artifacts are frozen,
so that we can later re-create android.jar with a mix of different
android-non-updatable and module stubs.

Bug: 184839599
Test: `m sdk dist` && diff -r out/apistubs{before,after}
Change-Id: I624e2e7ab5723eb5e27cf26dbe247aac2a799b72
2021-04-09 13:35:10 +01:00
Anton Hansson
6603593474 Separate out lists of modules from build rules
This simplifies management of the build rules across different branches
that may have different lists of modules.

Additionally, we dedupe the list of module system stubs.

Bug: 184839225
Test: m
Merged-In: Ibef1fb686305b5b1b50811b7d1c6d677d07d7177
Change-Id: Ibef1fb686305b5b1b50811b7d1c6d677d07d7177
2021-04-09 10:38:35 +01:00
Anton Hansson
33b9b855f3 Separate out lists of modules from build rules
This simplifies management of the build rules across different branches
that may have different lists of modules.

Additionally, we dedupe the list of module system stubs.

Bug: 184839225
Test: m
Change-Id: Ibef1fb686305b5b1b50811b7d1c6d677d07d7177
2021-04-09 10:22:34 +01:00
Anton Hansson
28e58b4783 Merge "Add a shared filegroup for non-updatable stub sources" am: 4ffb28c5f3 am: 4d79002c3c am: 916e38597d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1655731

Change-Id: I1ac2e12c782acac9087ff741676406557a19859e
2021-03-30 18:32:35 +00:00
Anton Hansson
77ff72fd71 Add a shared filegroup for non-updatable stub sources
It is always a mistake to add something to the stub sources but not
the doc stub sources.

Test: m
Change-Id: I6b76f5d2c7f0adc01b8a9eb141f2f34d9c2d2967
2021-03-30 10:45:27 +01:00
Colin Cross
9c3cceac50 Merge "Use framework-annotation-libs for hwbinder-stubs-docs" am: 35f70208f8 am: b4f0aacecd am: ad8bcb3ac6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652998

Change-Id: I786eec77e59d86f204108830a5f2f1eca4a815ed
2021-03-26 19:27:42 +00:00
Colin Cross
037d7fb498 Use framework-annotation-libs for hwbinder-stubs-docs
hwbinder.stubs and hwbinder-stubs-docs use SystemApi annotations.
Provide an explicit definition of SystemApi to metalava by adding
framework-annotations-libs to libs so it doesn't find it on its
own without a dependency.  Replace stub-annotations with
framework-annotations-libs in hwbinder.stubs for consistency.

Bug: 153703940
Test: m hwbinder.stubs
Change-Id: I777d68e446f8c7c1064667fd7c07b1e2ee6bfb1b
2021-03-26 17:44:07 +00:00
Colin Cross
1d0d1b3d6e Merge "Use stub-annotations to provide NonNull for hwbinder-stubs-docs" am: c4b72cd7ef am: 950e51fbd4 am: 4ee9e4609f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1636905

Change-Id: I7a1b447f85bda54aa00847918146e4ccff4ab0d5
2021-03-17 22:21:51 +00:00
Colin Cross
4ea5318b7f Use stub-annotations to provide NonNull for hwbinder-stubs-docs
The annotations in srcs aren't doing anything because they are all
@hide.  The only thing keeping hwbinder-stubs-docs compiling is
a hack in metalava that treats anything with
hwbinder-stubs-docs-stubs.srcjar.rsp in its input files as
effectively having annotations_enabled: false.

Remove the unnecessry srcs, and add stub-annotations, which contains
a stub definition for android.annotation.NonNull, to hwbinder.stubs.
None of the rest of the annotations in srcs are used in the
generated stubs.

Test: m hwbinder.stubs
Change-Id: I7ec9afb41ea9617f25d1dffd3382fed90997b751
2021-03-15 17:55:19 -07:00
Remi NGUYEN VAN
c15d99e6ff Split out the connectivity API surface
Split out connectivity APIs to connectivity module directories. This
prepares future move of the connectivity code into a mainline module,
but still keeps it implemented by framework-minus-apex for now: the API
stubs are moved to framework-connectivity.stubs, but the implementation
on device remains in the same place.

This allows moving the connectivity code in/out of APEX with minimal
changes.

BYPASS_INCLUSIVE_LANGUAGE_REASON=Moving files, can't modify released API

Bug: 171540887
Test: device boots, connectivity working

Merged-In: I21c42f032efa6c10e36c749df3183ce9679303a7
(cherry-pick from internal branch with API files conflicts)

Change-Id: I21c42f032efa6c10e36c749df3183ce9679303a7
2021-02-26 19:23:25 +09:00
Remi NGUYEN VAN
9f223cb0b4 Split out the connectivity API surface
Split out connectivity APIs to connectivity module directories. This
prepares future move of the connectivity code into a mainline module,
but still keeps it implemented by framework-minus-apex for now: the API
stubs are moved to framework-connectivity.stubs, but the implementation
on device remains in the same place.

This allows moving the connectivity code in/out of APEX with minimal
changes.

BYPASS_INCLUSIVE_LANGUAGE_REASON=Moving files, can't modify released API

Bug: 171540887
Test: device boots, connectivity working

Change-Id: I21c42f032efa6c10e36c749df3183ce9679303a7
2021-02-25 11:01:24 +09:00
Gavin Corkery
338545d785 Add framework-scheduling libraries
Test: Builds
Bug: 161353402
Change-Id: I39b2ff9ea4c08bb9bc699c807d0efa9ff092829e
2021-02-15 21:30:18 +00:00
Yan Yan
f8b973c3f6 Add IKE stub to main Android SDK
This CL is required for converting IKE from a shared library to
a jar in the boot classpath.

Bug: 177266501
Test: build, flash, boot
Change-Id: I10759d22eaba4861b7d7f283b551156f09f54675
Merged-In: I10759d22eaba4861b7d7f283b551156f09f54675
2021-02-09 17:23:55 -08:00
Yan Yan
1357a421a2 Add IKE stub to main Android SDK
This CL is required for converting IKE from a shared library to
a jar in the boot classpath.

Bug: 177266501
Test: build, flash, boot
Change-Id: I10759d22eaba4861b7d7f283b551156f09f54675
2021-02-09 10:24:11 -08:00
Anton Hansson
c605a0eddf Merge "Temporarily add IKE to non-updatable stubs build" am: 6869137dfa am: ddd98663b5 am: e3134523be
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1576466

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie2ef8f60d78bbf1d855bfb487d7e040c7c06145d
2021-02-05 18:19:15 +00:00
Anton Hansson
875dbcfb50 Merge "Update references to prebuilt sdks to use "current"" am: e4d468f16d am: d0051e43d9 am: ab3209763e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1576465

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7df7d42ed5f5035175173150ac46114a4025ed11
2021-02-05 18:18:30 +00:00
Anton Hansson
b7d532e4c8 Temporarily add IKE to non-updatable stubs build
...in order to be able to resolve IKE classes. Note that this can be
removed once the prebuilt stub in prebuilts/sdk contains IKE, which
can be achieved with a new import after this CL is submitted:
I10759d22eaba4861b7d7f283b551156f09f54675

Bug: 177266501
Test: m
Change-Id: I7229b1486e7170acca5da8f1b7874e5eaaecb1db
2021-02-05 11:40:25 +00:00
Anton Hansson
ce21e28bfc Update references to prebuilt sdks to use "current"
This facilities easier updating when new classes get added.

Bug: 177266501
Test: m
Change-Id: I85b3832681f0455093d2a33ace7dbc1028a1a5ff
2021-02-05 11:38:30 +00:00
Anton Hansson
925a94f7ca Merge "Switch to new incompatibilities targets" am: b5b629607b am: d258bf95fe am: 82acf8b6c9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1558555

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icdcb262662535c84edc5d7cc8c887842c85c534d
2021-01-28 17:15:16 +00:00
Anton Hansson
ce55623107 Switch to new incompatibilities targets
The previous incompatibilities genrule targets have been replaced
by targets auto-generated by prebuilt_sdks.

The intentention of this change is to eventually have per-jar file
incompatibilities tracking, but this change does not change the
underlying file used, only switching to the new target.

Bug: 178171189
Test: m
Change-Id: Ib5a2be7d53e3576d92db4c843f1fca829b9bfc6d
2021-01-25 12:34:00 +00:00
Hai Zhang
591e121df6 Add framework-permission-s java_sdk_library.
This will host the moved framework classes for role.

The class RoleFrameworkPlaceholder is added because the build won't
pass if there isn't any java source.

Bug: 158736025
Test: build
Change-Id: Icabab2cc956d6c7c07a6217256d23a8402960307
2021-01-23 00:19:59 -08:00
Anton Hansson
f118549ef7 Merge "Dist more API txt files" am: 45b39d81c4 am: d787b0501a am: 5e4e7ceca9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1555176

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia5b9c0e91e49db2edf2706616667a9e681fed649
2021-01-21 14:02:57 +00:00
Anton Hansson
85785fec8a Dist more API txt files
Add disting of the following for the sdk:
- android-non-updatable.txt
- android-non-updatable-removed.txt
- removed.txt

Bug: 158544979
Test: m sdk dist && inspect out/dist/apistubs
Change-Id: I5f628f4fcfc13f67105ee3b2760274e900fc1e34
2021-01-20 20:23:34 +00:00
Anton Hansson
b5048e482e Merge "Unbundle ART API from android-non-updatable" am: 5a4fc1d6e1 am: a81a5f1bdb am: f31935f2e9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1533282

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibae612368c7cedd9812925f632bfbbf5e7c844d1
2020-12-29 12:27:11 +00:00
Anton Hansson
d22c0fa659 Merge "Remove two unused libraries" am: 2458e4ad5d am: 97bf4d0551 am: a914538105
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1535143

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ide06e37c4bec2eac5b65b277307ffcfb96cfedf7
2020-12-23 18:54:04 +00:00
Anton Hansson
fc948d8675 Unbundle ART API from android-non-updatable
Stop tracking the ART APIs in the non-updatable current.txt, and
instead add in the txt/srcjar/jar files produced by the art module's
java_sdk_library.

Bug: 173606718
Test: manual last_released check of merged api txt (b/174847574 to
      automate)
Change-Id: I446a381f2b364a114ce391b99a13742d6769f14d
2020-12-23 14:51:17 +00:00
Anton Hansson
f435d200b7 Remove two unused libraries
These were used temporarily before merged stubs were ready,
but they are not used anymore.

Test: m
Change-Id: I517f64353749ffd8d92b8ddbc1dd8b7af75f2176
2020-12-23 14:50:11 +00:00
Anton Hansson
6080e03adf Merge "Stop ignoring classes on the classpath for stubs" am: 61e082abdb am: ab3f2d3aba am: 81bfcb40a3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1533280

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I814572df3ea32202a9f348901143d0b244dad56f
2020-12-22 12:34:57 +00:00
Anton Hansson
121ccbcfee Stop ignoring classes on the classpath for stubs
We're working on moving the libcore classes away from srcs and into the
classpath, and ignoring classes on the classpath will cause incorrect
API signatures once that happens (several libcore classes appear in
public API signatures).

Keep the docs building in the same way they were before. They will be
addressed in separate CLs.

Bug: 173606718
Test: m checkapi
Change-Id: I471327c3657662d7a093e9baa2fb6e08d640f895
2020-12-21 10:46:53 +00:00
Paul Duffin
24c79cdb88 Merge "Unbundle i18n API from android-non-updatable" am: 17e6d5b6a3 am: 3322b2800a am: f358ccece0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1513291

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I576e27b966d5e7b731a3f944bdee353e2cac9106
2020-12-11 10:50:29 +00:00
Paul Duffin
5a4e8f234d Unbundle i18n API from android-non-updatable
This removes the i18n source from the non-updatable stubs which removes
them from the frameworks/base/core/api files too. The API is still
protected by both the build and Gerrit review as the API is specified
in the external/icu/android_icu4j/api/public/ directory.

The i18n stubs source is used instead of the implementation source for
generating the JavaDoc. That revealed a minor issue with metalava which
is fixed in this topic.

The i18n stubs library was statically included alongside the conscrypt
stubs library so it will still appear in the monolothic android.jar.

Bug: 174344410
Test: m offline-sdk-docs
      - check that i18n classes are present
      m android_stubs_current android_system_stubs_current android_test_stubs_current
      - check that i18n classes are present in each jar
      m droid
Change-Id: I744c8bac54a8a5518ca0eca2a7700abbfa0997f4
2020-12-10 11:23:19 +00:00
Jayachandran C
0f14f81d7c Add indication APIs to expose QOS from LTE and NR bearers
Add indication APIs to expose Quality Of Service (QOS) information
from LTE and NR default as well as dedicated bearers. The QOS is
added to the existing SetupDataCallResult structure so that the
baseband can notify whenever there is a change in QoS on a PDN.

Bug: 158315614
Test: 1) Simulated V1_6 SetupDataCallResult and verified the Qos objects
         are passed correctly in the APIs
      2) atest frameworks/opt/telephony/tests/telephonytests/

Merged-In: I29b13975288286d9706a1c3fb227eeb46527efc3
Change-Id: I29b13975288286d9706a1c3fb227eeb46527efc3
2020-12-04 03:24:39 +00:00
Jayachandran Chinnakkannu
a2d72341a7 Merge "Add indication APIs to expose QOS from LTE and NR bearers" 2020-11-18 23:59:22 +00:00
Treehugger Robot
2a2108e7d7 Merge "Fix disting of android_system.jar" am: 0206a453f1 am: fad6403b9f am: 5294410614 am: 08290119fb
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1503392

Change-Id: I5e0f69aa407d52dc41f163c9d3671baf6e21153b
2020-11-18 22:52:15 +00:00