1823 Commits

Author SHA1 Message Date
Nan Zhang
54963cba91 Remove Make side (system/test-)api-stubs droiddoc targets
Remove old droiddoc targets for api-stubs, system-api-stubs, and test-api-stubs.

And also set api_tag_name, api_filename, private_api_filename, and etc.
properties in Android.bp for new droiddoc.
Test: manually compare if dependencies change after Soong based droiddoc runs.
Bug: b/70351683

Change-Id: I8d944c83de120ec8148276adc1c9872113d9d29b
Merged-In: I8d944c83de120ec8148276adc1c9872113d9d29b
2018-03-20 11:43:51 -07:00
Tobias Thierer
97bb6cf371 Remove com.android.internal{.util} from generated documentation.
com.android.internal.* is meant to be hidden from documentation,
but most of it is erroneously not hidden via @hide or -hidePackage
directives; why documentation is currently generated for Predicate
but not other classes from com.android.internal.util, and why some
but not all classes from that package show up in package-level
documentation (package-summary.html), is not currently understood.

There appears to be a behavior difference between OpenJDK 8 and
OpenJDK 9's javadoc that results in additional classes showing up
in package-summary.html. This CL fixes this by adding -hidePackage
directives for com.android.internal{.util}; other sub-packages of
com.android.internal do not currently show up in documentation and
are not touched by this CL.

Test: Patched this CL into the internal-master branch and ran:
      USE_R8=true EXPERIMENTAL_USE_OPENJDK9=true make offline-sdk-docs
      Checked that this removes all documentation for com.*
      (com.android.internal.util was the only com.* package for which
      documentation was previously generated).
      In other words: Before this CL, [1] existed, but after
      this CL, the entire directory subtree [2] does not exist.
Test: Checked that Predicate was already missing from stubs before this
      CL. In other words, [3] already did not exist before this CL.

[1] out/target/common/docs/offline-sdk/reference/com/android/internal/util/Predicate.html
[2] out/target/common/docs/offline-sdk/reference/com
[3] out/target/common/obj/JAVA_LIBRARIES/android_system_stubs_current_intermediates/classes/com

Bug: 69736344
Bug: 69736236

Change-Id: I3243e2820348c338a54e42c72d29bed71389a6c4
2018-03-06 12:05:28 +00:00
Neil Fuller
76ac7e6319 Remove icu4j dependency.
This dependency is no longer required: it was added
for libcore when libcore was implemented in terms of
com.icu classes. libcore has since moved to android.icu
(in core-libart) and so the droiddoc dependency is no
longer required.

Test: make droid docs
Merged-In: I6e4e79a7df201fdc2cefa60037adf831593eaa0f
Change-Id: I6e4e79a7df201fdc2cefa60037adf831593eaa0f
2018-02-26 21:22:38 +00:00
Andreas Gampe
7b9b5d7544 Framework: Disable [MissingOverride] for platformprotos
Bug: 72714520
Test: m javac-check-platformprotos RUN_ERROR_PRONE=true
Merged-In: I00f5a588fa74621d4c35dc4e39b54536815ad476
Change-Id: I00f5a588fa74621d4c35dc4e39b54536815ad476
2018-02-16 01:34:21 +00:00
Colin Cross
fdbe7d1ca9 Don't put android.os.Parcelable in framework.aidl
Parcelable shouldn't be in the list of parcelables in framework.aidl.
Remove it to fix warning when running aidl:
framework.aidl:287 attempt to redefine built in class android.os.Parcelable

Also make the dependency on sdk_parcelables not be order-only so
framework.aidl gets rebuilt when sdk_parcelables changes.

Bug: 73135791
Test: ParcelableDetectorTest
Test: out/target/common/obj/framework.aidl does not contain android.os.Parcelable
Change-Id: If5222879be9ec1e5fa08810adc624ec526ddc0ec
2018-02-09 11:29:15 -08:00
David Brazdil
f16ac00fe8 Copy hidden API blacklist/dark greylist into build folder
This change is meant for ART buildbots which build against a pinned
commit of the framework and thus do not have the commit which
introduced hidden API lists. Normal builds will now copy the blacklist
and dark greylist into the build folder first, and then generate the
light greylist as usual. If a buildbot does not have the framework
changes, it can create dummy API lists in the build folder before
starting the build and avoid the issue.

