Commit Graph

290 Commits

Author SHA1 Message Date
Neil Fuller
3701764e81 Merge "Make ext.jar only dependent on public SDK APIs" am: c457d8c95a
am: 1f30b816d8

Change-Id: I01daf30a865d16e29de80e39f61752b6931681ae
2018-09-26 06:30:38 -07:00
Neil Fuller
c457d8c95a Merge "Make ext.jar only dependent on public SDK APIs" 2018-09-26 08:12:46 +00:00
Hall Liu
210a4862f6 Merge "Add the EMBMS group call API" am: 52a8fdb7bd
am: 6c6c859c6a

Change-Id: I7e98519115c67eaa49694a3514b80fc54afcc17b
2018-09-25 14:47:25 -07:00
Hall Liu
52a8fdb7bd Merge "Add the EMBMS group call API" 2018-09-25 20:38:23 +00:00
Neil Fuller
8c1e3a8eb4 Make ext.jar only dependent on public SDK APIs
ext.jar can be built using only public SDK APIs. This
makes that obvious.

Bug: 113148576
Test: make ext
Change-Id: I792b14924878623f832f3afbb1d3e23fba34d5bf
2018-09-25 13:09:41 +01:00
Nan Zhang
2abeaddf26 Merge "Add comments for offline-sdk-referenceonly docs" am: 2be3da34e7
am: a9fec7e73b

Change-Id: Iaffef1c043350533a81d44e99b63565c0c51e7a2
2018-09-24 21:43:56 -07:00
Hall Liu
a7b0c1f054 Add the EMBMS group call API
Add APIs for apps to access a LTE broadcast group call service provided
by a preinstalled middleware app, and add system APIs for the
preinstalled middleware app to communicate with frontend apps.

Bug: 112731375
Test: CTS
Change-Id: Ie6817cbc6c3b69de7a4d66c4cfc103b02e15ad6b
2018-09-24 17:26:25 -07:00
Nan Zhang
963612bd72 Add comments for offline-sdk-referenceonly docs
Add comment to provide some cautions in case of we make some changes on
the doc target names in the future.

Test: N/A
Bug: b/116221385
Change-Id: Ibb21ca51c1eed990fe5dfceb6a8170821e70f8cf
2018-09-24 12:11:23 -07:00
Nan Zhang
7cba8a7fe4 Merge "Enable api-versions.xml generation for api-stubs" 2018-09-19 14:34:04 +00:00
Nan Zhang
aab7836c24 Merge "Enable jdiff for api-stubs-docs" am: 61d0ec49ef
am: f886bc1a94

Change-Id: I43ef41ee14d0ba434a5783f9b3daf944f30bd542
2018-09-18 22:33:50 -07:00
Nan Zhang
f886bc1a94 Merge "Enable jdiff for api-stubs-docs"
am: 61d0ec49ef

Change-Id: I0eae62d725ddefa6ef719b8d34eb1ca9eb8a7b41
2018-09-18 22:15:43 -07:00
Treehugger Robot
61d0ec49ef Merge "Enable jdiff for api-stubs-docs" 2018-09-19 03:02:19 +00:00
Nan Zhang
4079654c0a Enable api-versions.xml generation for api-stubs
Test: m -j
out/target/common/obj/PACKAGING/api-stubs-docs_generated-api-versions.xml
Bug: b/78245848

Change-Id: I2800f49e264473f5ec78e074cfd844c72342522f
Merged-In: I2800f49e264473f5ec78e074cfd844c72342522f
2018-09-19 01:56:48 +00:00
Nan Zhang
4127448aa7 Merge "Enable api-versions.xml generation for api-stubs" into stage-aosp-master
am: f46a3a3acc

Change-Id: Ic144a897c4d6b96945cd8a4e878f5b2fed2afa4f
2018-09-18 18:00:46 -07:00
TreeHugger Robot
f46a3a3acc Merge "Enable api-versions.xml generation for api-stubs" into stage-aosp-master 2018-09-19 00:44:11 +00:00
Nan Zhang
91cc76631e Enable api-versions.xml generation for api-stubs
Test: m -j
out/target/common/obj/PACKAGING/api-stubs-docs_generated-api-versions.xml
Bug: b/78245848

