Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
516,831 Commits 3 Branches 0 Tags
861c8740b8a6b806a78a7b8a04a59d5da170b332
Commit Graph

516831 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
861c8740b8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: b82ba472f7 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12321109

Change-Id: Ic5e02b07213304f8efb3a256f28e46286122da20
 2020-08-06 23:35:58 +00:00
TreeHugger Robot
b82ba472f7 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev 2020-08-06 23:18:07 +00:00
Calin Juravle
11f352b4d7 [automerger skipped] Merge "Notify IORap without including packages for secondary dex opt." into rvc-dev am: eddf0c94d2 am: 724d8f1740 -s ours 
am skip reason: Change-Id Iae4fc0b6fc73707ada8895b38c3ae3f772ac2cd0 with SHA-1 9b4958afb0 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12280079

Change-Id: I9b73c637b235f62449ca51a023dd29e97dd2007a
 2020-08-06 19:37:16 +00:00
Calin Juravle
e0dfb2ce74 [automerger skipped] Merge "Notify IORap without including packages for secondary dex opt." into rvc-dev am: eddf0c94d2 -s ours am: 74cc42dcb1 -s ours 
am skip reason: Change-Id Iae4fc0b6fc73707ada8895b38c3ae3f772ac2cd0 with SHA-1 8e41a2debb is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12280079

Change-Id: I2b2c152f224ca23a7a4ec0a8acd0726ed7cb8a04
 2020-08-06 19:35:58 +00:00
Calin Juravle
724d8f1740 Merge "Notify IORap without including packages for secondary dex opt." into rvc-dev am: eddf0c94d2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12280079

Change-Id: I516152d64468fd248b2a8d5dc5127567f538b8b3
 2020-08-06 19:23:07 +00:00
Calin Juravle
74cc42dcb1 [automerger skipped] Merge "Notify IORap without including packages for secondary dex opt." into rvc-dev am: eddf0c94d2 -s ours 
am skip reason: Change-Id Iae4fc0b6fc73707ada8895b38c3ae3f772ac2cd0 with SHA-1 8e41a2debb is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12280079

Change-Id: Ia64d23ca6ed8b45553963af97ce65e153ab7af87
 2020-08-06 19:22:53 +00:00
Calin Juravle
eddf0c94d2 Merge "Notify IORap without including packages for secondary dex opt." into rvc-dev 2020-08-06 19:08:29 +00:00
Chalard Jean
9da9925389 Merge "Resolve the endpoint in legacy VPN" am: 429b59c8a4 am: fc546021bb am: 4820e9d4e4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382496

Change-Id: I96691f6091c43377f23a00621242ed034fcb0444
 2020-08-06 16:35:54 +00:00
Chalard Jean
4d64450516 Merge "Add a test for starting the legacy VPN." am: 869d4f597d am: 6926df6314 am: 4136a41652 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1372896

Change-Id: I3c4a94181bd71df68121fa0f71669fa4fa588bdd
 2020-08-06 16:35:30 +00:00
James Wei
70c8e5b4a2 Merge "UsbAccessory: Update language to comply with Android's inclusive language guidance" am: 3c127a54bb am: 6549bf6d3d am: 51929ba1f3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382397

Change-Id: I5241b4b9dc639ceeb59cbe8c76fdf712c7281a10
 2020-08-06 16:35:06 +00:00
Xin Li
7f35d6cc41 [automerger skipped] Merge "Merge QQ3A.200805.001" am: 4b3c00e75f am: 4939ba29f5 -s ours am: 955e04a8ee -s ours 
am skip reason: Change-Id I6e0bdc8c02bab54f6278096b3a3acadd97c064c6 with SHA-1 9450069de9 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1387434

Change-Id: I00546350457b10598b72fb79403132c38edb91e9
 2020-08-06 16:22:27 +00:00
Chalard Jean
4820e9d4e4 Merge "Resolve the endpoint in legacy VPN" am: 429b59c8a4 am: fc546021bb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382496

Change-Id: If649ab2763c9971c25af7732b32e97bfd50fb6f0
 2020-08-06 16:06:20 +00:00
Chalard Jean
4136a41652 Merge "Add a test for starting the legacy VPN." am: 869d4f597d am: 6926df6314 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1372896

Change-Id: Idc49c61cc0547cdabe37cfa19b685c2beeda473b
 2020-08-06 16:06:08 +00:00