Test: make
Bug: 64382372
Change-Id: Ib6e53a45bcc917abb4ba67fdcbf01d4a19c2d56f
2018-01-26 11:49:54 +00:00
David Brazdil
0649c8d5b3 Create hidden API lists
Android is beginning to put restrictions on the usage of private APIs.
In order to facilitate a transitionary period, some APIs will remain
accessible but issue a warning (greylist), other will see restrictions
right away (blacklist).

This patch create two new text files which will be used to store manual
lists of dex signatures of hidden APIs. These are the blacklist and
dark greylist. They should be mutually exclusive and both be subsets of
INTERNAL_PLATFORM_PRIVATE_DEX_API_FILE. The last list, light greylist,
is generated as INTERNAL_PLATFORM_PRIVATE_DEX_API_FILE minus the two
manual lists.

Bug: 64382372
Test: m
Change-Id: Ia694ef79bece819c87db853ccaea5e95f38d3e84
2018-01-24 20:48:37 +00:00
David Brazdil
a793f3ff52 Generate new API signatures from doclava
Doclava now generates API signatures of classes and their members
which are not part of the public SDK. Adjust the arguments passed
to Doclava to enable that feature.

Bug: 64382372
Test: m
Change-Id: I47de683dd2b00fce73b82581a13fbe1013ef625f
2018-01-18 10:40:11 +00:00
Holly Jiuyu Sun
bbc858006f Add APIs to EuiccCardManager.
The CL contains parts of the EuiccCard APIs. getEid() is sync. All the
other APIs are async.
Move ResetOptions from EuiccCard to EuiccCardManager.
The other APIs will be added in a follow-up CL.

Bug: 38206971
Test: test on phone
Change-Id: Iba098ee779b8ea4e244e0e4cf7318139666cc94b
2018-01-17 16:38:42 -08:00
Paul Duffin
2141827700 Move legacy-test to test-base
Make it consistent with the test-mock and test-runner directories.
Also renames the files in api/ subdirectory.

(cherry picked from commit f779efd62cd579f67bd3b387d59fda11ee0cbe90)

Bug: 30188076
Test: make checkbuild
Change-Id: Ied3621e6201d8717223fe1ccd4ea77d458126b25
Merged-In: If4f99a65fcca416ede5b3e63481398f0b451bcb7
2018-01-12 15:52:39 +00:00
yuemingw
9361a1394c Add public ApnSetting in android.telephony.
Bug: 68208293
Test: manual

Add public ApnSetting class in android.telephony. Move APN TYPE constants out from
PhoneConstants into public ApnTypeConstants.

Design doc: https://docs.google.com/document/d/1UEYjhRGSEwwccPLs_FzFD-IeOsVq63gxmAHNtDfnzAY/edit?pli=1#

Change-Id: I74d23644a872df0abc19730285ae196b6e3e39dd
2018-01-10 03:17:05 +00:00
Colin Cross
c9f25c4ee5 Remove obsolete aidl list
Remove the obsolete aidl list, framework.aidl is now generated
from the stubs jars.

Bug: 70046217
Test: m checkbuild
Change-Id: I2417f0a8f193bd4db4058f6f0bb05c147e18de25
Merged-In: I2417f0a8f193bd4db4058f6f0bb05c147e18de25
(cherry picked from commit fac48f998e763060dfdfb6e76927ec85aa63e1eb)
2018-01-05 17:40:27 -08:00
Colin Cross
153fb1c6e0 Merge changes I9de0ffe9,Idc804896
* changes:
  Use sdkparcelables to generate framework.aidl
  Initial sdkparcelables
2018-01-04 00:48:50 +00:00
Jack Yu
23192ff57f Added AIDL for cell identity
Added AIDL for CellIdentityCdma, CellIdentityGsm, CellIdentityLte
and CellIdentityWcdma. This is the preliminary change for IWLAN
refactoring as network registration state will be moving into
system API.

Test: Build
bug: 64132030
Merged-In: I6763d4b6e51cf354b01ee5bfb5d37114394f3063
Change-Id: I6763d4b6e51cf354b01ee5bfb5d37114394f3063
(cherry picked from commit 31db18a4c078b77f011170a27eb95c94398efde6)
2017-12-27 23:29:49 -08:00
Colin Cross
77ebd08d17 Use sdkparcelables to generate framework.aidl
Use sdkparcelables to extract public parcelables from the
public, test, and system stubs jars, and combine them into
framework.aidl.

