Commit Graph

17676 Commits

Author SHA1 Message Date
Shuo Qian
782395561d Merge "Add new error code in SmsManager"
am: 387ed22fef

Change-Id: Iff96995b90ecd6ae7fcceebf6b2017344038be72
2017-08-25 18:15:12 +00:00
Shuo Qian
387ed22fef Merge "Add new error code in SmsManager" 2017-08-25 18:01:18 +00:00
Tyler Gunn
49042dc67c Merge "Track conference start in system elapsed time."
am: 3b166fba8a

Change-Id: I8b78aaa447adcc1bfce0fec8f50857daa37d0575
2017-08-24 22:58:02 +00:00
Tyler Gunn
3b166fba8a Merge "Track conference start in system elapsed time." 2017-08-24 22:24:16 +00:00
sqian
85bb4b35f1 Add new error code in SmsManager
Design doc: https://docs.google.com/a/google.com/document/d
/1YPTNoM2Atjz8oISGAsRYlFVSA1NcYP8MbqYQIzLcJ9E/edit?usp=sharing

Test: compile/flash code; test locally
Bug: 34773406
Change-Id: I0b227e76048dd46d9c8023d37647db763e1e38e1
Merged-In: I0b227e76048dd46d9c8023d37647db763e1e38e1
2017-08-24 14:40:59 -07:00
Hall Liu
a7bb0ffc7d Merge "Embms API adjustments for 7/21" am: 489dcb7cca am: 488d3bf786
am: 7754e25694

Change-Id: I2724aab757b94957dd9174e4b86c48952a59ebdc
2017-08-23 17:05:57 +00:00
Hall Liu
7754e25694 Merge "Embms API adjustments for 7/21" am: 489dcb7cca
am: 488d3bf786

Change-Id: I03ca7bd2734b5410c37b23ba2e8d33d722ad7ebf
2017-08-23 16:56:26 +00:00
Hall Liu
d5c955fcdc Embms API adjustments for 7/21
* Enforce that only one instance of each manager can be active.
* Add a death receipient for both managers to notify the app of binder
death
* Add documentation informing the app that it may not call create()
multiple times
* Fix a collision in streaming state reason codes
* Add documentation in DownloadRequest to indicate which methods should
be called by the middleware.

Change-Id: Ie15283b5c34fee736e8023dbd4f889c2ca95299e
2017-08-22 17:07:48 -07:00
Tyler Gunn
3fa819c2f3 Track conference start in system elapsed time.
This is important so that Telecom can track the duration of the call,
which is tracked using wall clock time.

Test: Manual, unit test
Bug: 64068300
Change-Id: If642d282cd8134060acf6ffe8d81215c394d800c
2017-08-22 13:39:31 -07:00
Hall Liu
23566e82dd Merge "Fix lint errors in the streaming API" am: fa7e99ddf1 am: ac9893bba0
am: 0d73e03444

Change-Id: I5c5a8b6247ef844f86880cf4b162527d699e2fc9
2017-08-22 18:53:34 +00:00
Hall Liu
0d73e03444 Merge "Fix lint errors in the streaming API" am: fa7e99ddf1
am: ac9893bba0

Change-Id: I0ae2ee130deb1d84cc9e343e9764f65ba46d3fd1
2017-08-22 18:44:53 +00:00
Hall Liu
fa7e99ddf1 Merge "Fix lint errors in the streaming API" 2017-08-22 17:55:06 +00:00
Hall Liu
ee19cfc386 Fix lint errors in the streaming API
Fix the errors that cropped up when trying to upload the unhide CL in
MR1.

Bug: 30981736
Test: manual, with testapps
Change-Id: If4a9a5533a235a8cc56762ab7a9e32ec89440f1d
2017-08-18 14:36:06 -07:00
Hall Liu
e2f5f4b110 Merge "Revert "Fix lint errors in the streaming API"" am: 42d3eadb37 am: cb63a47d41
am: c7ac478f51

Change-Id: I55f9d7e583950a5a67de8775b6c0f1640430aac8
2017-08-17 01:53:47 +00:00
Hall Liu
c7ac478f51 Merge "Revert "Fix lint errors in the streaming API"" am: 42d3eadb37
am: cb63a47d41

Change-Id: I16e4b79d7fd40bf5d0e500e0cb3ba9bf33113fc8
2017-08-17 01:40:58 +00:00
Hall Liu
cb63a47d41 Merge "Revert "Fix lint errors in the streaming API""
am: 42d3eadb37

Change-Id: I4229c1eb42edba2c2c7df08f87bfded5402c01c7
2017-08-17 01:30:56 +00:00
Hall Liu
42d3eadb37 Merge "Revert "Fix lint errors in the streaming API"" 2017-08-17 01:22:19 +00:00
Hall Liu
591fea2504 Revert "Fix lint errors in the streaming API"
This reverts commit e1f10cbd7f.

