Commit Graph

1787 Commits

Author SHA1 Message Date
Nan Zhang
0af34ddfc8 Merge "Shard framework during Java compilation for target side." am: 6a90c3f793 am: b06e03c134
am: 6b4f75ec4a

Change-Id: Iba206e39782bf0ac8057470d856251a599a230c9
2017-10-20 00:50:31 +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
Hall Liu
3934c475ce Merge "Apply suggested edits to the file-download API"
am: f6c9baa0cd

Change-Id: I0724d3bad15fadbfd5eb46e104b49ee1dafc8c9c
2017-09-15 00:40:49 +00:00
Hall Liu
1a5b130468 Apply suggested edits to the file-download API
* Rename Manager -> Session
* Add Handler for callbacks in download flow
* Separate out registering a state callback into another method
* Rename dispose -> close, implement AutoClosable
* No more thrown MbmsExceptions
* Add sanity check for temp file root
* Remove the getNames method, replace with getNameForLocale

Bug: 30981736
Test: testapps
Change-Id: I1a2054d79c934bc4929464de4a644b6960db47e9
2017-09-14 17:04:49 -07:00
Hall Liu
23d80af5c1 Apply suggested edits to the file-download API
* Rename Manager -> Session
* Add Handler for callbacks in download flow
* Separate out registering a state callback into another method
* Rename dispose -> close, implement AutoClosable
* No more thrown MbmsExceptions
* Add sanity check for temp file root
* Remove the getNames method, replace with getNameForLocale

Bug: 30981736
Test: testapps
Change-Id: I1a2054d79c934bc4929464de4a644b6960db47e9
2017-09-14 14:37:47 -07:00
Hall Liu
a96478a9b7 Make changes to MBMS Streaming APIs per recommendations
* Rename MbmsStreamingManager -> MbmsStreamingSession
* MbmsStreamingSession now implements AutoClosable instead of using
dispose()
* No longer throw checked MbmsExceptions from any methods. All such
errors will be reported via the async callback.
* null arguments no longer accepted for Handlers
* Guarantee that no further callbacks will get enqueued after closing.

Test: run testapps
Bug: 30981736
Merged-In: I6db045053f1baa4cd4de3718865fcfe525e8a4d6
Change-Id: I85e98850759c6c7fe7b883ffffa5b1f4e362770d
2017-09-14 13:42:08 -07:00
Hall Liu
9408a33b7e Merge "Make changes to MBMS Streaming APIs per recommendations" am: 1bbf287859 am: 200d8f6242
am: 4de6420978

Change-Id: I6db045053f1baa4cd4de3718865fcfe525e8a4d6
2017-09-14 20:11:32 +00:00
Hall Liu
200d8f6242 Merge "Make changes to MBMS Streaming APIs per recommendations"
am: 1bbf287859

Change-Id: I76662fd9822dcde781cdecafb45239e1da6337d9
2017-09-14 19:45:04 +00:00
Hall Liu
fc2bd9ee5e Merge changes from topics "embms-0804-adjustments", "prepare-download-unhide" am: 910e5751b6 am: dd6878ad03
am: 6288f42286

Change-Id: I62c0d1f6e8d82ccda9740672263f8dfe11f475a4
2017-09-14 10:26:20 +00:00
Hall Liu
dd6878ad03 Merge changes from topics "embms-0804-adjustments", "prepare-download-unhide"
am: 910e5751b6

Change-Id: I07e7d0d4d799aded59797e237ec733354f3293df
2017-09-13 22:17:01 +00:00
Hall Liu
9903558d9d Make EMBMS adjustments for 08/04
* Add a download state callback to the callback formerly for progress
* Rename EXTRA_SERVICE_INFO to EXTRA_SERVICE_ID, and specify that it
should be a String rather than a ServiceInfo
* Add documentation to clarify that the progress/state callback may be
null

Bug: 30981736
Test: manual
Change-Id: Ie1ec99868f5b09a270b500dc97abeb9f819cfa56
2017-09-13 13:19:18 -07:00
Hall Liu
d666a89163 Make changes to MBMS Streaming APIs per recommendations
* Rename MbmsStreamingManager -> MbmsStreamingSession
* MbmsStreamingSession now implements AutoClosable instead of using
dispose()
* No longer throw checked MbmsExceptions from any methods. All such
errors will be reported via the async callback.
* null arguments no longer accepted for Handlers
* Guarantee that no further callbacks will get enqueued after closing.

Test: run testapps
Bug: 30981736
Change-Id: I85e98850759c6c7fe7b883ffffa5b1f4e362770d
2017-09-08 14:55:03 -07:00
Hall Liu
571293ad96 Make EMBMS adjustments for 08/04
* Add a download state callback to the callback formerly for progress
* Rename EXTRA_SERVICE_INFO to EXTRA_SERVICE_ID, and specify that it
should be a String rather than a ServiceInfo
* Add documentation to clarify that the progress/state callback may be
null