Bug: 70046217
Test: m checkbuild
Change-Id: I9de0ffe9dffbd80c8cb785b0624959c52c3200a1
2017-12-16 20:43:50 -08:00
Colin Cross
d330eeeeda Merge "Separate android.test.mock from test-runner source" 2017-12-12 23:25:48 +00:00
Paul Duffin
69516f4df7 Separate android.test.mock from test-runner source
Extracts the source for the android.test.mock library from the
frameworks/base/test-runner directory into its own
frameworks/base/test-mock directory. They are already treated separately
at runtime and compile time so this just makes the separation complete.

Bug: 30188076
Test: make checkbuild
Change-Id: I20e5b06ba79677e76117c82e9f9e2ecd15e5fed6
Merged-In: I20e5b06ba79677e76117c82e9f9e2ecd15e5fed6
(cherry picked from commit e254526f0fe5d22681555bd4a00b7ee96fee1dc1)
2017-12-12 23:23:31 +00:00
Jack Yu
b592e29f28 Moved data connection response into system api.
This is a preliminary step for IWLAN refactoring, where data response
will be one of the parameter in data service callback.

Test: Telephony sanity tests
bug: 64132030
Merged-In: I7eb5318cd75ca3b7a29d5bf0da18d6b29a228ee1
Change-Id: I7eb5318cd75ca3b7a29d5bf0da18d6b29a228ee1
(cherry picked from commit e44609b15866d080e0f8813b99d04b51a6f32929)
2017-12-08 13:28:07 -08:00
Jeff Sharkey
2337aec921 Deeper sanity checking of emitted types.
When emitting a method or field, verify that we're able to reference
all mentioned types.  This ensures that we don't accidentally
reference undefined classes/interfaces.

Test: manual inspection of API files
Bug: 69791141
Change-Id: I84e0c87fe83daa118661f61dbdf17b58ea5282d4
Merged-In: I84e0c87fe83daa118661f61dbdf17b58ea5282d4
2017-12-07 00:22:25 -07:00
Jeff Sharkey
bc4f48b21d Emit all APIs using Predicates.
Generate APIs using updated doclava.

Test: manual inspection of API text files
Bug: 69505783
Change-Id: I2efd22998a64ebb57588b073c4a591242f4aef91
Merged-In: I2efd22998a64ebb57588b073c4a591242f4aef91
2017-12-06 21:56:12 -07:00
Colin Cross
b42cfb691d Merge "Fix droiddoc when OUT_DIR is an absolute path"
am: 85f095e246

Change-Id: I5a91ba906958777944fc25fb5de281e4c8beebe7
2017-12-05 01:29:12 +00:00
Colin Cross
0c7609553d Fix droiddoc when OUT_DIR is an absolute path
The droiddoc rules were passing the sources in through
LOCAL_SRC_FILES, which gets prefixed with $(LOCAL_PATH).  They
were prefixing ../.. to try to counter frameworks/base in
$(LOCAL_PATH), but that doesn't work for absolute paths to
generated files in an absolute $(OUT_DIR).

Use $(LOCAL_GENERATED_SOURCES) for anything that is in $(OUT_DIR)
instead, which takes paths that are relative to the top of the tree
or absolute.

Bug: 70166718
Test: m OUT_DIR=/tmp/out docs
Change-Id: I93b743607c2b8ce05512ecd4bbe860747cb48428
Merged-In: I93b743607c2b8ce05512ecd4bbe860747cb48428
(cherry-picked from commit bd200ce7d4ebe31ad4327683e59af269420b0ef5)
2017-12-05 01:07:53 +00:00
Colin Cross
943e2aa7ef Convert framework.jar to Android.bp
Use Soong to build framework-res.apk and framework.jar.
See build/soong/README.md for more information.

Bug: 69917341
Test: m checkbuild tests docs
Test: manually compare framework.jar and framework-res.apk
Test: manually compare out/target/common/docs
Change-Id: Ibdfe1cbf34d97c43f4857c2c5d7604fa72d5b5a4
Merged-In: Ibdfe1cbf34d97c43f4857c2c5d7604fa72d5b5a4
(cherry picked from commit cf3a0b5355c6138538f9f3d4b369a875814bc01c)
2017-12-03 20:23:43 -08:00
Colin Cross
5f4dcf6702 Convert framework.jar to Android.bp
Use Soong to build framework-res.apk and framework.jar.
See build/soong/README.md for more information.

