Commit Graph

18065 Commits

Author SHA1 Message Date
Tobias Thierer
fbaf4253ae Merge "Track deprecation/replacement of Os methods that depend on Mutable*" am: e8b07e5bef
am: d20ae24fb1

Change-Id: I275c4fb658f6c158d38a6062bf1622e239e1603c
2017-11-08 16:52:46 +00:00
Tobias Thierer
d20ae24fb1 Merge "Track deprecation/replacement of Os methods that depend on Mutable*"
am: e8b07e5bef

Change-Id: Iebebb843f0857cad4ace13731d1f066ab84eabb6
2017-11-08 16:44:30 +00:00
Tobias Thierer
e8b07e5bef Merge "Track deprecation/replacement of Os methods that depend on Mutable*" 2017-11-08 16:34:03 +00:00
Jordan Liu
b41fa4ead5 Merge "Add a carrier config indicating whether user can edit a voicemail number" am: 1f8ee4ff25
am: e968d500f5

Change-Id: Ifc4a120e14dd2e2bc6f2bdfe06acfffdf6837bea
2017-11-07 18:51:57 +00:00
Jordan Liu
e968d500f5 Merge "Add a carrier config indicating whether user can edit a voicemail number"
am: 1f8ee4ff25

Change-Id: I7d86a7b3fe4348bfd148e8167b6213e9d27e67c7
2017-11-07 18:39:06 +00:00
Jordan Liu
1f8ee4ff25 Merge "Add a carrier config indicating whether user can edit a voicemail number" 2017-11-07 18:28:33 +00:00
Neil Fuller
a9dc4456f7 Change SystemApi as per API council feedback
API council have requested a manifest constant be added
to the SystemApi directly in preference to an indirect
SystemApi constant here:
android.provider.TimeZoneRulesDataContract.READER_PERMISSION.

This is the first of three changes to (1) add the new constant,
(2) switch over code using the constant, (3) remove the
constant.

Bug: 64568899
Test: None, build only
Change-Id: Ib9766591979886d1db3b1d7321536dabf5cf81a8
(cherry picked from commit 8bb4140516)
2017-11-06 20:39:36 -08:00
Tobias Thierer
99a1d450da Track deprecation/replacement of Os methods that depend on Mutable*
Another CL in this CL topic is deprecating/removing three methods
in android.system.Os, and introducing replacements.

This CL tracks that change by updating frameworks/base accordingly.

Test: Treehugger
Bug: 67901714

Change-Id: I96ad205a305801b2cb641ba8984810dfe6474032
2017-11-07 02:51:27 +00:00
Neil Fuller
0ab8a0d27b Add TimeZoneRulesDataContract to system API
Add TimeZoneRulesDataContract to system API and remove
TODOs to add other classes that should not now be needed
in the system API (since they are used by a platform-only
app).

Bug: 31008728
Test: make droid
Change-Id: I600e7b08853b86b27463193411cf85207ae09ce8
2017-11-07 01:12:28 +00:00
Philip P. Moltmann
b567ea9dda Merge "Allow to attach jvmti agents from inside of process" am: faffb072a4
am: 491058e089

Change-Id: Ib636dd1ebcee0bfbd57e12e632137561bb661d3e
2017-11-06 20:58:48 +00:00
Treehugger Robot
faffb072a4 Merge "Allow to attach jvmti agents from inside of process" 2017-11-06 20:34:34 +00:00
Jeff Sharkey
69b31d4eb0 Merge "Define NOT_ROAMING network capability." am: 8f380ab29c
am: 3fe1ae29cd

Change-Id: Ib511f7af82c80fd4e95f4da9de1fdce200deb987
2017-11-03 23:07:03 +00:00
Philip P. Moltmann
fd8ed85adb Allow to attach jvmti agents from inside of process
Test: cts-tradefed run singleCommand cts-dev -m CtsJvmtiAttachingTestCases
Bug: 65016018
Change-Id: I6d445afa288c6fec1d860150159fa05ed63cf517
2017-11-03 10:33:21 -07:00
Hall Liu
ebe0a4ccf8 Merge "Add @TestApi for EMBMS APIs needed for CTS" am: f1167ced38
am: cca2b5a246