Bug: 30981736
Test: manual
Change-Id: Ie1ec99868f5b09a270b500dc97abeb9f819cfa56
2017-08-28 14:27:56 -07:00
Ian Pedowitz
28440ed3b9 Merge "Revert "Initial support for proposed android.net.lowpan"" into oc-dr1-dev
am: 0716c8e60e

Change-Id: I1016361cd17be52a02a21fb4d1da791c0247be1d
2017-08-10 17:46:32 +00:00
Ian Pedowitz
3608d5fad7 Revert "Initial support for proposed android.net.lowpan"
This reverts commit 4e0c2195dd.

Fixes: 64111427
Test: Grabbed OC CTS binaries
Test: Extracted android-cts.zip  and from android-cts/tools directory launched ./cts-tradefed
Test: On the DUT (running build which has this CL cherrypicked), ran the below (will run this test on both abi's):
Test: run cts -m CtsPermission2TestCases -t android.permission2.cts.PermissionPolicyTest#testPlatformPermissionPolicyUnaltered --skip-connectivity-check --skip-preconditions --serial <device serial>
Test: Note, while b/64111427 is fixed, this uncovered b/64560640

Change-Id: I1d2132678281a917f03c69d5ead1d28313d7f46d
Merged-In: Icab67ba2c40bc02968e3f8ed2da5a4a3be6cf77f
2017-08-10 08:56:41 -07:00
Jakub Pawlowski
8c7734f664 Merge "resolve merge conflicts of 15658662fd to stage-aosp-master am: 3b38eaa3c2 am: 208a84ecb9" into oc-dr1-dev-plus-aosp
am: e48ca2099a

Change-Id: Ia0d6e190d11061687649183979430d6fec375f2d
2017-08-09 20:29:04 +00:00
Jakub Pawlowski
fa983ab254 resolve merge conflicts of 15658662fd to stage-aosp-master am: 3b38eaa3c2
am: 208a84ecb9

Change-Id: Ic8af1a3be3c867dc3822e1374c2554be3758e52d
2017-08-09 16:19:32 +00:00
Jakub Pawlowski
208a84ecb9 resolve merge conflicts of 15658662fd to stage-aosp-master
am: 3b38eaa3c2

Change-Id: Ie87c58c7a0a93ab398c3f5eac6e13be837f4ed58
2017-08-09 16:06:47 +00:00
Jakub Pawlowski
3b38eaa3c2 resolve merge conflicts of 15658662fd to stage-aosp-master
Test: this fixes merge conflict that I skipped
Change-Id: I2e993d1f021b1bb671b07440cdc611853d6c3f08
2017-08-09 13:03:35 +00:00
Todd Kennedy
3ff3e75fb2 Merge "Add native bindings for getNamesForUids" into oc-mr1-dev
am: 8c18e1faf8

Change-Id: If0d1dc60455c961215454a5b2edcb59c0097add4
2017-08-08 16:06:17 +00:00
TreeHugger Robot
8c18e1faf8 Merge "Add native bindings for getNamesForUids" into oc-mr1-dev 2017-08-08 15:58:41 +00:00
Todd Poynor
589ce7dfc5 Merge "thermalservice: Add ThermalService java interfaces" into oc-mr1-dev
am: 590f519f24

Change-Id: I1397add21609288770d46f21d8a23cf55e6e9a75
2017-08-08 01:23:35 +00:00
Todd Poynor
875e5c7451 thermalservice: Add ThermalService java interfaces
Binder service ThermalService broadcasts thermal events to registered
listeners.

Test: manual: marlin with modified thermal-engine.conf and temporary
      java thermal event listener
Bug: 30982366
Change-Id: I11f7fd18feff3b9af0eecc3fd3a13d54c0b97ff0
(cherry picked from commit dd05582eab)
2017-08-07 23:08:36 +00:00
Jeff Sharkey
1ad38fe278 Merge "Fix broken javadocs." into oc-mr1-dev
am: b79eb54d36

Change-Id: I283e3914833b01969308afbd2fad1889e0497338
2017-08-06 16:45:10 +00:00
Jeff Sharkey
67f9d5070a Fix broken javadocs.
Bug: 64337634
Test: make -j32 doc-comment-check-docs
Change-Id: I20fdd3dcddef09111d35946c41c596c7689effa6
2017-08-06 07:37:08 -06:00
Todd Kennedy
ad192a392b Add native bindings for getNamesForUids
A new API [getNamesForUids] was recently added to the PackageManager
and this API needs to be accessible to native code. However, there
were two constraints:
1) Instead of hand-rolling the binder, we wanted to auto generate
the bindings directly from the AIDL compiler.
2) We didn't want to expose/annotate all 180+ PackageManager APIs
when only a single API is needed.
So, we chose to create a parallel API that can be used explicitly
for native bindings without exposing the entirety of the
PackageManager.

