92 Commits

Author SHA1 Message Date
Treehugger Robot
d4544426a5 Merge "ApiDocs.bp: fix typo (proofrerad -> proofread)" am: 8513c50145 am: 895fe3cba3 am: f45ee975a7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2049723

Change-Id: I513f13d9de43e517cd0bbb3fcb97ec3a85b0b23d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 15:43:24 +00:00
Mårten Kongstad
2598fe0136 ApiDocs.bp: fix typo (proofrerad -> proofread)
Bug: N/A
Test: builds
Change-Id: Idced669300ad40afd0de78046c2d4479d8ef75de
2022-03-30 12:31:33 +00:00
Frank Wang
0ce30dd193 Remove Auxiliary stubs and bootclasspath fragment
Test: TH
Bug: 210728915
Change-Id: I9434a5cc50d3dbea0b55a8b8deda987fbd5e66ea
2022-03-03 06:13:41 +00:00
Nikita Ioffe
c04cf3c4b9 Merge "Rename supplementalprocess->sdksandbox jars" into tm-dev 2022-03-01 17:08:45 +00:00
Nikita Ioffe
59029ad151 Rename supplementalprocess->sdksandbox jars
Bug: 220320098
Test: m
Test: presubmit
Test: flashed device, checked BCP and SSCP
Change-Id: Ie1d2aac422f9ffe332f9622b168e908dee874c9e
2022-02-28 18:32:17 +00:00
Neha Pattan
fa46dd2aae (1/6) AdServices setup.
Bug: 219953633
Test: build
      mmm -j packages/modules/AdServices
      mmm -j packages/modules/SupplementalApi
Change-Id: I2fe660daf8f90b41526d946fb66e83aaf9fd1ed0
2022-02-24 16:28:26 +00:00
Baligh Uddin
235f9b1078 Remove apex/media - migrated to packages/modules/Media
Fix references for local_include_dirs for aidl support.

BUG: 171106157
Test: Local build and TH
Merged-In: Ice516a0ab0819c4a076c394c05be1643461d4309
Change-Id: I3625bf1e262a031263d500b2c6129bf3c18cdeb2
2022-02-17 16:01:56 +00:00
Baligh Uddin
b8b46fde2a Remove apex/media - migrated to packages/modules/Media
Fix references for local_include_dirs for aidl support.

BUG: 171106157
Test: Local build and TH
Change-Id: Ice516a0ab0819c4a076c394c05be1643461d4309
2022-02-16 16:00:58 +00:00
Frank Wang
e97ff9ebfe Add ondevicepersonalization stubs and bootclasspath fragment
Test: Build
Bug: b/218749359
Change-Id: I651ca865a3215fa2a541636c3af495fdcd4ba8f9
2022-02-13 07:06:31 +00:00
Frank Wang
15ceb0bb37 Merge "Revert "Revert "Add SupplementalProcess stubs and bootclasspath ..."" 2022-01-27 22:45:08 +00:00
Anton Hansson
17d7492e4f Merge "Dedupe default definitions slightly" am: 1dd24999da am: 0df14efb38 am: d0a53ed335 am: 18fcf53e69
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1956703

Change-Id: I98bc4bbbf5f8fd33ed96b6387fa6a703dd7b4052
2022-01-27 17:12:44 +00:00
Anton Hansson
1dd24999da Merge "Dedupe default definitions slightly" 2022-01-27 15:59:16 +00:00
Frank Wang
07861f70d3 Revert "Revert "Add SupplementalProcess stubs and bootclasspath ..."
Revert^2 "Add bootclasspath config in Auxiliary."

ba33413304d140c02bd8d2477576fb19889af031