Change-Id: I2800f49e264473f5ec78e074cfd844c72342522f
2018-09-18 12:45:02 -07:00
Pete Gillin
59fa25a5f5 Merge "Rename the ojluni-annotated-stubs target." am: 542d032f03
am: cddbd39be7

Change-Id: I2c512a54b8bb3a0824ea1c279ca67e52a23f4a18
2018-09-18 11:01:52 -07:00
Nan Zhang
81f29f5cd6 Enable jdiff for api-stubs-docs
And also clean legacy MK code in Android.mk

Test: api-stubs-docs-diff
Bug: b/78245848
Change-Id: I733e0e2c29f8273db3ffb9730c70d5b4e2b1438d
2018-09-17 15:29:11 -07:00
Pete Gillin
ff97819d8b Rename the ojluni-annotated-stubs target.
All of the annotations under this are intended for use in the SDK. In
order to make this clear (because other types of annotations are
planned), this change renames the target to
ojluni-annotated-sdk-stubs.

Bug: 115746226
Test: `make api-stubs-docs`
Change-Id: I11366b6293b681cb4c8118fc117601a671c33282
2018-09-17 16:35:59 +01:00
Nan Zhang
cebca6f778 Merge "Migrate all offline/online sdk docs generation to use Metalava" am: 741521940a
am: 8a1bb5f429

Change-Id: Id20e302216639fb78a860673abf244229358a7f5
2018-09-13 17:33:17 -07:00
Nan Zhang
7764a4b84f Migrate all offline/online sdk docs generation to use Metalava
These targets all depend on libcore sources which are blocker for us to
enable java9 feature, so convert them to Metalava.

Also enable API level annotations for api-stubs-docs, offline-sdk-docs,
and online-sdk-docs.

Test: m -j docs
Bug: b/78245848
Change-Id: I354d699a79cc5e6580b50e0613e7602c77b9c0b5
2018-09-12 16:31:49 -07:00
Nan Zhang
520267b93f Merge "For metalava target, use droidstubs instead of droiddoc" am: 5eb84c0065
am: b910944852

Change-Id: I41e110dee813021552fee125ddbcbdbaba2d6703
2018-09-12 15:08:04 -07:00
Nan Zhang
894c9ec583 For metalava target, use droidstubs instead of droiddoc
droidstubs is used to generate stubs files only.

Test: m -j api-stubs-docs
Bug: b/8d0763849
Change-Id: Ia7c3d19ed2ec7b0f5b96008e5780dbcd5a32402b
2018-09-11 15:41:50 -07:00
Treehugger Robot
f4fc71f370 Merge "Build android.test.* with java_sdk_library" 2018-09-07 01:01:59 +00:00
Mathew Inwood
d20588332d Merge "Processor for @UnsupportedAppUsage annotations." am: e5440456ca
am: 22ea0b7a52

Change-Id: I0fd41ccc78872eae55e8341a8a38d6c6b39e0114
2018-09-05 09:43:35 -07:00
Mathew Inwood
bad89e5e5b Processor for @UnsupportedAppUsage annotations.
The processor outputs unsupportedappusage_index.csv, containing source
position info for every@UnsupportedAppUsage annotation processed. It is a
mapping of dex signature to the source postion of the annotation on that
signature. It is used as input for scripts which update the annotations.

We include a META-INF file which causes the compiler to automatically
pick up the annotation processor. Otherwise we would need to explicitly
specify the processor with a -processor flag to javac.

We create a new build target for just the @UnsupportedAppUsage annotation
and the @IntDef annotation (which it depends on) so that the processor can
also depend on that directly.

The processor only runs on a new build target framework-annotation-proc
so that it is not invoked as part of a regular build. This is done so
that we don't slow down peoples builds: Soong does not support annotation
processors when javac sharding is in use. This workaround can be removed
once b/77284273 is fixed.

Test: m framework-annotation-proc
Bug: 113853502

Change-Id: Ie9cd5a90ddf7a51f6035e849703fc39ad9127557
2018-09-05 15:01:21 +01:00
TreeHugger Robot
0df9368b0f Merge "Build android.test.* with java_sdk_library" into pi-dev-plus-aosp 2018-09-03 01:06:33 +00:00
sqian
1b4f1de0a7 Merge "Call Redirection Surface in Telecom out going call flow" am: 11486bfab2
am: 54016bdbca