Bug: 62805090
Test: Manual
Test: Create a native application that calls into the new service
Test: See the call works and data and returned
Change-Id: Ia571ab1607c6c88fef44eb0de6a313a28906c732
2017-08-04 13:36:37 -07:00
Sundong Ahn
014ca608c7 Merge "Merge "Add hwbinder library" am: 49e2a9a612 am: 811027ede7 am: 2785be7572" into oc-dr1-dev-plus-aosp
am: a4fb234a4c

Change-Id: I026ca8c33ef2fce7d40e2daec8db970d6b578f25
2017-08-02 17:27:38 +00:00
Sundong Ahn
30538850f2 Merge "Add hwbinder library" am: 49e2a9a612 am: 811027ede7
am: 2785be7572

Change-Id: Ia545b163166465cafa3d4ecbb0a5d0d911224b22
2017-08-02 17:14:55 +00:00
Sundong Ahn
2785be7572 Merge "Add hwbinder library" am: 49e2a9a612
am: 811027ede7

Change-Id: Idec0d080a65d96ff866969f47e9902e40e800fdf
2017-08-02 17:05:56 +00:00
Sundong Ahn
811027ede7 Merge "Add hwbinder library"
am: 49e2a9a612

Change-Id: I3c7528dcf98bf3b92843594172531fd30a5f29d4
2017-08-02 16:57:50 +00:00
Sundong Ahn
28cc6e88fd Add hwbinder library
HAL impls will depend hwbinder.jar instead of framework.jar on
build-time, but on runtime framework.jar will be used.

This is to cut the circular dependency when using configstore from
Android framework. Also added JNI call to HwBinder.java to cut
configstore's dependency on systemproperty in framework.jar.

Note that hwbinder.jar is LOCAL_UNINSTALLABLE_MODULE and so it won't be
installed in an actual image.

Bug: 35771640
Test: build & run
Change-Id: I2420298cf9df5d6bbcead3e4451b703ce9bc3e29
2017-08-01 11:26:18 +09:00
Andrew Solovay
5f2086fc7d Merge "Cherry-pick from master Doc change: Add API 26 to @since list" into oc-dev am: 04d43a6a7b am: 51f65bbcbf
am: 1dbd4a48c5

Change-Id: I8ae0c12093620fd14fe60e5b7f653df4cdb2db67
2017-07-28 22:00:35 +00:00
Andrew Solovay
76044cddc5 Merge "Cherry-pick from master Doc change: Add API 26 to @since list" into oc-dev am: 04d43a6a7b
am: 51f65bbcbf

Change-Id: I17386cc10e591e60442eeeba7e4dec42c9b4bd54
2017-07-28 21:50:15 +00:00
Andrew Solovay
1dbd4a48c5 Merge "Cherry-pick from master Doc change: Add API 26 to @since list" into oc-dev am: 04d43a6a7b
am: 51f65bbcbf

Change-Id: If54feb86d47552ea89da661c7769a25efe669237
2017-07-28 20:30:26 +00:00
Andrew Solovay
557b11bac1 Merge "Cherry-pick from master Doc change: Add API 26 to @since list" into oc-dev
am: 04d43a6a7b

Change-Id: I2936fc48db92ad5846b5c72549d265ce4180686d
2017-07-28 20:18:34 +00:00
Andrew Solovay
51f65bbcbf Merge "Cherry-pick from master Doc change: Add API 26 to @since list" into oc-dev
am: 04d43a6a7b

Change-Id: I57763d6980b66ef288788153d275cf196fbd510a
2017-07-28 20:18:29 +00:00
Dirk Dougherty
fdad0ba193 Cherry-pick from master Doc change: Add API 26 to @since list
Add API 26 to @since list and turn off preview watermarking.
Fix has been successfully submitted in master and affects doc files
only.

Bug: 62087404
Bug: 64123587
Test: make ds-docs

Original change-Id: Idcf84882a1a1fe0864ee6ff3d0af6cd857c73a06

Change-Id: I28700ad15d931256d9dfc1016df546bd2f0e718f
2017-07-27 15:00:46 -07:00
Love Khanna
b54567810f NFC DTA Integration
Test: compiles.
Merged-In: I07cbb321ffbdbe9d93d632c8a56f3bc53218e592
Change-Id: I07cbb321ffbdbe9d93d632c8a56f3bc53218e592
2017-07-21 17:05:47 -07:00