Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
550,089 Commits 3 Branches 0 Tags
496ee0209600a581cf7fd67a0d2c8e79ba5897a1
Commit Graph

550089 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
496ee02096 Merge "[automerger skipped] Resolve the endpoint in legacy VPN am: 002944f78e am: 926a2a40cf -s ours" into rvc-qpr-dev-plus-aosp 2020-08-07 06:54:59 +00:00
Automerger Merge Worker
e7ccdf2aca Merge "[automerger skipped] Resolve the endpoint in legacy VPN am: 002944f78e -s ours am: b07add8ebc -s ours" into rvc-qpr-dev-plus-aosp 2020-08-07 06:54:54 +00:00
Chalard Jean
2523203757 [automerger skipped] Resolve the endpoint in legacy VPN am: 002944f78e am: 926a2a40cf -s ours 
am skip reason: Change-Id I96691f6091c43377f23a00621242ed034fcb0444 with SHA-1 9da9925389 is in history

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

Change-Id: I9ecb2fdf57554028c60084f6ed86f2e4d08fc387
 2020-08-07 06:54:54 +00:00
Automerger Merge Worker
3e5500dc34 Merge "[automerger skipped] Add a test for starting the legacy VPN. am: c9e026f4e9 am: 6995503731 -s ours" into rvc-qpr-dev-plus-aosp 2020-08-07 06:54:48 +00:00
Chalard Jean
8bab75e200 [automerger skipped] Resolve the endpoint in legacy VPN am: 002944f78e -s ours am: b07add8ebc -s ours 
am skip reason: Change-Id I96691f6091c43377f23a00621242ed034fcb0444 with SHA-1 9da9925389 is in history

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

Change-Id: Ie5b037df1d53019c773ecebf7db9d38dd9dd8df0
 2020-08-07 06:54:29 +00:00
Chalard Jean
a07af16637 [automerger skipped] Add a test for starting the legacy VPN. am: c9e026f4e9 am: 6995503731 -s ours 
am skip reason: Change-Id I3c4a94181bd71df68121fa0f71669fa4fa588bdd with SHA-1 4d64450516 is in history

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

Change-Id: Ifee93b0591d129129731d6dcf9c47e0a6ca2f5a9
 2020-08-07 06:54:27 +00:00
Chalard Jean
ad43b35e35 [automerger skipped] Add a test for starting the legacy VPN. am: c9e026f4e9 -s ours am: 6786885985 -s ours 
am skip reason: Change-Id I3c4a94181bd71df68121fa0f71669fa4fa588bdd with SHA-1 4d64450516 is in history

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

Change-Id: Ic7c62d74001747f8983b9e6585de1ddbda16b06e
 2020-08-07 06:54:10 +00:00
Chalard Jean
926a2a40cf Resolve the endpoint in legacy VPN am: 002944f78e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12325669

Change-Id: I31744fca265bd28d01562003c507f4214278285c
 2020-08-07 06:45:07 +00:00
Chalard Jean
b07add8ebc [automerger skipped] Resolve the endpoint in legacy VPN am: 002944f78e -s ours 
am skip reason: Change-Id I96691f6091c43377f23a00621242ed034fcb0444 with SHA-1 9da9925389 is in history

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

Change-Id: If767dc2c9fd68e0a6610a42319f2a61d7fb60c1f
 2020-08-07 06:45:05 +00:00
Chalard Jean
6995503731 Add a test for starting the legacy VPN. am: c9e026f4e9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12330622

Change-Id: Id1d6c6405563dc8ab3d6ac9c2cd8dabf19dc9f74
 2020-08-07 06:44:57 +00:00
Chalard Jean
6786885985 [automerger skipped] Add a test for starting the legacy VPN. am: c9e026f4e9 -s ours 
am skip reason: Change-Id I3c4a94181bd71df68121fa0f71669fa4fa588bdd with SHA-1 4d64450516 is in history

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

Change-Id: Ieff977b6742a93b3a8f335ff6022cf1fbdcec2e7
 2020-08-07 06:44:53 +00:00
Chalard Jean
002944f78e 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: I90bec6d85706fa9b2f9a01f81701138a54347005
Merged-In: I96691f6091c43377f23a00621242ed034fcb0444
(cherry picked from commit 8ab570d9c9)
 2020-08-07 06:43:22 +00:00