Change-Id: I30adaf5566a55aa867f859b42a49bbbfb0b8d651
2018-08-31 18:04:17 -07:00
sqian
cae1f264b9 Call Redirection Surface in Telecom out going call flow
- Provide a Call Redirection API Surface
- Provide a key "KEY_CALL_REDIRECTION_SERVICE_COMPONENT_NAME_STRING"
  in the CarrierConfigManager
- Create .aidl interfaces for Call Redirection
(CallRedirectionService.aidl, CallRedirectionAdapter.aidl)

Bug: 64959558
Test: Compile
Change-Id: Ic119fa445e66f1275eabf944c77fdc981bc9a2a7
Merged-In: Ic119fa445e66f1275eabf944c77fdc981bc9a2a7
(cherry picked from commit ea8970cd55)
2018-08-31 12:59:40 -07:00
Nan Zhang
af2513048e [Vendor] Add filegrouop for NonNull.java
This is needed by google.camera.experimental docs.

Test: m -j docs
Bug: b/70351683

Change-Id: I79b3f0946a1d606cda770eabe7c287f4cc207bfc
2018-08-30 14:53:06 -07:00
Sundong Ahn
63a6a00f44 Build android.test.* with java_sdk_library
android.test.* are built with java_sdk_library and api files are added
by running "make update-api".

android.test.base_static is created for allowing to use
android.test.base as a static library.

Bug:77577799
Test: make -j
Test: make checkapi
Test: make checkapi fails with a random change in the txt file
Test: adb shell cmd package list libraries |\
      grep android.test.*
      And check the android.test.* libraries

Merged-In: Ia27612657532e50b077a9c55dbef59ee3ec04b8a
Change-Id: Ia27612657532e50b077a9c55dbef59ee3ec04b8a
(cherry picked from commit f24779c8c7)
2018-08-29 16:22:00 +09:00
Sundong Ahn
e933cedf83 Build android.test.* with java_sdk_library
android.test.* are built with java_sdk_library and api files are added
by running "make update-api".

android.test.base_static is created for allowing to use
android.test.base as a static library.

Bug:77577799
Test: make -j
Test: make checkapi
Test: make checkapi fails with a random change in the txt file
Test: adb shell cmd package list libraries |\
      grep android.test.*
      And check the android.test.* libraries

Merged-In: Ia27612657532e50b077a9c55dbef59ee3ec04b8a
Change-Id: Ia27612657532e50b077a9c55dbef59ee3ec04b8a
2018-08-29 12:22:59 +09:00
Nan Zhang
a17beeb779 [java9] Convert hiddenapi-list target to Metalava
This blocks how we try java9 for droiddoc since "hiddenapi-lists-docs"
targets depends on libcore sources. So migrate this target to Metalava.

Test: m -j hiddenapi-lists-docs
Bug: b/78245848
Change-Id: Iae47d351d974e33490c3a1e9bb9f0f5d15eedfaf
Merged-In: Iae47d351d974e33490c3a1e9bb9f0f5d15eedfaf
2018-08-23 15:35:33 -07:00
Treehugger Robot
c9b01b87b1 Merge "Add compatibility check for (system|test_)api-stubs-docs" 2018-08-23 07:33:31 +00:00
Jack Yu
63de9eabec Merge "Added qualified networks services" 2018-08-22 20:18:11 +00:00
Jack Yu
a3ab5750a4 Added qualified networks services
Added the qualified networks service, which is a base
class for vendor's qualified network service to extend.
The service is to update frameworks the available
networks for data setup for each APN type.

Test: Manual
Bug: 73659459
Change-Id: I7238aeac8e48be2a17245de77239b242703bcb7e
2018-08-21 17:57:57 -07:00
Nan Zhang
cd060d9808 Add compatibility check for (system|test_)api-stubs-docs
Test: m -j api-stubs-docs
Bug: b/78245848
Change-Id: Ia4a337ac464232ac8a5bd054b940a7d7f1f4e213
2018-08-21 10:39:42 -07:00
Pete Gillin
8ab61fb0dd Merge "Stop reading the generated ojluni sources in droiddoc." 2018-08-21 15:14:55 +00:00
Colin Cross
432141676a Convert platformprotosnano and platformprotoslite to Android.bp
See build/soong/README.md for more information.

