Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
575,282 Commits 3 Branches 0 Tags
5f6aa76ca2b0ea1375bec8fcb4c07a539a5c82fc
Commit Graph

575282 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
5f6aa76ca2 Merge "[automerger skipped] Resolve the endpoint in legacy VPN am: 002944f78e -s ours am: b07add8ebc -s ours" into rvc-qpr-dev-plus-aosp am: e7ccdf2aca -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: I4e4ebec9b206d6511e3c82796d1d31e0fb79ec9c
 2020-08-07 07:04:44 +00:00
Automerger Merge Worker
3393c9629c Merge "[automerger skipped] Add a test for starting the legacy VPN. am: c9e026f4e9 am: 6995503731 -s ours" into rvc-qpr-dev-plus-aosp am: 3e5500dc34 -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: I40b47a0c828172ffdc19ca04820138048a0f720a
 2020-08-07 07:04:32 +00:00
Chalard Jean
0df12416a7 [automerger skipped] Add a test for starting the legacy VPN. am: c9e026f4e9 -s ours am: 6786885985 -s ours am: ad43b35e35 -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: I1709251d8a3cc1990c12436ed6c4c712a193d493
 2020-08-07 07:04:01 +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
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
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
Hui Yu
d1151ce050 Merge "Set mAllowWhileInUsePermissionInFgs correctly when bindService() from background." 2020-08-07 06:42:12 +00:00
Lorenzo Colitti
db8ae41da2 Merge "Fix fd leak in KeepaliveTracker." am: 4f1a3c1c74 am: af8f6f7111 am: f3ced351f0 am: 7b01e919c3 am: f453719006 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1361907

Change-Id: Ie486543475b0e4e8227f71aea47000da14979e5f
 2020-08-07 06:39:05 +00:00
Wei Sheng Shih
9e4adbcf04 Merge "Don't send onMultiWindowModeChanged if relaunch activity." 2020-08-07 06:38:39 +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
Sudheer Shanka
1aeabd05be [automerger skipped] Merge "Postpone updating idle states to after the boot." into rvc-qpr-dev am: 77c54c7c4b am: 59bf36c71e -s ours 
am skip reason: Change-Id Ic22e1e7bf3356d523a37ca41a234aefc5d738ec5 with SHA-1 88338ff080 is in history

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

Change-Id: Ia5b6f7fdd4f4a04c9f2d56ef3c1442de3f43a69d
 2020-08-07 06:17:23 +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
TreeHugger Robot
9dd69675ef Merge "Allow controlling the SDR white point" 2020-08-07 04:16:26 +00:00
Puma Hsu
708294a7ad Merge "Update language to comply with Android's inclusive language guidance" am: b8017c9d03 am: cbc7b156b2 am: 185d02ec5d am: a9d3817d69 am: b1204095ec 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382480

Change-Id: I15fe04f74c0ce6ba1f161bd197a7b91fd4c389d4
 2020-08-07 03:54:57 +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
Jackal Guo
9331691079 Merge "Remove orphaned cached result" 2020-08-07 01:46:59 +00:00
TreeHugger Robot
25b0b6c757 Merge "Fix isAutoRevokeWhitelisted api to ignore manifest declaration" into rvc-qpr-dev am: 3315572d89 am: 378f8ebf58 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12327431

Change-Id: I8b4343af60af30995f4e4a6957c17e43cb9c0b2c
 2020-08-07 01:36:23 +00:00
TreeHugger Robot
1d3f53ff8a Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-08-07 01:27:06 +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
Kyunglyul Hyun
8855e78ad8 Merge "Add @SystemApi to MediaSession.FLAG_EXCLUSIVE_GLOBAL_PRIORITY" 2020-08-07 01:20:47 +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
4a091584c8 Merge "Non-priv apps are not allowed to use always/never lock task mode" 2020-08-07 01:04:07 +00:00
Hyundo Moon
c44a3147c9 Merge "Remove hidden RemoteControlClient constant usages in MediaRouter" 2020-08-07 01:00:19 +00:00
Phil Weaver
59b0eb4201 Merge "Enable two-finger passthrough swipes." 2020-08-07 00:33:41 +00:00
John Reck
f42ff762f2 Allow controlling the SDR white point 
Test: this
Change-Id: I9ee059afd73ca0850e41072c068c9effe8362382
 2020-08-06 17:32:10 -07:00
Hui Yu
189bfb6f5c Set mAllowWhileInUsePermissionInFgs correctly when bindService() from background. 
Pass original callingPid and callingUid into
shouldAllowWhileInUsePermissionInFgsLocked() after
Binder.clearCallingIdentity().

Bug: 163084228
Test: atest cts/tests/app/src/android/app/cts/ActivityManagerFgsBgStartTest.java#testFgsLocationStartFromBGWithBind
Change-Id: I7a240621267648ea54e7dc737ebc55bc665e39b6
 2020-08-06 17:20:16 -07:00
Ruslan Tkhakokhov
47f61fc964 Merge changes from topic "fsd2d-backup-agent" 
* changes:
  [FSD2D] Pass @OperationType at agent creation in B&R code
  [FSD2D] Adjust backup agent creation for device-to-device migrations
 2020-08-07 00:18:51 +00:00
TreeHugger Robot
6b4cf956e3 Merge "Don't create unnecessary objects." 2020-08-07 00:04:30 +00:00
TreeHugger Robot
5605ab66d7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 2b9317eab8 -s ours am: c77b4cc610 -s ours 
am skip reason: subject contains skip directive

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

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

Change-Id: I2d0d169dd892081ff22edb5bd90219f47ff66321
 2020-08-06 23:52:36 +00:00
Chavi Weingarten
d7569e699c Merge "Capture secure layers in SurfaceFreezer" 2020-08-06 23:52:20 +00:00
TreeHugger Robot
65ac105f63 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: b82ba472f7 -s ours am: 861c8740b8 -s ours am: c56f90df74 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I40f86ac89a239e723e26171b3786276365475d14
 2020-08-06 23:51:59 +00:00
TreeHugger Robot
967d941825 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: b82ba472f7 -s ours am: 4ad709d3c0 -s ours am: d1f2edacfb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idb0b9ce8663bb4be108dec01ef28255b9c48b932
 2020-08-06 23:51:49 +00:00