Bug: 69917341
Test: m checkbuild tests docs
Test: manually compare framework.jar and framework-res.apk
Test: manually compare out/target/common/docs
Change-Id: Ibdfe1cbf34d97c43f4857c2c5d7604fa72d5b5a4
Merged-In: Ibdfe1cbf34d97c43f4857c2c5d7604fa72d5b5a4
(cherry picked from commit cf3a0b5355c6138538f9f3d4b369a875814bc01c)
2017-12-03 17:50:34 +00:00
Mohamed
208f232825 Merge "Add SMS over IMS APIs"
am: 74445ed311

Change-Id: I5b08b82f39968adc111d0b3361b4312eb7244913
2017-11-30 16:05:36 +00:00
Treehugger Robot
74445ed311 Merge "Add SMS over IMS APIs" 2017-11-30 15:56:30 +00:00
Mohamed
037749df03 Add SMS over IMS APIs
- Adds public APIs that IMS providers will implement/use
- Adds aidl APIs for internal communications to support SMS over IMS.
- First pass at documentation of APIs.

Moving over from  ag/3265442

Bug: 69846044

Test: None
Change-Id: Ic665a2a7d64a56417bcf2a159d6b88b05cdb832a
2017-11-29 16:14:57 -08:00
Jack Yu
3221d23138 Merge "Moved DataProfile from telephony internal hidden API to System API"
am: 24cd7cbd1e

Change-Id: Ica76a82b03f6bb0623a98480ae1c2fbc34d07337
2017-11-28 17:39:01 +00:00
Jack Yu
1d1022e445 Moved DataProfile from telephony internal hidden API to System API
This is the preliminary change in order to make the new data call
setup API for IWLAN refactoring.

Test: Telephony sanity tests + unit tests
bug: 64132030

Merged-In: Ib96dc3dd577def0a428e2f5cdb5fb7f742120020
Change-Id: Ib96dc3dd577def0a428e2f5cdb5fb7f742120020
(cherry picked from commit fc84bb5f5c6e30db0eca589eb67b406bf4bfadbe)
2017-11-27 14:36:15 -08:00
Brad Ebinger
e575ad10ca Merge "Refactor ImsService to AIDL"
am: 8a02c63f16

Change-Id: I195d7ccff8498241b6c7be819d2ee96b661d51e1
2017-11-22 19:23:16 +00:00
Brad Ebinger
216b3ce485 Refactor ImsService to AIDL
The ImsService was originally designed as a flat
interface, all ImsFeatures would be forwarded
through ImsService. This has been refactored to
using AIDL interfaces for each feature, as it
is more straightforward.

Test: Manual, Telephony IMS Unit Tests
Change-Id: Ibe065ddec6f180eabda03cf06f842c642a11114f
2017-11-16 21:28:36 +00:00
Xin Li
220871a697 Merge commit '98e12851336b7db16e583f9afac63ecc97465980' from
oc-mr1-dev-plus-aosp-without-vendor into stage-aosp-master.

Change-Id: Ia7b8da4a00d215160e4a4fa40f6044208d1297b7
Merged-In: I19846d2a3ee27aecbae2367a74ee49082eea154d
2017-11-14 12:31:11 -08:00
Jakub Pawlowski
422af4d049 Add IBluetoothSocketManager (3/3)
Add IBluetoothSocketManager native Binder implementation. Thanks to it
we'll skip jni to native calls, and need to re-serialize data manually.

Bug: 68359837
Test: none
Change-Id: I6c99717aa18ab41addf96b7536e483ae12802601
2017-11-09 19:39:51 +00:00
Alan Viverette
2d362a5831 Federate platform docs against support library API file
Bug: 36959367
Test: make docs
Change-Id: I7c6dffed25566c2bb1183aba60103c437888ba21
2017-10-31 09:25:06 -07:00
Colin Cross
72d359f227 Put libcore generated source files into LOCAL_INTERMEDIATES_SOURCES
LOCAL_SRC_FILES is expected to be a list of files relative to the
Android.mk files.  If OUT_DIR is absolute then adding generated
files to the list produces bad paths when $(LOCAL_PATH)/ is prepended
to it.  Put libcore's generated sources into
LOCAL_INTERMEDIATE_SOURCES instead.