Change-Id: Id3666b27b0d07b0a1d4f3179f2073aa75440f2ee
2017-08-17 00:46:24 +00:00
Hall Liu
e168449b32 Merge "Fix lint errors in the streaming API" am: b0f5d57489 am: 90b923f398
am: 34639cbbab

Change-Id: I82cb1673fc8a066d5101bde8ae26d97ce781e253
2017-08-16 23:40:02 +00:00
Hall Liu
34639cbbab Merge "Fix lint errors in the streaming API" am: b0f5d57489
am: 90b923f398

Change-Id: Ic6bd1488a735f2535e4a34fd2df4dc154a777639
2017-08-16 23:29:08 +00:00
Hall Liu
90b923f398 Merge "Fix lint errors in the streaming API"
am: b0f5d57489

Change-Id: Ic12810c6a3c795419ff7440218ffa23bad7d8401
2017-08-16 23:16:30 +00:00
Hall Liu
b0f5d57489 Merge "Fix lint errors in the streaming API" 2017-08-16 22:51:13 +00:00
Hall Liu
e1f10cbd7f Fix lint errors in the streaming API
Fix the errors that cropped up when trying to upload the unhide CL in
MR1.

Bug: 30981736
Test: manual, with testapps
Change-Id: I94e1bcccea4b9f50dae4c93f247ab78058d15bb5
2017-08-16 11:33:40 -07:00
Joachim Sauer
dadbe89a85 Merge "API updated for ICU4J 59.1" am: 365178394d am: b418181e01
am: a3f84dc2ee

Change-Id: I4b3cad8f696f4f00fcaa7b850821bcfe119188ea
2017-08-14 12:52:11 +00:00
Joachim Sauer
a3f84dc2ee Merge "API updated for ICU4J 59.1" am: 365178394d
am: b418181e01

Change-Id: I6cf0840b5a8d1e32e0e872e44aa381f2c6ee15f8
2017-08-14 12:39:15 +00:00
Joachim Sauer
b418181e01 Merge "API updated for ICU4J 59.1"
am: 365178394d

Change-Id: I74a98d63f9f170f6401a87c559fd0eccf06cb8f2
2017-08-14 12:28:51 +00:00
Fredrik Roubert
8f2436b3dc API updated for ICU4J 59.1
Bug: 62410016
Test: make
Change-Id: Ieeee55e7fec1022ef62e792f83ba5c2c177b77af
2017-08-09 18:17:58 +02:00
Jeff Sharkey
008ddd928d DO NOT MERGE: Fix searching for overridden methods.
If the superclass is an abstract class, we want to search it for
possibly overridden methods; we don't want to search ourselves.

This bug resulted in (incorrectly) thinking that overridden "default"
methods from interfaces were standalone methods on the class.  (The
expected behavior has always been to omit any overridden methods from
the public API surface area to avoid redundant noise.)

Test: make update-api
Bug: 62675475
Change-Id: Ic92544908692bd9af329d302165e18c7b4738e43
(cherry picked from commit 257529dcae)
2017-08-03 17:47:39 +00:00
Hall Liu
76716535d9 Merge "Un-hide the MBMS streaming APIs" am: a50e17aea2 am: 8c4179e88c
am: 7a83a8ac77

Change-Id: Ia07b24d0b75d39144be8fb211ca6c2d84e24718a
2017-07-28 02:57:24 +00:00
Hall Liu
8c4179e88c Merge "Un-hide the MBMS streaming APIs"
am: a50e17aea2

Change-Id: Icd8ebf0e351914cdfb0f0c15343e2d2024706d6b
2017-07-28 02:40:20 +00:00
Hall Liu
2398921320 Un-hide the MBMS streaming APIs
Unhides the MBMS streaming APIs and modifies the vendor base classes to
no longer pass raw AIDLs to the vendor code.

Test: builds
Change-Id: I56030d646c2a1160277d85779c6ed431cda4efa7
2017-07-27 15:38:36 -07:00
Robert Quattlebaum
4b90b5f884 Merge "NetworkCapabilities: Unhide TRANSPORT_LOWPAN" am: 777c408a22 am: 6b0e6946c3
am: dbc78509ae

Change-Id: I017036f8c63ea1e9c1934daad55ef087b3a83012
2017-07-18 23:51:04 +00:00
Robert Quattlebaum
6b0e6946c3 Merge "NetworkCapabilities: Unhide TRANSPORT_LOWPAN"
am: 777c408a22