Lorenzo Colitti
f453719006 Merge "Fix fd leak in KeepaliveTracker." am: 4f1a3c1c74 am: af8f6f7111 am: f3ced351f0 am: 7b01e919c3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1361907

Change-Id: Idee2fcb96d2b94120d5b53b8d402faa11c94d142
 2020-08-07 06:30:11 +00:00
Lorenzo Colitti
7b01e919c3 Merge "Fix fd leak in KeepaliveTracker." am: 4f1a3c1c74 am: af8f6f7111 am: f3ced351f0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1361907

Change-Id: I69f4f8073b057f294e0665ab7b1dcf57818d3089
 2020-08-07 06:17:00 +00:00
Sudheer Shanka
59bf36c71e Merge "Postpone updating idle states to after the boot." into rvc-qpr-dev am: 77c54c7c4b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12204314

Change-Id: Ie98696f856461e5e9f969f1218a184f2c713ec14
 2020-08-07 06:07:33 +00:00
Lorenzo Colitti
f3ced351f0 Merge "Fix fd leak in KeepaliveTracker." am: 4f1a3c1c74 am: af8f6f7111 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1361907

Change-Id: I68dcb3da95c803179733861604e092582eefb254
 2020-08-07 06:02:12 +00:00
Sudheer Shanka
77c54c7c4b Merge "Postpone updating idle states to after the boot." into rvc-qpr-dev 2020-08-07 05:53:12 +00:00
Lorenzo Colitti
af8f6f7111 Merge "Fix fd leak in KeepaliveTracker." am: 4f1a3c1c74 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1361907

Change-Id: I13df61b292a9ec964854641ba170d39caf66125a
 2020-08-07 05:48:00 +00:00
Lorenzo Colitti
4f1a3c1c74 Merge "Fix fd leak in KeepaliveTracker." 2020-08-07 05:40:33 +00:00
Chalard Jean
c9e026f4e9 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: I96f4bbb9b109e3e5813d083bed1989d88fb156b8
Merged-In: I3c4a94181bd71df68121fa0f71669fa4fa588bdd
(cherry picked from commit dece7f3f74)
 2020-08-07 05:11:43 +00:00
Puma Hsu
b1204095ec Merge "Update language to comply with Android's inclusive language guidance" am: b8017c9d03 am: cbc7b156b2 am: 185d02ec5d am: a9d3817d69 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382480

Change-Id: If055ea9f7a1a45cf0f1e82deda99178f88ace2ec
 2020-08-07 03:40:21 +00:00
Puma Hsu
a9d3817d69 Merge "Update language to comply with Android's inclusive language guidance" am: b8017c9d03 am: cbc7b156b2 am: 185d02ec5d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382480

Change-Id: Ib364c43dc446a87ea9f76fccc634d35e90c8042a
 2020-08-07 03:26:30 +00:00
Josh Gao
a67198dbfd Fix fd leak in KeepaliveTracker. 
The semantics of FileDescriptor in AIDL are that the callee must close
the file descriptor it receives manually.

Bug: http://b/157789860
Test: treehugger
Change-Id: Ice9fc9abe2959a84ad138a95c900dff676653665
 2020-08-07 03:22:38 +00:00
Puma Hsu
185d02ec5d Merge "Update language to comply with Android's inclusive language guidance" am: b8017c9d03 am: cbc7b156b2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382480

Change-Id: Ia235f0faf642f5752e9c169c3383c37219e735a6
 2020-08-07 03:07:01 +00:00
Puma Hsu
cbc7b156b2 Merge "Update language to comply with Android's inclusive language guidance" am: b8017c9d03 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382480

Change-Id: Ia0c937717d130ea844bab629c744e32201991610
 2020-08-07 02:54:33 +00:00
Puma Hsu
b8017c9d03 Merge "Update language to comply with Android's inclusive language guidance" 2020-08-07 02:39:26 +00:00
TreeHugger Robot
378f8ebf58 Merge "Fix isAutoRevokeWhitelisted api to ignore manifest declaration" into rvc-qpr-dev am: 3315572d89 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12327431

Change-Id: I0dd01e822e1ba7cba3c3fe59cefbae2bc40ff3fe
 2020-08-07 01:21:06 +00:00