Change-Id: I2e8f05406c90565b517f5d7d05aae0dc6d8a4200
2022-01-27 07:52:21 +00:00
Roopa Sattiraju
86058b62d8 Moving over core/api/*txt files
Bug: 196026708
Test: Compile
Merged-In: I636f00132a13467e63b08f21d9cc9dcaab250b8a
Change-Id: I636f00132a13467e63b08f21d9cc9dcaab250b8a
2022-01-26 14:21:29 -08:00
Roopa Sattiraju
8e30577d04 Moving over core/api/*txt files
Bug: 196026708
Test: Compile
Change-Id: I636f00132a13467e63b08f21d9cc9dcaab250b8a
2022-01-25 14:46:30 -08:00
Anton Hansson
5aa5933732 Dedupe default definitions slightly
We only need one defaults for doc-stubs. Add the module-classpath
defaults and api-db generation to the modules that need it instead.

Test: m framework-doc-stubs before & after and diff soong intermediates
Change-Id: I26066d1a8bb3ef190c89d840b52884d2b71ee977
2022-01-25 18:27:00 +00:00
Anton Hansson
b2099f114b Merge "Make framework-doc-stubs use jarstub defaults" am: d285e2e002 am: c09b6ce67c am: 1954870920 am: c54bd9e2cb
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1956702

Change-Id: I0172d0f524018d5836ba902dcd32a44508bf33c8
2022-01-25 12:23:13 +00:00
Ken Sun
fb385e8b14 Merge "Revert "Add SupplementalProcess stubs and bootclasspath fragment"" 2022-01-25 09:08:59 +00:00
Johnny Lee
d07b757a6a Revert "Add SupplementalProcess stubs and bootclasspath fragment"
Revert "Add bootclasspath config in Auxiliary."

Revert "Add framework-auxiliary to PRODUCT_APEX_BOOT_JARS"

Revert submission 16684516-auxiliary_bcp

Reason for revert: pdk build breakage
Reverted Changes:
I8c92d2ccb:Add bootclasspath config in Auxiliary.
I9ac910fa2:Add SupplementalProcess stubs and bootclasspath fr...
I7cf3b31b0:Add framework-auxiliary to PRODUCT_APEX_BOOT_JARS

Bug: 216218564
Change-Id: Ie4374fed1e4869ae194b59e2298db785e647ed4f
2022-01-25 06:58:55 +00:00
Frank Wang
beacc9da21 Merge "Add SupplementalProcess stubs and bootclasspath fragment" 2022-01-24 22:36:49 +00:00
Anton Hansson
9f8924f79f Merge "Split android-non-updatable-stubs-defaults in two" am: 70ab0685cf am: e55397e910 am: 8906255544 am: 7312a200ec
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1958860

Change-Id: I7c1b3a9ebb2a8cf9dd64ec05f70450442cc83fcd
2022-01-24 18:22:22 +00:00
Anton Hansson
87f04b8d57 Make framework-doc-stubs use jarstub defaults
These stubs used to duplicate all the properties in the defaults
we had already defined, but did not set e.g. sdk_version: "none",
which meant certain symbols were imported twice (which is error
prone / wrong as they could potentially be different).

Test: m framework-doc-stubs before & after and diff soong intermediates
Change-Id: I96dfa66a9deea3564980678fd64f2bfc6460eebd
2022-01-24 16:29:13 +00:00
Frank Wang
f2bb5e0c5f Add SupplementalProcess stubs and bootclasspath fragment
Test: Builds
Bug: b/210728915
Change-Id: I9ac910fa2275eb68faed05a800e990eef6a1fe90
2022-01-24 15:55:40 +00:00
Anton Hansson
9dce832eea Split android-non-updatable-stubs-defaults in two
Put the module classpath defaults into a separate defaults module,
such that users can choose to add the module symbols in a different
way.

Update all the current users to apply both defaults.

Test: m nothing
Change-Id: I22f9518c2e205bfa8ad8d4b630ec976921786b73
2022-01-24 15:50:59 +00:00
paulhu
c100db56a2 Split out the nsd API surface and use framework-connectivity-tiramisu
- Split out nsd APIs and hidden APIs to Connectivity module.
- Keep the all files in f/b/packages/Connectivity-T and add
  framework-connectivity-tiramisu library on p/m/Connectivity.
  Then make framework to use this module library.
- Remove NsdService from SystemServer which will register from
  ConnectivityServiceInitializer

Bug: 206893064
Test: m online-sdk-dev-docs
Test: atest FrameworksNetTests CtsNetTestCases
CTS-Coverage-Bug: 207804007
Merged-In: I72c7de124b9cc53f2263bd452ecd5f39e88e485b
Change-Id: I72c7de124b9cc53f2263bd452ecd5f39e88e485b
2022-01-19 18:47:45 +08:00
Anton Hansson
8c54dea251 Merge "Fix test source reference" am: 09dcc2da3e am: c0d04de42d am: 565d5a1107 am: 354bab5b65
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1952376

Change-Id: I33ef19a3485a77f426b75aeb95e0ae3a57a336e0
2022-01-18 15:36:41 +00:00
Anton Hansson
09dcc2da3e Merge "Fix test source reference" 2022-01-18 14:43:24 +00:00
Anton Hansson
4468d7c6bf Create a filegroup for public stub sources
For use by framework-doc-stubs, to avoid duplicating the list of
modules there.

Bug: 169103987
Test: m framework-doc-stubs ; diff intermediates before & after
Merged-In: Ib1a1d1bb9fcf866278c6ddd057712a9c92716dbf
Change-Id: Ib1a1d1bb9fcf866278c6ddd057712a9c92716dbf
2022-01-17 19:07:11 +00:00
Anton Hansson
cc18e03e44 Construct sdk-annotations.zip programmatically
Avoid hardcoding the list of modules in yet another place.

Bug: 169103987
Test: diff zip before & after (identical)
Merged-In: Id3983bf5f4b96b23b1da09fd3617870ac3926ea1
Change-Id: Id3983bf5f4b96b23b1da09fd3617870ac3926ea1
2022-01-17 19:07:05 +00:00
Anton Hansson
7854980515 Fix test source reference
If not referencing the filegroup, the package name is not detected
correctly by metalava. This seems to have led to some IntDefs being
dropped.

Test: m sdk-annotations.zip ; diff before and after (notice
      android.test appearing)
Change-Id: I8db80aca28f73a5425618e82a2d7f5bf14e7e00a
2022-01-17 18:14:55 +00:00
Anton Hansson
ecf9fc3cab Create a filegroup for public stub sources
For use by framework-doc-stubs, to avoid duplicating the list of
modules there.

Bug: 169103987
Test: m framework-doc-stubs ; diff intermediates before & after
Change-Id: Ib1a1d1bb9fcf866278c6ddd057712a9c92716dbf
2022-01-17 10:21:36 +00:00
Anton Hansson
7a173a626f Construct sdk-annotations.zip programmatically
Avoid hardcoding the list of modules in yet another place.

Bug: 169103987
Test: diff zip before & after (identical)
Change-Id: Id3983bf5f4b96b23b1da09fd3617870ac3926ea1
2022-01-12 14:45:22 +00:00
paulhu
f45fe96a54 Split out the nsd API surface and use framework-connectivity-tiramisu
- Split out nsd APIs and hidden APIs to Connectivity module.
- Keep the all files in f/b/packages/Connectivity-T and add
  framework-connectivity-tiramisu library on p/m/Connectivity.
  Then make framework to use this module library.
- Remove NsdService from SystemServer which will register from
  ConnectivityServiceInitializer

Bug: 206893064
Test: m online-sdk-dev-docs
Test: atest FrameworksNetTests CtsNetTestCases
CTS-Coverage-Bug: 207804007
Change-Id: I72c7de124b9cc53f2263bd452ecd5f39e88e485b
2021-12-15 02:10:38 +00:00
Gavin Corkery
bc0064491a Revert "Revert "Add SupplementalProcess stubs and bootclasspath ..."
Revert "Revert "Add framework-supplementalprocess to PRODUCT_APE..."

Revert^2 "Add framework-supplementalprocess prebuilts"

e0c2a4dea0d0e27abad0cd3e4d440ab8f82752e4

Change-Id: I98366465906bb6b78ecf75a9a2319f64feb25beb
2021-11-16 22:33:10 +00:00
Gavin Corkery
bddffaa432 Revert "Add SupplementalProcess stubs and bootclasspath fragment"
Revert "Add framework-supplementalprocess to PRODUCT_APEX_BOOT_JARS"

Revert "Add framework-supplementalprocess prebuilts"

Revert submission 16194363-supplementalprocess-stubs

Reason for revert: PDK build break
Reverted Changes:
Ie1d3605d2:Add SupplementalProcess stubs and bootclasspath fr...
I1ea34faba:Add framework-supplementalprocess to PRODUCT_APEX_...
I8ef2a4c0f:Add jars and fragment to SupplementalProcess apex
Ibf9444f89:Add framework-supplementalprocess prebuilts

Change-Id: Ic569389a4b3a54323c283e9573590686ce27f491
2021-11-15 20:39:32 +00:00
Gavin Corkery
1ed8ac994d Add SupplementalProcess stubs and bootclasspath fragment
Test: Builds
Bug: 204989700
Change-Id: Ie1d3605d2991fa0402db8238ca01e4aa6bad3fdb
2021-11-09 11:11:18 +00:00
Chun Zhang
a615ce518d Add nearby mainline module public/system Api to the collection.
Test: skip test for config change.
Bug: 204780849
Change-Id: I51d550cb9cc2a649b7ac5da2aa01d1cb2c7bbb52
2021-11-05 15:57:39 +00:00
Anton Hansson
c1d6e5b167 Merge "Re-submit "Change the default docs build to use module stubs"" am: eb2333936e am: 643efb7cfb am: d006973d90 am: 4a567b1f0a am: 2ed2a1419d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1869971

Change-Id: Ib517f3aeb92e18923dc991588b1b022bbe4eabd2
2021-10-28 15:35:37 +00:00
Anton Hansson
cff20397e7 Merge "Revert "Change the default docs build to use module stubs"" am: 56e85bb8c0 am: d23ac2655d am: 221a2267c3 am: f3d020454f am: d551b3eb55
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1869970

Change-Id: I00c1f73e560972785b1b549637e9af713aac22e8
2021-10-26 15:29:58 +00:00
Anton Hansson
f24424f3a0 Merge "Change the default docs build to use module stubs" am: 0fbf3439b6 am: 9f6049ee62 am: 88c210a1a3 am: 01106ef16a am: 48c401865b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1864634

Change-Id: Iba51af7bc74b01b24cd4fb3efdf2e4aebade36f5
2021-10-26 14:32:20 +00:00
Anton Hansson
111e15841a Re-submit "Change the default docs build to use module stubs"
This reverts commit 7333a054d93fe75d7553cbb6707149fc8ae43508.

Reason for revert: Wifi fix: Ia82033ed22e9f07d982eb35740350ac1ef11fe49

Change-Id: I6ccb1d3fa6311bb66d78d93a567fddb1bb2d5be1
2021-10-26 14:12:10 +00:00
Anton Hansson
7333a054d9 Revert "Change the default docs build to use module stubs"
This reverts commit 4863931934083f806a6627600d1d91bb6edd42cc.

Reason for revert: broke the build due to missing wifi change

Change-Id: I9610a92c1b19aeb0ddab68d10f2abf2f9ed3a205
2021-10-26 14:09:46 +00:00
Anton Hansson
4863931934 Change the default docs build to use module stubs
The two are almost identical, and the target using sources as input
can be deleted.

The diffs that remain are minor and as far as I can tell OK:
- A few constants are removed from the metadata.zip. It looks to
  me like metalava was previously including @SystemApi constants in the
  public SDK's metadata. This bug is now worked around by only feeding
  metalava the public APIs.
- There are some very minor diffs in the docs of a few APIs.

Bug: 186197911
Test: build sdk before/after and diff
Change-Id: Iac7de64f353bc1467fc4b249e531f034ef702d51
2021-10-20 18:52:21 +01:00
Roshan Pius
de6f1cab65 Add uwb to ApiDocs.bp
Bug: 202973126
Test: Compiles
Change-Id: I04e26ccf7c950cb71ec0bc8f9cbe19aa9e56ab25
2021-10-14 07:43:59 -07:00
Anton Hansson
1bf568ed3e Add build rule to merge annotation zips
This target produces nearly identical contents to the build target
framework-doc-stubs (the only diffs are in whitespace). Using this
module in the SDK zip will allow changing the inputs of
framework-doc-stubs to java sources that don't have all the annotations
(the jar stubs).

Bug: 187397779
Test: m sdk-annotations.zip and diff with framework-doc-stubs zip
Change-Id: Id163473c455f25c5f31c965d907c0c3b0e7755fc
2021-10-13 19:46:31 +01:00
Mohammad Samiul Islam
205229f5e9 Revert "Add build rule to merge annotation zips"
This reverts commit bab3cc34de78f7e737990a5f10a5c8341a26e30c.

Reason for revert: DroidMonitor-triggered revert due to breakage https://android-build.googleplex.com/builds/quarterdeck?branch=git_sc-dev-plus-aosp&target=build_test2&lkgb=7785129&lkbb=7785207&fkbb=7785207, bug b/201757759.

Bug: 201757759
Change-Id: I653b3cf1bbc2c3c11ceb34e578bd9b860057c527
2021-10-01 11:13:50 +00:00
Anton Hansson
bab3cc34de Add build rule to merge annotation zips
This target produces nearly identical contents to the build target
framework-doc-stubs (the only diffs are in whitespace). Using this
module in the SDK zip will allow changing the inputs of
framework-doc-stubs to java sources that don't have all the annotations
(the jar stubs).

Bug: 187397779
Test: m sdk-annotations.zip and diff with framework-doc-stubs zip
Change-Id: Id163473c455f25c5f31c965d907c0c3b0e7755fc
2021-09-30 18:57:31 +01:00
Anton Hansson
fa5d0bc676 Add doc stubs target that uses module stub source
The framework-doc-stubs target currently takes the module source code
as input. Work is being done to change that over to use module sdk
artifacts, primarily the jar stub source code. Check in a
work-in-progress target that does so, to avoid it breaking and to
simplify iterating on improvements.

Bug: 186197911
Test: m framework-doc-stubs{,-module-stubs}
Change-Id: I1a275b3f44632e6655dc84d711a58fc0c5b3a46a
2021-09-17 17:22:03 +01:00
Jeff Sharkey
ce6a9699b6 Merge "Pass metadata as AttributionSourceSource." into sc-dev am: a57ee36d6c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15388734

Change-Id: Iabda6bed8f2392201a0fc87eb31f9d01a3ecac1e
2021-07-27 19:43:33 +00:00
Jeff Sharkey
75d4f93a4e Pass metadata as AttributionSourceSource.
These two PermissionManager methods are using AttributionSource as
metadata only, and aren't interested in the remote caller enforcing
that the claimed UID matches the caller, since they're not actually
being used for permission enforcement.

Thus we pass the metadata using the AttributionSourceState holder
object and reconstruct on the remote side, entirely avoiding the
enforceCallingUid() check.

Bug: 193842956
Test: atest CtsPermission5TestCases
Change-Id: I576b6feb8cc2b0586b4341268866d8027689293f
2021-07-27 09:45:54 -06:00