Commit Graph

443570 Commits

Author SHA1 Message Date
Isabelle Taylor
288fdeb4cd Merge "Revert "Remove framework code that has moved to frameworks/libs/net"" am: 5c4b6301d5
Change-Id: I5e0b4e50352428ca5886a808b5667daffb4f2e4c
2020-02-14 13:51:45 +00:00
Shafik Nassar
4ec80cc67d Merge "Revert "Request MANAGE_EXTERNAL_STORAGE permission"" am: e21d0ea642
Change-Id: I044ef75eace6125620c1781e1eec1d80b247a66b
2020-02-14 13:51:21 +00:00
Isabelle Taylor
5c4b6301d5 Merge "Revert "Remove framework code that has moved to frameworks/libs/net"" 2020-02-14 13:42:37 +00:00
Shafik Nassar
e21d0ea642 Merge "Revert "Request MANAGE_EXTERNAL_STORAGE permission"" 2020-02-14 13:35:34 +00:00
Isabelle Taylor
a996b06b6f Revert "Remove framework code that has moved to frameworks/libs/net"
Revert "Use createRandomUnicastAddress from MacAddressUtils"

Revert "Add net-utils-framework-net to telephony-common"

Revert submission 1191997-net-utils-framework-net

Reason for revert: Droidcop-triggered revert due to breakage https://android-build.googleplex.com/builds/quarterdeck?branch=git_qt-qpr1-dev-plus-aosp&target=aosp_taimen-userdebug&lkgb=6208131&lkbb=6208273&fkbb=6208273, bug b/149551544
Reverted Changes:
Ib1c807d64:Use createRandomUnicastAddress from MacAddressUtil...
I9e0f297e0:Add net-utils-framework-net to telephony-common
Ieb8927f9a:Remove framework code that has moved to frameworks...

Change-Id: I2824f781babd9f7e0bb9df524dadf6b8397dcaa1
2020-02-14 13:09:16 +00:00
Aaron Huang
37413a4b82 Merge "Remove framework code that has moved to frameworks/libs/net" am: 79b6ad735b
Change-Id: I20b8398f1fe410819f18a0afcd8646c75c594fb8
2020-02-14 09:53:36 +00:00
Aaron Huang
79b6ad735b Merge "Remove framework code that has moved to frameworks/libs/net" 2020-02-14 09:42:49 +00:00
Paul Hu
06c0f60a2b Merge "Add ACTION_TETHER_SETTINGS" am: 77e6024c01
Change-Id: Ibde5dfa7be0bd3e2db664b49f3a65eb618da933d
2020-02-14 08:19:04 +00:00
Paul Hu
77e6024c01 Merge "Add ACTION_TETHER_SETTINGS" 2020-02-14 08:05:33 +00:00
Zoey Chen
8811b44dd1 Merge "[Settings] Expose @hide APIs as @SystemApi" am: 3091498e78
Change-Id: Ia1fabd4b306f9af5fd0d9f37d7c2f051fc055da6
2020-02-14 07:01:50 +00:00
Zoey Chen
3091498e78 Merge "[Settings] Expose @hide APIs as @SystemApi" 2020-02-14 06:49:45 +00:00
Roshan Pius
f66d933b13 [automerger skipped] Merge "RELAND: NetworkRequest: Embed requestor uid & packageName" am: 3819be4271 -s ours
am skip reason: Change-Id I207c446108afdac7ee2c25e6bbcbc37c4e3f6529 with SHA-1 3e63df535a is in history