James Wei
51929ba1f3 Merge "UsbAccessory: Update language to comply with Android's inclusive language guidance" am: 3c127a54bb am: 6549bf6d3d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382397

Change-Id: Ib01f4fc9c916d998641bd944fb8d416fb8a3ac2d
 2020-08-06 16:04:11 +00:00
Xin Li
955e04a8ee [automerger skipped] Merge "Merge QQ3A.200805.001" am: 4b3c00e75f am: 4939ba29f5 -s ours 
am skip reason: Change-Id I6e0bdc8c02bab54f6278096b3a3acadd97c064c6 with SHA-1 9450069de9 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1387434

Change-Id: I110045d98caea24424bf28d315cb99b353870722
 2020-08-06 16:02:18 +00:00
Christian Wailes
5e0437a1b5 [automerger skipped] Merge "Rename blacklist to denylist" am: 0f2d849c39 am: c044cd9bb1 -s ours am: c82b42a599 -s ours 
am skip reason: Change-Id If8bb7c923f1ce8d8ce8c3142bf1b674982a96573 with SHA-1 b656b9540a is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1379680

Change-Id: Iff5184afb8d9f4544b70e97afb44c72e8411137f
 2020-08-06 13:11:42 +00:00
Treehugger Robot
847b1d7cba [automerger skipped] Merge "Parent: cc2d51fc (Merge "Update language to comply with Android's inclusive language guidance") Author: Paul McLean <pmclean@google.com> AuthorDate: 2020-07-28 15:07:26 +0000 Commit: Glenn Kasten <gkasten@android.com> CommitDate: 2020-08-04 00:06:51 +0000" am: 830c70ad25 am: ff642c408c -s ours am: 80b4e4de4c -s ours 
am skip reason: Change-Id I4b3affce57ba61ad9697e91f2a5f63556ee1cd62 with SHA-1 5b0078defd is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1374724

Change-Id: I8acc81352a181881aee5527503c74bfa4a14996d
 2020-08-06 13:10:38 +00:00
Chalard Jean
fc546021bb Merge "Resolve the endpoint in legacy VPN" am: 429b59c8a4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382496

Change-Id: I732bb2282cf5b4ba74653ecc0bd934bf991649de
 2020-08-06 13:10:36 +00:00
Chalard Jean
6926df6314 Merge "Add a test for starting the legacy VPN." am: 869d4f597d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1372896

Change-Id: I31352ae32ddeba4a37cc37bdcf6d7568f63fd70a
 2020-08-06 13:10:20 +00:00
TreeHugger Robot
8d592fae4e Merge "resolve merge conflicts of c94e810cab to rvc-dev-plus-aosp" into rvc-dev-plus-aosp am: a3d8ee34a4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12316526

Change-Id: I3de451092d7139bc0b19d4288967e9347a69908e
 2020-08-06 13:10:00 +00:00
Christian Wailes
c82b42a599 [automerger skipped] Merge "Rename blacklist to denylist" am: 0f2d849c39 am: c044cd9bb1 -s ours 
am skip reason: Change-Id If8bb7c923f1ce8d8ce8c3142bf1b674982a96573 with SHA-1 b656b9540a is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1379680

Change-Id: I119acd7019af2e7253dd837376ed0d8019a80d6d
 2020-08-06 13:09:30 +00:00
Treehugger Robot
80b4e4de4c [automerger skipped] Merge "Parent: cc2d51fc (Merge "Update language to comply with Android's inclusive language guidance") Author: Paul McLean <pmclean@google.com> AuthorDate: 2020-07-28 15:07:26 +0000 Commit: Glenn Kasten <gkasten@android.com> CommitDate: 2020-08-04 00:06:51 +0000" am: 830c70ad25 am: ff642c408c -s ours 
am skip reason: Change-Id I4b3affce57ba61ad9697e91f2a5f63556ee1cd62 with SHA-1 5b0078defd is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1374724

Change-Id: I67ecbc1e51d6f0316c2bc1e99902a6d658b5790d
 2020-08-06 13:09:18 +00:00
