Commit Graph

18039 Commits

Author SHA1 Message Date
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
Brad Ebinger
c74ae34ddb Adds a filtering bitmask to DownloadStateCallback
Adds the ability for an EMBMS app to specify a filtering
bitmask to DownloadStateCallback, which is used to filter
out callbacks that the EMBMS app doesn't need to listen
to.

Test: Testapps
Change-Id: Id7f26ba3c3606c644b0ca3376df1107f5834facb
2017-10-03 09:48:51 -07:00
Orion Hodson
93dd29d110 Merge "Update dalvik.bytecode package" am: 537d63fe1a am: 7e806c2942
am: a17b99f75f

Change-Id: I4d15c973ed09593e9c91f4bd40f8efa65b1d516c
2017-10-03 08:24:07 +00:00
Orion Hodson
a17b99f75f Merge "Update dalvik.bytecode package" am: 537d63fe1a
am: 7e806c2942

Change-Id: I1fb0eebc7b345d9b21b10a4b9511d91e61a45046
2017-10-03 08:15:45 +00:00
Orion Hodson
7e806c2942 Merge "Update dalvik.bytecode package"
am: 537d63fe1a

Change-Id: I41ed71812f67136cbf456bfbdbc5b3a245c93f18
2017-10-03 08:06:57 +00:00
Brad Ebinger
d01f6eec20 Decouple Content Name Locale from Content Language Locale
There was an assumption that content language Locale was
a 1:1 mapping with content locale name, which is not the
case. This change separates the two and provides a new
API for retreiving the set of Locales for content name.

Test: Manual
Change-Id: I44cb527ceb77fe321500f9d5fc00f6880ee52cb7
2017-09-29 15:34:50 -07:00
Jorim Jaggi
e25ff3130e Merge "Add API to request light navigation bar in theme" into oc-mr1-dev
am: e1cf112b6c

Change-Id: I7646845711ed39ff47269dc3a7a5e93b06c1b8a1
2017-09-28 16:38:38 +00:00
Jorim Jaggi
6c7776ffe2 Add API to request light navigation bar in theme
Such that splash screens can already have a light navigation bar,
avoiding a janky flash.

Test: CtsSystemUiTestCases
Bug: 66986286
Bug: 63630024
Change-Id: I0b89c58e9fbca08e27a6ec13db5a07f5e030c682
Merged-In: I81b34fefeb336ac2269dc5e6b98cc0b6045cea70
2017-09-28 16:23:39 +00:00
Orion Hodson
466f92d97b Update dalvik.bytecode package
BUG: 66562179
Test: m checkapi
Change-Id: Ifeecbecbd7334b55126b6e0f51eb5e8b516e341a
2017-09-27 13:55:38 +01:00
nharold
80b90ed99a Merge changes from topic "re-enable-ipsec" am: 680525c742 am: 8d306cd78a
am: 80107540bb

Change-Id: I13a7134864a648aff9338fda044b3bffd653119e
2017-09-26 22:39:01 +00:00
nharold
80107540bb Merge changes from topic "re-enable-ipsec" am: 680525c742
am: 8d306cd78a

Change-Id: I4e712a0d17618ca93cf6032b59ce8be0c8e0bfee
2017-09-26 22:24:02 +00:00
nharold
8d306cd78a Merge changes from topic "re-enable-ipsec"
am: 680525c742

Change-Id: Ia1d1f3981a9dd1eb8f60631d318211daf135d575
2017-09-26 22:13:20 +00:00
nharold
680525c742 Merge changes from topic "re-enable-ipsec"
* changes:
  Re-Expose IpSecService API Surface
  Re-Enable Starting of the IpSecService
2017-09-26 21:46:39 +00:00
Charles He
01014743c0 Merge changes from topic "always-on-vpn" am: cc15c7f8c1
am: 692b55390f