TreeHugger Robot
3315572d89 Merge "Fix isAutoRevokeWhitelisted api to ignore manifest declaration" into rvc-qpr-dev 2020-08-07 01:06:24 +00:00
TreeHugger Robot
c77b4cc610 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 2b9317eab8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ica829eebff3ca08b2411cb7719367983315f09fc
 2020-08-06 23:51:44 +00:00
TreeHugger Robot
1410b4a395 Merge "Allow permission controller to read audio configuration" into rvc-qpr-dev am: b7e594e9f1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12308439

Change-Id: I86aecf16784baf432aecd60f3a35f818d8ad9734
 2020-08-06 23:50:59 +00:00
TreeHugger Robot
c56f90df74 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: b82ba472f7 -s ours am: 861c8740b8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id84d9a20a82bcc54c957f82f9ee9397149531b88
 2020-08-06 23:50:45 +00:00
TreeHugger Robot
2b9317eab8 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2020-08-06 23:45:03 +00:00
TreeHugger Robot
b7e594e9f1 Merge "Allow permission controller to read audio configuration" into rvc-qpr-dev 2020-08-06 23:44:39 +00:00
TreeHugger Robot
d1f2edacfb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: b82ba472f7 -s ours am: 4ad709d3c0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1cd0f86b206383b328094d703123f68d7602e390
 2020-08-06 23:39:50 +00:00
TreeHugger Robot
4943ca08d5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 8a4feceedb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I813af55560f143302fc1965dce80069841536e13
 2020-08-06 23:39:41 +00:00
TreeHugger Robot
4ad709d3c0 [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: Ia08ec6badb2ac10a8892e7a67acff4b11bda882f
 2020-08-06 23:36:03 +00:00
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
8a4feceedb Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2020-08-06 23:23: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
Tiger Huang
c8f8eefeab Merge "Dispatch insets to client if mState is changed" into rvc-qpr-dev am: 046b604fd4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12239625

Change-Id: I836a29f8662ab19756d3e7401f2582c26b7fdd8e
 2020-08-06 21:11:46 +00:00
TreeHugger Robot
1d95dc53bc Merge "Make system-generated FGS notification PendingIntents immutable" into rvc-qpr-dev am: 895dbfa8ef 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11708354

Change-Id: I0a30217ea8698905e4c5879d3fc7c3ba9622e0ea
 2020-08-06 21:10:30 +00:00
Tiger Huang
046b604fd4 Merge "Dispatch insets to client if mState is changed" into rvc-qpr-dev 2020-08-06 20:58:40 +00:00
TreeHugger Robot
895dbfa8ef Merge "Make system-generated FGS notification PendingIntents immutable" into rvc-qpr-dev 2020-08-06 20:51:26 +00:00
Eugene Susla
9b1ead5c29 Fix isAutoRevokeWhitelisted api to ignore manifest declaration 
This behavior is a leftover from it was expected we'll
have a manifest-based whitelist

Test: use the app to ensure manifest declaration no longer changes API result
Fixes: 162077344
Change-Id: If613d02c74459d61d9dd7db05ad5c60a129f16e3
 2020-08-06 20:34:33 +00:00
Calin Juravle
7ce562e5c1 [automerger skipped] Merge "Notify IORap without including packages for secondary dex opt." into rvc-dev am: eddf0c94d2 -s ours am: 74cc42dcb1 -s ours am: 484f9ac99f -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: I608822bfea4f58b9f7a1137f88da6d1e4e7bcfad
 2020-08-06 19:58:04 +00:00
Calin Juravle
274178f3fc [automerger skipped] Merge "Notify IORap without including packages for secondary dex opt." into rvc-dev am: eddf0c94d2 am: 724d8f1740 -s ours am: 11f352b4d7 -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: Iea22ad294aedfa531cad6204f2df436f6a3c4245
 2020-08-06 19:57:14 +00:00
Calin Juravle
f65d20e7f6 [automerger skipped] Merge "Notify IORap without including packages for secondary dex opt." into rvc-dev am: eddf0c94d2 -s ours am: 74cc42dcb1 -s ours am: e0dfb2ce74 -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: Ibe3292c5e3906b95ef53ef083e8fe2e3f1eeba8f
 2020-08-06 19:56:56 +00:00
Calin Juravle
484f9ac99f [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: I84c6d4b86b84e2a97ab179507c3e625b8a21cee4
 2020-08-06 19:37:20 +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