TreeHugger Robot
a3d8ee34a4 Merge "resolve merge conflicts of c94e810cab to rvc-dev-plus-aosp" into rvc-dev-plus-aosp 2020-08-06 13:01:00 +00:00
Chalard Jean
429b59c8a4 Merge "Resolve the endpoint in legacy VPN" 2020-08-06 12:51:50 +00:00
Chalard Jean
869d4f597d Merge "Add a test for starting the legacy VPN." 2020-08-06 12:50:50 +00:00
Chalard Jean
197b4a7168 Resolve the endpoint in legacy VPN 
This adds code to resolve the endpoint in the legacy VPN
runner if it was specified as a hostname, and enables the
previously added test that was disabled because this was
broken until this patch. See the linked bug for details.

This patch uses the async DNS API to do the resolution.
This lets the resolution be fully cancellable, though the
code is more complex than with the non-interruptible
getByName.

Test: VpnTest and in particular VpnTest#testStartRacoon
      Fixes the test meant to test this
      Also manual testing that resolution of a real
      hostname works as expected, that failure to resolve
      returns correctly, and that cancellation/interruption
      will unblock the thread and terminate immediately.
Bug: 158974172
Change-Id: I714985f3c7919dad9c1854830c50f29c1f94a21e
 2020-08-06 17:29:59 +09:00
Chalard Jean
b2a73dc872 Add a test for starting the legacy VPN. 
The legacy VPN has, among many parameters, a host to connect to.
This host can be specified as a numeric address, or as a hostname.
When it's a name, resolution is required. Currently, name
resolution is performed by the native VPN daemons racoon and
mtpd. When a hostname is used, the framework does not know the
IP address of the VPN server and does not add a throw route for
the VPN server IP address. On older kernels this does not matter
because the legacy PPP kernel code binds the PPP socket to the
right network, but on newer devices that use the upstream PPP
code, this does not work. See b/133797637.

This patch instruments the legacy VPN code so that it can be
run in tests, and uses this instrumentation to simulate passing
a configuration that contains a host, and verifies that the
arguments passed to the mptd and racoon daemons receive the
expected server address, and that the expected throw route is
correctly installed.
It then adds two tests : one specifying the server as a numeric
address, and one as a hostname. As the resolution is currently
broken, the latter of these tests is added disabled, and the
followup fix to the issue enables it.

This test is basic and very targeted, but it's what we need right
now. Also there are plans to remove this entire code path in S, so
the test being ad-hoc is not much of a problem.

Test: this
Bug: 158974172
Change-Id: I420b63db03a58e8c67a98a85c9f4c2d6ed7ad078
(cherry picked from commit 45846a03051a13d667732288e457eab4336a691e)
 2020-08-06 17:16:00 +09:00
Bill Yi
aa78645d74 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I4efc1a23c45bbff500fe38afbbea32d7f0b172b9
 2020-08-06 04:22:35 +00:00
Wayne Lin
5b908d36a3 Merge "Extend SUPL network request timeout for consecutive SUPL request" into rvc-d1-dev am: db9c531910 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12279987

Change-Id: Icd6c812e9ad22a4bd84602837ec6fd1435b1c5ff
 2020-08-06 04:13:14 +00:00
Wayne Lin
db9c531910 Merge "Extend SUPL network request timeout for consecutive SUPL request" into rvc-d1-dev 2020-08-06 03:51:14 +00:00
James Wei
6549bf6d3d Merge "UsbAccessory: Update language to comply with Android's inclusive language guidance" am: 3c127a54bb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382397

Change-Id: I8696f0cdad5ada3040a46638fe964f394ae08dbb
 2020-08-06 01:41:21 +00:00
Chavi Weingarten
1812833eb2 Merge "Revert "Reparent bounds layer if surface was replaced."" into rvc-d1-dev am: 15e6f37a16 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12308823

Change-Id: I49889d6e90ed4d8ce33ca773eeeb3ab7e4a43924
 2020-08-06 01:39:49 +00:00
Chavi Weingarten
15e6f37a16 Merge "Revert "Reparent bounds layer if surface was replaced."" into rvc-d1-dev 2020-08-06 01:16:23 +00:00
James Wei
3c127a54bb Merge "UsbAccessory: Update language to comply with Android's inclusive language guidance" 2020-08-06 01:12:04 +00:00
Xin Li
4939ba29f5 Merge "Merge QQ3A.200805.001" am: 4b3c00e75f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1387434

Change-Id: I12420dd6aa080e632f4e3b2748b4970450a4ee72
 2020-08-05 21:19:12 +00:00