Change-Id: I3ae9566ca52b9dae87cace18b1e97897eb8de0ad
2017-07-18 23:33:08 +00:00
Treehugger Robot
777c408a22 Merge "NetworkCapabilities: Unhide TRANSPORT_LOWPAN" 2017-07-18 23:09:58 +00:00
Przemyslaw Szczepaniak
9022cf0c2e Merge "Track libcore commit 58228b82c64808eddac02736f18f5003730443a0" am: 29926838d4 am: 40dfadda77
am: 004ae3ae71

Change-Id: I74a0d7f3623bb1e6fdf6142a702c0e5dcfe1d5ee
2017-07-17 11:02:55 +00:00
Przemyslaw Szczepaniak
40dfadda77 Merge "Track libcore commit 58228b82c64808eddac02736f18f5003730443a0"
am: 29926838d4

Change-Id: I7c0f6b9c064ce7eba1eb0cd4c6bca7464ce24100
2017-07-17 10:48:50 +00:00
Przemyslaw Szczepaniak
29926838d4 Merge "Track libcore commit 58228b82c64808eddac02736f18f5003730443a0" 2017-07-17 10:37:35 +00:00
Przemyslaw Szczepaniak
f36ecf37f3 Track libcore commit 58228b82c64808eddac02736f18f5003730443a0
Test: CtsLibcoreTestCases
Bug: 62949898
Change-Id: Icc41052e9476cc08bf3fa9579964f141d164c36c
2017-07-13 14:23:44 +01:00
Hall Liu
81d9c6fe71 Merge "Implement getDownloadStatus and add permission" am: 2fa880d016 am: d45a007222
am: 9888af1dfc

Change-Id: I98d30f379072302a5e76a8b157d8aecdd1616235
2017-07-12 23:44:51 +00:00
Hall Liu
d45a007222 Merge "Implement getDownloadStatus and add permission"
am: 2fa880d016

Change-Id: I1c8b9140d6fdc20347858f1296dbccfc60319959
2017-07-12 23:27:49 +00:00
Hall Liu
2fa880d016 Merge "Implement getDownloadStatus and add permission" 2017-07-12 23:18:37 +00:00
Robert Quattlebaum
d95f73c338 NetworkCapabilities: Unhide TRANSPORT_LOWPAN
This commit simply unhides the constant `TRANSPORT_LOWPAN` in the class
`android.net.NetworkCapabilities`, adding it to the public API.

Bug: b/63600204
Change-Id: I794635814c0bd3891cd22fcc1e31614e4d6ac654
2017-07-11 18:16:09 -07:00
Przemyslaw Szczepaniak
193c7d05c8 Merge "Track libcore commit 2fd032687ba3d4d7f6af560482c5aba525584621" am: c895fcef8f am: 03e304e4e8
am: 0d53000386

Change-Id: I7e6064ba6d0b74584eec526d61ebb46abc02ad4f
2017-07-10 14:02:33 +00:00
Przemyslaw Szczepaniak
03e304e4e8 Merge "Track libcore commit 2fd032687ba3d4d7f6af560482c5aba525584621"
am: c895fcef8f

Change-Id: I1aecc608b0eaa807489683526a9267003eb975b1
2017-07-10 13:40:49 +00:00
Przemyslaw Szczepaniak
44d7cd06d2 Track libcore commit 2fd032687ba3d4d7f6af560482c5aba525584621
Test: Make
Bug: 62779247
Change-Id: I919df93b20e809f42a27225403e1549b763b0a60
2017-07-10 11:56:55 +00:00
Lucas Dupin
1446809f30 Merge "Hide all color hints references" into oc-dr1-dev
am: b1ab0ff21e

Change-Id: I54e5d27f52d197ae2512ab7216e12e11cf5c8c30
2017-07-07 02:42:35 +00:00
TreeHugger Robot
b1ab0ff21e Merge "Hide all color hints references" into oc-dr1-dev 2017-07-07 00:12:08 +00:00
Alex Light
48f04c9da2 Merge "Unhide InMemoryDexClassLoader ByteBuffer[] constructor" am: a4267fd89f am: c9b8de6136
am: e45205825f

Change-Id: I703cfcec537911bb46b917b93ed6647031bf3ba6
2017-07-06 21:24:27 +00:00
Alex Light
c9b8de6136 Merge "Unhide InMemoryDexClassLoader ByteBuffer[] constructor"
am: a4267fd89f

Change-Id: If31e5d218bd00b3281923c80cd4f61ca734d4388
2017-07-06 21:10:11 +00:00
Hall Liu
55f557dc7c Implement getDownloadStatus and add permission
- Implement getDownloadStatus in the manager
- Remove DownloadStatus and add constants in its place to reflect the
status of a single file
- Add ACT_AS_EMBMS_MIDDLEWARE permission

Change-Id: Ica8b8a872a8088a2aaf56d40926051225aa39e87
2017-07-06 13:40:09 -07:00