Commit Graph

1808 Commits

Author SHA1 Message Date
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 e254526f0f)
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 e44609b158)
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 bd200ce7d4)
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 cf3a0b5355)
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 cf3a0b5355)
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 fc84bb5f5c)
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 c26c76c63d)
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
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