Change-Id: I495d10d673d0ac194835446b5c4587bf26246d7e
2017-11-02 02:53:59 +00:00
Tobias Thierer
4a45e0435d Merge "make update-api" am: 07fe9042cf
am: e33d0f594e

Change-Id: I32a054929b04211c36394db8029f6bf651209991
2017-11-02 02:47:59 +00:00
Jeff Sharkey
72f9c42b9e Define NOT_ROAMING network capability.
The "roaming" state of a network really belongs on NetworkCapabilities
instead of being published through NetworkInfo.isRoaming().  One major
reason is to support developers creating NetworkRequests for a
non-roaming network.

Watch for any capability changes that network statistics are
interested in (either metered or roaming) and notify it to perform
an update pass; fixes bug where we previously only triggered on
roaming changes.

Fix bug in VPNs where metered/roaming capabilities of underlying
networks weren't being propagated; this was probably preventing
some jobs from running over unmetered networks, and causing other
jobs to run over roaming networks!  Also passes along link bandwidth
information from underlying networks, and propegates any changes
to underlying networks.

Fix race condition by reading prevNc inside lock.  Utility methods
correctly calculate min/max link bandwidth values.

Test: bit FrameworksNetTests:android.net.,com.android.server.net.,com.android.server.connectivity.,com.android.server.ConnectivityServiceTest
Bug: 68397798, 16207332
Change-Id: I3e1a6544c902bf3a79356b72d3616af1fd2b0f49
2017-11-01 19:05:42 -06:00
Hall Liu
f1167ced38 Merge "Add @TestApi for EMBMS APIs needed for CTS" 2017-11-01 22:35:51 +00:00
manabu, shimoda
d245ba438c Add a carrier config indicating whether user can edit a voicemail number
Some carriers require to make it possible to prevent user editing
voicemail number. This carrier config is used to disable voicemail
number setting in Settings.

Test: manual - Checked that the voice mail number editing could be
controlled by carrier config.
Bug: 67872671
Merged-In: Ibbc3e0aa9d3d15abbb44477acd6d3546593a21bf
Change-Id: Ibbc3e0aa9d3d15abbb44477acd6d3546593a21bf
2017-11-01 11:47:34 -07:00
Tobias Thierer
ae71c4f23c make update-api
This CL almost exactly reverts http://r.android.com/471377 .

current.txt and friends were not reflecting the latest AOSP API,
ie. "make update-api" was not a no-op like it's supposed to be.

Apart from IpSecManager.SecurityParameterIndex.finalize(), this
seems to mostly revert http://r.android.com/471377 which suggests
that the tooling change that necessitated that CL was probably
reverted without "make update-api" being run on AOSP.

No further investigation was made for what CL(s) caused this or
whether any of this API change is undesired.

Test: Treehugger
Test: make update-api

Change-Id: I5b846627e38c47abb534def97f0cab9d28b1288c
2017-11-01 17:21:59 +00:00
Hall Liu
156b3041a9 Add @TestApi for EMBMS APIs needed for CTS
Bug: 68049452
Test: CTS
Change-Id: I5d132ac4e67deccf41c998822f82cf94d3f2ce7f
2017-10-31 18:49:09 -07:00
Hall Liu
e90908371a Merge "EMBMS - Add TestApi and provide service override" am: 1fab41e771
am: dfc37f77c9

Change-Id: I3ecc9c267fa7f107a11bc9e1a4fbdb6c2772ec20
2017-10-27 23:49:37 +00:00
Hall Liu
1fab41e771 Merge "EMBMS - Add TestApi and provide service override" 2017-10-27 23:19:29 +00:00
Cassie Han
a738702e15 Merge "Add the operator name and MCC/MNC in string format into the CellIdentity." am: 1565803cd2
am: e64d907a49