Bug: 64930165
Bug: 68375156
Test: m checkbuild
Change-Id: I4b36fd192570ea0cd52d8537a16c078c726d97fd
2017-10-27 12:58:45 -07:00
Hansong Zhang
c8a370aeba Merge "Change Bluetooth HID Profile Name (1/6)"
am: 8218b219f3

Change-Id: Ic085deaa070b4008b34d03b507f81a5df220764a
2017-10-23 22:33:50 +00:00
Hansong Zhang
0edf754b2d Change Bluetooth HID Profile Name (1/6)
Make the Bluetooth HID profile name consistent with the Bluetooth HID service
name.

BluetoothInputHost → BluetoothHidDevice
BluetoothInputDevice → BluetoothHidHost
IBluetoothInputHost → IBluetoothHidDevice
IBluetoothInputDevice → IBluetoothHidHost
BluetoothProfile.INPUT_HOST → BluetoothProfile.HID_DEVICE
BluetoothProfile.INPUT_DEVICE → BluetoothProfile.HID_HOST

(Cherry-picked from commit c26c76c63d933f8057f795d05624f91b811c8c71)
Merged-In: Iadb890a54dd3d6868b87514472bbac6bb0c6179f
Bug: 68055651
Test: make
Change-Id: Iadb890a54dd3d6868b87514472bbac6bb0c6179f
2017-10-23 22:21:00 +00:00
Nan Zhang
b06e03c134 Merge "Shard framework during Java compilation for target side."
am: 6a90c3f793

Change-Id: I1a24f704d3537bde1e4aaef5bd4edf4cc898bb04
2017-10-20 00:17:23 +00:00
Treehugger Robot
6a90c3f793 Merge "Shard framework during Java compilation for target side." 2017-10-19 23:46:18 +00:00
Colin Cross
3f6bef874e Merge "Convert ext.jar to Android.bp" am: 42156f3e56 am: 8feea076a2
am: faededa6af

Change-Id: I9e640ea1f6175306c74075e25485bce622d6ca52
2017-10-15 02:43:13 +00:00
Colin Cross
8feea076a2 Merge "Convert ext.jar to Android.bp"
am: 42156f3e56

Change-Id: I44443e9095c8b527ebb42d11a6f5369fdf3e5d05
2017-10-15 02:06:20 +00:00
Colin Cross
42156f3e56 Merge "Convert ext.jar to Android.bp" 2017-10-13 01:08:01 +00:00
Andrew Solovay
761427c75b Merge "docs: Adding API level 27 (Oreo MR1) to the docs build options" into oc-mr1-dev
am: 64b23cca4d

Change-Id: I4d71688ec991555d400e5ce86baad61270bba9b9
2017-10-10 01:35:20 +00:00
Nan Zhang
f7141d5a87 Shard framework during Java compilation for target side.
Performance Compare:
<Unsharded Build------------------------------------------------>
1. Build from clean state
rm -r -f out/target/common/obj/JAVA_LIBRARIES/framework_intermediates/
&& time m
out/target/common/obj/JAVA_LIBRARIES/framework_intermediates/classes-full-debug.jar

real	1m2.720s user	5m26.604s sys	0m39.552s

2. Incremental build
m
out/target/common/obj/JAVA_LIBRARIES/framework_intermediates/classes-full-debug.jar
&&
touch frameworks/base/core/java/android/net/http/HttpResponseCache.java
&& time m
out/target/common/obj/JAVA_LIBRARIES/framework_intermediates/classes-full-debug.jar

real	0m37.586s user	5m47.804s sys	0m50.388s

<Sharded Build-------------------------------------------------->
1. Build from clean state
rm -r -f out/target/common/obj/JAVA_LIBRARIES/framework_intermediates/
&& time m
out/target/common/obj/JAVA_LIBRARIES/framework_intermediates/classes-full-debug.jar