Test: m checkbuild
Change-Id: Icfb0001df2e35b5ed799511ff4f2f563d626134b
2018-08-20 13:57:24 -07:00
Pete Gillin
d41686cea5 Stop reading the generated ojluni sources in droiddoc.
These sources contain the result of applying the annotations from
ojluni.jaif to the ojluni sources. Now that ojluni.jaif is empty, this
is a noop, so this change switches back to reading the original
sources.

Bug: 111639530
Test: `make docs` is not affected
Change-Id: Idb98aa4f054a11bfcbcb8a84dd6f357a0a025c49
2018-08-20 17:33:46 +01:00
Nan Zhang
e561260e59 Add update-api for Metalava based api-stubs-docs
Use check_api section to put the target files which need to be updated.
But check_api doesn't do actually checking work.

Bug: b/112668343
Test: m -j api-stubs-docs-update-current-api
Change-Id: I0f28e6e480413e0ac5cdff51bc4b2df478a867f6
2018-08-17 13:32:14 -07:00
Nan Zhang
dc72ad5218 Merge "Remove api-stubs-docs targets." 2018-08-17 16:53:11 +00:00
Nan Zhang
1c8219bcdd Use 28.txt as API file for migrating NULLs in Metalava
Use last released API file for annotations reference in master branch
(non-releasing branch).

Test: manual
Bug: b/78245848
Change-Id: I0520231619001032c00d98fdc8cd86aa41f4fa14
2018-08-16 17:10:22 -07:00
Nan Zhang
c28a0ac77c Remove api-stubs-docs targets.
Since api-stubs-docs will be replaced by Metalava.

Test: m -j checkbuild
Bug: b/70351683 b/78245848
Change-Id: I3d2091afb0b5d93250573076d4dc95b47c634f2d
Merged-In: I3d2091afb0b5d93250573076d4dc95b47c634f2d
2018-08-14 13:46:01 -07:00
Nirav Atre
9850dd9751 Implementing support for HIDL native handles in Java
This change implements the equivalent of the C++ native_handle_t type in
Java. Similar to the C++ type, the NativeHandle class wraps an arraylist
of FileDescriptor objects, along with a raw data stream (integer array).

Bug: 35098567
Test: Ran m, hidl_test (C++ and Java). Functionality tests are included
in a separate CL.

Change-Id: Ic53f9a49ae17ce5708577a586230126ab0e222c7
2018-08-13 14:31:17 -07:00
Treehugger Robot
c12090200d Merge "Add libcore/ojluni/annotations as a source for metalava." 2018-08-13 12:22:29 +00:00
Alex Light
159799d7c9 Work around b/70221552
If one sets a sufficiently long OUT_DIR to build into the
//frameworks/base:framework-javastream-protos generate target will
fail due to trying to run a too-long command. This works around that
problem by making the command being run much smaller.

Test: Build
Bug: 70221552
Change-Id: I0134ccfc83469826d3ea8679e1c52b9b52c6d2e0
2018-08-08 09:52:51 -07:00
Pete Gillin
c8cbb36673 Add libcore/ojluni/annotations as a source for metalava.
This adds the new annotations (in Java stub format) to the list that
metalava will merge when building stubs.

Bug: 111639530
Test: `make metalava-api-stubs-docs`
Change-Id: I5e73d1276f0602bd14a41f7a64659b1a7b1347cf
2018-08-07 16:49:08 +01:00
Nan Zhang
7e1e76a6dc Merge changes from topic "offlinesdk-docs"
am: 003f49cf0c

Change-Id: Ie2869c671faab24bfc4f426261e4d079d0f3b5de
2018-08-06 18:54:35 -07:00
Nan Zhang
d9cb1b429a Merge "Depend on a module instead of real dir for metalava_merge_annotations_dirs"
am: f8e12c51d4

Change-Id: Ice53109de35716bbdee921d595f015f16f559b3f
2018-08-06 18:30:35 -07:00