Change-Id: Ib90134e63ac00f6b377d27d1d8f2a125a247d724
2020-02-14 02:09:17 +00:00
Roshan Pius
3819be4271 Merge "RELAND: NetworkRequest: Embed requestor uid & packageName" 2020-02-14 01:57:49 +00:00
TreeHugger Robot
d82258283a Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2020-02-14 00:02:26 +00:00
TreeHugger Robot
c01e98b6a4 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2020-02-13 23:47:35 +00:00
TreeHugger Robot
c013d7c189 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2020-02-13 23:46:42 +00:00
TreeHugger Robot
8078d2f418 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2020-02-13 23:39:54 +00:00
Treehugger Robot
551116b921 Merge "[vts-core] add vts_defaultPermissions_validate_test to vts-core" am: 65be777fab
Change-Id: I73948723eac1b2a87dd3e97947651a9d495861d2
2020-02-13 23:37:55 +00:00
TreeHugger Robot
8fb59c3ac0 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2020-02-13 23:37:33 +00:00
TreeHugger Robot
d517cdb2c7 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2020-02-13 23:36:34 +00:00
Treehugger Robot
65be777fab Merge "[vts-core] add vts_defaultPermissions_validate_test to vts-core" 2020-02-13 23:29:31 +00:00
TreeHugger Robot
5f8b350796 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2020-02-13 23:22:23 +00:00
Treehugger Robot
61856cc926 Merge "Update counters for session encryption to start at 1." am: ae97b320d0
Change-Id: I1f84c61f0b1d4d7c7468420de28f612d4f1f7460
2020-02-13 23:09:01 +00:00
Treehugger Robot
ae97b320d0 Merge "Update counters for session encryption to start at 1." 2020-02-13 22:53:15 +00:00
Benedict Wong
ac609b99bf Merge "Implement Ikev2VpnRunner" am: b5bb5d4ba1
Change-Id: I9b966b52f78fa54dca9d8c3032ec26ed853ad572
2020-02-13 21:31:28 +00:00
Benedict Wong
b5bb5d4ba1 Merge "Implement Ikev2VpnRunner" 2020-02-13 21:15:24 +00:00
Eric Laurent
6875f1b586 Merge "audioservice: fix persistency for volume per attributes" am: 2b6df36401
Change-Id: I98274b101226c1f322f96d0eac3f701eafc5f056
2020-02-13 21:02:52 +00:00
Eric Laurent
2b6df36401 Merge "audioservice: fix persistency for volume per attributes" 2020-02-13 20:49:33 +00:00
David Zeuthen
e8a6bffec0 Update counters for session encryption to start at 1.
The DIS version of 18013-5 now specifically says

  The first encryption with a key shall use a counter value of 1. For each
  following encryption the counter value shall be increased by 1.

in section '9.2.1.4 Mechanism". The previous version said

  The counter value is an unsigned integer, which starts at 0 for both
  the mDL and the mDL Reader. For each encryption the counter value shall
  be increased by 1.

which for some strange reason was interpreted by someone to mean that
counters should start at 1.

Update our implementation to use 1 as now called for by the standard.

Bug: 111446262
Test: atest android.security.identity.cts
Change-Id: I09d1216713d57b54036e4f9aa6677dfa5713133c
2020-02-13 15:24:09 -05:00
Bill Yi
06ab5fa70f Import translations. DO NOT MERGE
Change-Id: Iaf6a5a84ff5337eadc78e048ecf6a283885a1dd2
Auto-generated-cl: translation import
2020-02-13 11:53:40 -08:00
Bill Yi
918e32ad9a Import translations. DO NOT MERGE
Change-Id: I80036c16d532a5143a2d738c6f39aaaf75688fa9
Auto-generated-cl: translation import
2020-02-13 11:32:07 -08:00
Automerger Merge Worker
6a181625bf Merge "Remove ImsReasonInfo from PreciseDisconnectCause" am: 090bad77f1
Change-Id: Id5dd12584bf788c057b52ca74d3b3ba043ad2c18
2020-02-13 19:19:54 +00:00
Grace Jia
090bad77f1 Merge "Remove ImsReasonInfo from PreciseDisconnectCause" 2020-02-13 19:13:55 +00:00
Bill Yi
193fdff733 Import translations. DO NOT MERGE
Change-Id: Ie54aa129edb0d37da8d1bff6f0a3d81aacd2b402
Auto-generated-cl: translation import
2020-02-13 11:09:49 -08:00
Automerger Merge Worker
040db280fa Merge "Update InCallService API docs." am: 11e7b55ea9
Change-Id: Ica011ce75760d1d7338c3accdf29dc7505fd9949
2020-02-13 19:09:01 +00:00
Tyler Gunn
11e7b55ea9 Merge "Update InCallService API docs." 2020-02-13 18:48:00 +00:00
Bill Yi
bc7e0db371 Import translations. DO NOT MERGE
Change-Id: Ib63cbfa48bc734f90ff0dd804c56541dbc7be97e
Auto-generated-cl: translation import
2020-02-13 10:47:17 -08:00
Benedict Wong
b07baa2f6d Implement Ikev2VpnRunner
This change adds the implementation for IKEv2/IPsec VPNs.