Javac Shard Size: 50----real	1m10.163s user	25m59.008s sys 1m58.460s
Javac Shard Size: 100---real	1m2.115s user	21m3.600s sys 1m15.964s
Javac Shard Size: 150---real	0m59.520s user	18m10.544s sys 1m12.628s
Javac Shard Size: 200---real	0m56.894s user	15m39.244s sys 1m11.608s
Javac Shard Size: 250---real	0m55.991s user	14m38.716s sys	1m2.292s
Javac Shard Size: 300---real	0m55.114s user	13m6.568s sys	1m8.200s
Javac Shard Size: 350---real	0m53.144s user	12m7.740s sys	1m3.836s
Javac Shard Size: 400---real	0m54.929s user	12m9.324s sys	1m4.340s
Javac Shard Size: 450---real	1m30.194s user	25m31.468s sys 1m52.416s
Javac Shard Size: 500---real	0m53.976s user	10m35.500s sys 0m55.160s

2. Incremental build
m
out/target/common/obj/JAVA_LIBRARIES/framework_intermediates/classes-full-debug.jar
&&
touch frameworks/base/core/java/android/net/http/HttpResponseCache.java
&& time m
out/target/common/obj/JAVA_LIBRARIES/framework_intermediates/classes-full-debug.jar

Javac Shard Size: 50-----real	0m16.322s user	1m8.648s sys 0m31.700s
Javac Shard Size: 100----real	0m16.163s user	1m22.932s sys 0m29.440s
Javac Shard Size: 150----real	0m16.611s user	1m37.828s sys 0m21.168s
Javac Shard Size: 200----real	0m16.936s user	1m49.248s sys 0m28.636s
Javac Shard Size: 250----real	0m17.509s user	1m54.944s sys 0m32.768s
Javac Shard Size: 300----real	0m18.868s user	1m54.088s sys 0m28.824s
Javac Shard Size: 350----real	0m17.629s user	1m54.108s sys 0m31.056s
Javac Shard Size: 400----real	0m18.658s user	2m7.712s sys 0m30.636s
Javac Shard Size: 450----real	0m18.874s user	2m8.808s sys 0m33.540s
Javac Shard Size: 500----real	0m19.432s user	2m24.400s sys 0m30.368s

time m nothing:
real 0m5.799s user 0m7.236s sys 0m3.068s

Test: m clean && m -j checkbuild
Bug: b/67424047

Change-Id: I105733160ef034ec4689259aee30247148ca089c
2017-10-09 11:06:03 -07:00
Andrew Solovay
a6019b27e7 docs: Adding API level 27 (Oreo MR1) to the docs build options
We also need to modify the server settings to add the watermark to
docs with API level 27.

Test: make ds-docs
Bug: 67459392
Change-Id: I7c0f74924a5b39dede4c324069ff05e26eec5413
2017-10-07 02:12:34 +00:00
Steven Moreland
ae1d9692e1 Merge "Convert java hwbinder mk -> bp." am: 53c945fb71 am: 7bebf15460
am: e215488334

Change-Id: Ic24c9d2af58e58aa97e0ad1f8b2ff50f7db66007
2017-10-04 04:29:26 +00:00
Steven Moreland
7bebf15460 Merge "Convert java hwbinder mk -> bp."
am: 53c945fb71

Change-Id: Ia1bde2b32e824f160dd4e768531b6b48179f7ba5
2017-10-04 04:11:38 +00:00
Steven Moreland
eddafe990f Convert java hwbinder mk -> bp.
This library is used to avoid a circular dependency
between frameworks.jar and HIDL hal definition libs.
It is not installed on the device.

Bug: 33420795
Test: m -j hwbinder and things it depends on
Change-Id: I44cc670383f80275026ea892151524599b713087
2017-10-04 03:40:15 +00:00
Colin Cross
d8e0225188 Convert ext.jar to Android.bp
See build/soong/README.md for more information

Switches to using static libraries for tagsoup and nist-sip to avoid
reference source files in another project.

Test: m -j checkbuild
Change-Id: I5d4c7729196dd78da63bd9d6b43647f6f61006cb
2017-10-02 17:14:22 -07:00
Hall Liu
3e0f22f676 Merge "Apply suggested edits to the file-download API" am: f6c9baa0cd am: 3934c475ce
am: febecb8218

Change-Id: Ibf5acac5b44c772b629472591124151c479c8f6c
2017-09-15 03:22:23 +00:00