Xin Li
4b3c00e75f Merge "Merge QQ3A.200805.001" 2020-08-05 21:05:34 +00:00
Steve Elliott
9058493863 Mark implicit PendingIntents as immutable am: 599c3e4b75 am: fa64ffd0a2 am: 3ff2a5cbd1 am: ec741cf6d2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12296405

Change-Id: I1464de0775bfcabc551d460b2067efec6f7d475e
 2020-08-05 20:55:06 +00:00
Steve Elliott
438c8773b0 Mark implicit PendingIntents as immutable am: 7f0fd285c6 am: ae567e56d8 am: 347ec93c0e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12296406

Change-Id: I10dfcdb8b4f1a200c5b42b6dd817ee19f9569d40
 2020-08-05 20:54:34 +00:00
Steve Elliott
54d2facd6a Merge "Mark implicit PendingIntents as immutable" into rvc-dev am: e35ad478dc am: a64978fe65 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12296407

Change-Id: Ib48040920db7db292bf76ee1f1fca0953c47177a
 2020-08-05 20:54:14 +00:00
Steve Elliott
1af73a8535 Mark implicit PendingIntents as immutable am: 599c3e4b75 am: fa64ffd0a2 am: 3ff2a5cbd1 am: 6cb8e4a157 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12296405

Change-Id: I54690b174f1c16cd008b79389efb02337bc43809
 2020-08-05 20:53:23 +00:00
Steve Elliott
325c62d876 Mark implicit PendingIntents as immutable am: 7f0fd285c6 am: ae567e56d8 am: cff7b95c37 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12296406

Change-Id: Ife9c19be5da3172769cfa261ba7adb772f58550d
 2020-08-05 20:53:14 +00:00
Steve Elliott
0288878d81 Merge "Mark implicit PendingIntents as immutable" into rvc-dev am: e35ad478dc am: 205fd265d0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12296407

Change-Id: I8f1753f75e2597bb434fb580e8b625716efca07d
 2020-08-05 20:53:03 +00:00
Steve Elliott
ec741cf6d2 Mark implicit PendingIntents as immutable am: 599c3e4b75 am: fa64ffd0a2 am: 3ff2a5cbd1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12296405

Change-Id: I0836135d575492f638248350e7811aad05a618bf
 2020-08-05 20:52:47 +00:00
Steve Elliott
6cb8e4a157 Mark implicit PendingIntents as immutable am: 599c3e4b75 am: fa64ffd0a2 am: 3ff2a5cbd1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12296405

Change-Id: I97946675a0cad34c0e6852ac4c28e8a7f8096c5a
 2020-08-05 20:52:35 +00:00
Steve Elliott
3ff2a5cbd1 Mark implicit PendingIntents as immutable am: 599c3e4b75 am: fa64ffd0a2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12296405

Change-Id: Ic0d9e93413dc96be874ff7de5d818db1b20ec24e
 2020-08-05 20:37:35 +00:00
Steve Elliott
cff7b95c37 Mark implicit PendingIntents as immutable am: 7f0fd285c6 am: ae567e56d8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12296406

Change-Id: I735f5f35f4951fa39689594240cfc63e1ca12fe9
 2020-08-05 20:26:36 +00:00
Steve Elliott
205fd265d0 Merge "Mark implicit PendingIntents as immutable" into rvc-dev am: e35ad478dc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12296407

Change-Id: I6eeeade5c75601576d89b31e5a968145e330b52f
 2020-08-05 20:26:25 +00:00
Steve Elliott
347ec93c0e Mark implicit PendingIntents as immutable am: 7f0fd285c6 am: ae567e56d8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12296406

Change-Id: Ibd97acf470e3a638fbf7617be6e6ab3ec66734bc
 2020-08-05 20:26:22 +00:00
Steve Elliott
a64978fe65 Merge "Mark implicit PendingIntents as immutable" into rvc-dev am: e35ad478dc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12296407

Change-Id: I610bb89c74617468df9ead099fb7c9fab1680b98
 2020-08-05 20:26:08 +00:00
Steve Elliott
fa64ffd0a2 Mark implicit PendingIntents as immutable am: 599c3e4b75 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12296405

Change-Id: I97e44abd90dd662e53443e0d8eb6535fdaaea877
 2020-08-05 20:25:51 +00:00