Change-Id: I3931c053c4daff092b06e3e1d673817708762a62
2017-09-19 08:09:41 +00:00
Charles He
692b55390f Merge changes from topic "always-on-vpn"
am: cc15c7f8c1

Change-Id: I7391ce7ecab4f8e73912f420d49150ed7210ea6c
2017-09-19 08:01:45 +00:00
Charles He
cc15c7f8c1 Merge changes from topic "always-on-vpn"
* changes:
  Opt-out for always-on VPN: rename API.
  Opt-out for always-on VPN
2017-09-19 07:50:13 +00:00
Pengquan Meng
f05a01caf3 Merge "Incorrect decoding when TP-OA contains non-integer information" am: 2bcc7fac89 am: 74bd3daaac
am: b3bc234dfa

Change-Id: I5df968dbf00665d3bfdd451dc4e03fda055c371a
2017-09-19 01:38:10 +00:00
Pengquan Meng
b3bc234dfa Merge "Incorrect decoding when TP-OA contains non-integer information" am: 2bcc7fac89
am: 74bd3daaac

Change-Id: Idc00a34295cdcbefa19636643bff3c3bf2323446
2017-09-19 01:31:24 +00:00
Pengquan Meng
74bd3daaac Merge "Incorrect decoding when TP-OA contains non-integer information"
am: 2bcc7fac89

Change-Id: I4bddee5b8cf19715db56e7286a05f76be530928d
2017-09-19 01:23:53 +00:00
Erika Avenberg
0be6d7cbd8 Incorrect decoding when TP-OA contains non-integer information
When receiving a GSM SMS message where the TP-Originating-Address
(TP-OA) field contains non-integer information, it is currently
decoded incorrectly.

This CL adds support for decoding BCD according to spec:
ETSI TS 123 040 V9.3.0

Section: 9.1.2.3 Semi-octet representation
"If a mobile receives an address field containing non-integer
 information in the semi-octets other than "1111" (e.g. 1110)
 it shall display the semi-octet as the representation given
 in GSM 44.008 [12] under "called BCD number", viz 1010="*",
 1011="#", 1100="a", 1101="b", 1110="c"."

Bug: 65042708
Test: runtest --path frameworks/opt/telephony/tests/telephonytests/src/com/android/internal/telephony/GsmSmsTest.java --test-method testAddressing
Change-Id: Ied2d6ca4d84d5c3ca6cc5c4d9875d2ff2a8e5df9
2017-09-18 15:21:08 -07:00
Hall Liu
3715bced3a Merge "API council suggested edits, part 3" am: 7a4cc05d45 am: 4c4fb3bdfb
am: 7fd9aa2654

Change-Id: I6764968b4b3f71be799b0a5e835fdc3624849364
2017-09-15 03:26:50 +00: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
7fd9aa2654 Merge "API council suggested edits, part 3" am: 7a4cc05d45
am: 4c4fb3bdfb

Change-Id: Ifc0a36557d8a5a1a7d19e00550ae2a1997db800f
2017-09-15 01:54:30 +00:00
Hall Liu
febecb8218 Merge "Apply suggested edits to the file-download API" am: f6c9baa0cd
am: 3934c475ce

Change-Id: Id1a1e80269263ecf10d80795cea64f16aa1f6058
2017-09-15 01:35:37 +00:00
Hall Liu
4c4fb3bdfb Merge "API council suggested edits, part 3"
am: 7a4cc05d45

Change-Id: Idec5544475dc5eee42009f4038f32b8d8b3c5450
2017-09-15 00:45:05 +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
e373ee5d5c API council suggested edits, part 3
* MbmsException no longer thrown from the common methods, and the error
codes are now containined in MbmsError.
* In order to avoid ANRs while processing download-done broadcasts,
don't perform arbitrary moves when a download is done. Instead, move
into a staging directory and let the app handle it.

Bug: 30981736
Test: testapps
Change-Id: I9416f28b4f24f89af1da6f56a93ea0f0e4ea3878
2017-09-14 14:51:32 -07:00