Change-Id: I0f145a458bff20dd9e6484120331bcc59b2dd8d3
2017-10-27 17:54:36 +00:00
Cassie Han
1565803cd2 Merge "Add the operator name and MCC/MNC in string format into the CellIdentity." 2017-10-27 17:17:54 +00:00
Hall Liu
64e22af32e EMBMS - Add TestApi and provide service override
Add @TestApi annotations to methods that CTS needs
Add a manifest meta-data key that allows client apps to specify the
exact component name of the MBMS service to bind to.

Bug: 68049452
Test: CTS
Change-Id: I50654c41da38696a25fad93d0a5e0b0c11fa0b42
2017-10-26 15:46:42 -07:00
Cassie
933b78d977 Add the operator name and MCC/MNC in string format into the CellIdentity.
Bug: 63984327
Test: Basic telephony sanity
Change-Id: Ia5e7f5b980efbde647f95f3e83a62d56132b90da
2017-10-25 10:04:31 -07:00
Benedict Wong
9c6f24d1ee Merge "Add support for AES-GCM-ESP as an IPSec algorithm" am: b6df7f0d35 am: d3a5792024
am: f92bfc3b77

Change-Id: I49932a5fc048b4a60512fac45a3537f050397168
2017-10-19 17:37:22 +00:00
Benedict Wong
f92bfc3b77 Merge "Add support for AES-GCM-ESP as an IPSec algorithm" am: b6df7f0d35
am: d3a5792024

Change-Id: I5bf43f78716769a6f1f90169f500e9eee7a91f18
2017-10-19 17:26:19 +00:00
Benedict Wong
d3a5792024 Merge "Add support for AES-GCM-ESP as an IPSec algorithm"
am: b6df7f0d35

Change-Id: Ic099206a28c4f21fa796969c953a8d4e81e8495b
2017-10-19 17:14:53 +00:00
Benedict Wong
0febe5ece5 Add support for AES-GCM-ESP as an IPSec algorithm
Allows native AES-GCM-ESP to be used as an IPSec transport/tunnel mode
algorithm with kernel support

Bug: 63589918
Test: IPsecService tests added, existing ones pass
Change-Id: Ie1a9a902be205f269aa37bf956198f2e5b177c21
2017-10-18 11:22:24 -07:00
Brad Ebinger
bb38194a55 Merge "Add new Download Error Codes" am: e9bd5449b5 am: 946ff79971
am: 014d73e287

Change-Id: I7c7dc265bf5ba27b61794d114937c2c4c0816470
2017-10-11 22:56:47 +00:00
Brad Ebinger
014d73e287 Merge "Add new Download Error Codes" am: e9bd5449b5
am: 946ff79971

Change-Id: I756df5c78a96a59468f54ac35e9668d66cf64901
2017-10-11 22:39:14 +00:00
Brad Ebinger
946ff79971 Merge "Add new Download Error Codes"
am: e9bd5449b5

Change-Id: I8fa3c3dcc5104a5326a680ae186c9285a7e47358
2017-10-11 22:24:58 +00:00
Brad Ebinger
e9bd5449b5 Merge "Add new Download Error Codes" 2017-10-11 22:12:26 +00:00
Brad Ebinger
6fb5072fa8 Add new Download Error Codes
Adds new MBMS Download Session error codes to allow for
more fine grained error reporting to the client app.

Test: Manual
Change-Id: I9c2163d934835efaaa145e4c0f8a91838d84aa1e
2017-10-10 12:50:49 -07:00
Brad Ebinger
d0c9d44df9 Merge "Require DownloadRequest#Builder to have mandatory Source URI" am: 432c2b0fb9 am: 3b6df532f3
am: 8765abcc9e