Bug: 144246767
Test: Manually tested
Change-Id: I5ccec756cec49ccf57ccc4d5ad800eeb5d595a76
Merged-In: I5ccec756cec49ccf57ccc4d5ad800eeb5d595a76
2020-02-13 18:37:06 +00:00
Bill Yi
3003c1ed25 Import translations. DO NOT MERGE
Change-Id: I6bae55182c9982c6e0abf4e0f7f4f4fed6e6ec63
Auto-generated-cl: translation import
2020-02-13 10:24:53 -08:00
Automerger Merge Worker
1ce250aaea Merge "API Review cleanups." am: f2a5615087
Change-Id: I516e72d3f32c40ff480e55ceed222aea7d5ce9b3
2020-02-13 18:19:51 +00:00
Automerger Merge Worker
ac4f7edbd3 Merge changes from topic "add_participant" am: fdfc58fcd9
Change-Id: Iad1475ff41b45eda92075612afff7036089d793e
2020-02-13 18:18:36 +00:00
Tyler Gunn
f2a5615087 Merge "API Review cleanups." 2020-02-13 18:16:25 +00:00
Tyler Gunn
fdfc58fcd9 Merge changes from topic "add_participant"
* changes:
  Mark adhoc conference call APIs as @hide.
  Ims: Add support to add participants to existing call
2020-02-13 18:05:14 +00:00
Bill Yi
56948591d4 Import translations. DO NOT MERGE
Change-Id: I70b0f2c9db5381bd01cdef8d79d0d6b8dffe1bbd
Auto-generated-cl: translation import
2020-02-13 10:02:08 -08:00
Bill Yi
f2d96eee52 Import translations. DO NOT MERGE
Change-Id: I7cda6b85c5e31facf78a92a880e65f9b92efd566
Auto-generated-cl: translation import
2020-02-13 09:17:27 -08:00
Tyler Gunn
c9503d6ea6 API Review cleanups.
- New @SystemApis on Conference and PhoneAccount were missing the required
permissions annotations.
- Rename PROPERTY_ASSISTED_DIALING_USED to PROPERTY_ASSISTED_DIALING
- Standardize get/setConnectionStartElapsedRealtimeMillis method naming
across Connection and Conference classes.
- Clarify Conference#sendConferenceEvent API documentation to match the
docs present for similar method in Connection; include some examples of
valid event/extras combinations.
- Update TelecomManager#getDefaultdialerPackage to use UserHandle instead
of userId.
- Move Conference#getConnectionStartElapsedRealtimeMillis to public API
since the setter is already part of the public API.

Test: Run Telecom and Telephony CTS tests.
Test: Run Telephony unit tests.
Test: Perform manual single-party-conference regression test to confirm
that conference behavior does not regress.

Bug: 147301297
Bug: 148286830
Bug: 148284863
Bug: 148284843
Bug: 148287068
Bug: 148285484
Bug: 148285560
Change-Id: I1f446d81859fa109d74af3661a42a0bd224de5aa
Merged-In: I1f446d81859fa109d74af3661a42a0bd224de5aa
2020-02-13 16:53:42 +00:00
Automerger Merge Worker
cc1cf07352 Merge "Change default print media size from JIS_B5 to ISO_A4 for Japanese" am: 237cf7a3bc
Change-Id: Iab4b02b0511c3aedbe67402af16c3c2ebcd70bb4
2020-02-13 16:14:28 +00:00
Philip P. Moltmann
237cf7a3bc Merge "Change default print media size from JIS_B5 to ISO_A4 for Japanese" 2020-02-13 16:12:30 +00:00
Automerger Merge Worker
aee51d9eab Merge "Do not disable tracing in zygote." am: 88be2985c4
Change-Id: If850e4ff9da2b0c1259a366caac1fd95a8eb1c3c
2020-02-13 16:07:04 +00:00
Florian Mayer
88be2985c4 Merge "Do not disable tracing in zygote." 2020-02-13 15:53:06 +00:00