Change-Id: I25b39008317e333d422cd32a0c6348c010ca280f
2017-10-10 18:57:23 +00:00
Brad Ebinger
8765abcc9e Merge "Require DownloadRequest#Builder to have mandatory Source URI" am: 432c2b0fb9
am: 3b6df532f3

Change-Id: I4d9031d32f59953d7b86cf361635c7d7f08fdf32
2017-10-10 18:48:08 +00:00
Brad Ebinger
3b6df532f3 Merge "Require DownloadRequest#Builder to have mandatory Source URI"
am: 432c2b0fb9

Change-Id: I3332d44105c6ce4f8d4223caad66715c4c67d52f
2017-10-10 18:39:56 +00:00
Brad Ebinger
432c2b0fb9 Merge "Require DownloadRequest#Builder to have mandatory Source URI" 2017-10-10 18:27:36 +00:00
Brad Ebinger
ea737a8e1e Require DownloadRequest#Builder to have mandatory Source URI
This change modifies the API to require that the
DownloadRequest#Builder includes the Source URI as a mandatory,
non-null parameter.

Test: Manual, Telephony Test MBMS app
Change-Id: I7d44e977314a57fdf063aa233bfb978b48ebf1db
2017-10-10 00:06:04 +00:00
Ruben Brunk
3de064f7cc Merge "Bind VR compositor service from VrManagerService." into oc-mr1-dev
am: c765c2c448

Change-Id: I868d30cae1181efc90d41d3a2fea33baa503ff0a
2017-10-05 04:03:03 +00:00
Ruben Brunk
52ea662280 Bind VR compositor service from VrManagerService.
- Allow VR system application to have VR manager service bind a
compositor process so that oom scoring for the compositor process can be
adjusted.

Bug: 38390640

Test: Check that the VrCore compositor process is -700 on AIO devices with:

  adb shell procrank -o

Change-Id: I7b5bce5eb87bd5ed0fdeadf4ec7bdd2b361ab875
2017-10-03 20:58:30 -07:00
Brad Ebinger
548a7e607d Merge "Adds a filtering bitmask to DownloadStateCallback" am: 177bd65211 am: 387b90aa97
am: 6ed82dc67b

Change-Id: Iab96a457f45f759267b9a5a41df533c9988ede94
2017-10-03 21:23:01 +00:00
Brad Ebinger
6ed82dc67b Merge "Adds a filtering bitmask to DownloadStateCallback" am: 177bd65211
am: 387b90aa97

Change-Id: I4332a7f839aec731acaafbb9fa6213f2ada39857
2017-10-03 21:13:34 +00:00
Brad Ebinger
387b90aa97 Merge "Adds a filtering bitmask to DownloadStateCallback"
am: 177bd65211

Change-Id: I64950a42e8079a41105d90ea6c584ca6f940a64e
2017-10-03 20:55:50 +00:00
Brad Ebinger
177bd65211 Merge "Adds a filtering bitmask to DownloadStateCallback" 2017-10-03 20:23:00 +00:00
Brad Ebinger
5fc881f7e7 Merge "Decouple Content Name Locale from Content Language Locale" am: a830e83028 am: 768b6c5e4a
am: 4b76f8420f

Change-Id: If87094f15e3a1dfe36d37745ed3d2cf79cc441f1
2017-10-03 19:07:46 +00:00
Brad Ebinger
4b76f8420f Merge "Decouple Content Name Locale from Content Language Locale" am: a830e83028
am: 768b6c5e4a

Change-Id: Ibb2d70b40c0a439ad37deb911eb6b08ccde4bbfe
2017-10-03 18:58:11 +00:00
Brad Ebinger
768b6c5e4a Merge "Decouple Content Name Locale from Content Language Locale"
am: a830e83028

Change-Id: I225e8b71f53d584e1c8a6325dc2bb57421617dc4
2017-10-03 18:45:43 +00:00
Brad Ebinger
a830e83028 Merge "Decouple Content Name Locale from Content Language Locale" 2017-10-03 18:31:49 +00:00