Commit Graph

449213 Commits

Author SHA1 Message Date
Orion Hodson
7cebdeeb53 profman: inclusive language updates
Based on:
  https://source.android.com/setup/contribute/respectful-code

Bug: 161336379
Bug: 161896447
Test: m
Change-Id: Iaf7db2f76d8979f1ccc06c7e9e705b69c1f8069d
2020-08-17 15:35:31 +01: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
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
4b3c00e75f Merge "Merge QQ3A.200805.001" 2020-08-05 21:05:34 +00:00
Xin Li
da7d27b21e Merge QQ3A.200805.001
Bug: 162879794
Merged-In: I6e0bdc8c02bab54f6278096b3a3acadd97c064c6
Change-Id: Idbcffbd09045575e92297fd6e0071a56a4e3cbae
2020-08-05 17:40:02 +00:00
Christian Wailes
0f2d849c39 Merge "Rename blacklist to denylist" 2020-08-05 17:32:00 +00:00
Treehugger Robot
830c70ad25 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" 2020-08-05 16:23:51 +00:00
Andrei-Valentin Onea
f6d191c250 Merge "Rename manual hidden api lists" 2020-08-05 12:42:18 +00:00
Lais Andrade
efd27a83f5 Merge "Fix typo on View.verifyDrawable method javadoc" 2020-08-05 11:52:34 +00:00
Lais Andrade
50ef151f8b Fix typo on View.verifyDrawable method javadoc
Fix: b/157335615
Test: N/A, only changing documentation
Change-Id: I30f869bdaac5fb6b87ea56a4416e619b46565113
2020-08-05 08:20:08 +00:00
Mark Chien
5063505fab Merge "Allow wifi p2p to use legacy dedicated address" 2020-08-05 06:01:37 +00:00
James Wei
7ac1d04720 UsbAccessory: Update language to comply with Android's inclusive language guidance
See https://source.android.com/setup/contribute/respectful-code for reference


BUG=162536543

Change-Id: I2650d273d7959e9cbe00518b364e57d0084abd92
2020-08-05 03:24:46 +00:00
markchien
c09b057fb6 Allow wifi p2p to use legacy dedicated address
Some exsting applications may expect wifi p2p use legacy
"192.168.49.1/24" address. Have a configuration for wifi p2p to
decide whether to use legacy dedicated address or random address.

Bug: 161520826
Test: atest TetheringTests
Change-Id: If79973416a6780ee19ee785c65772b1a2dc1fbf7
2020-08-05 11:03:46 +08:00
Paul McLean
79de4d7ec9 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

Update language to comply with Android's inclusive language guidance

See https://source.android.com/setup/contribute/respectful-code for reference

Bug: 161896447
Bug: 162315796
Test: Build, flash...
Change-Id: I4b3affce57ba61ad9697e91f2a5f63556ee1cd62
Merged-in: I4b3affce57ba61ad9697e91f2a5f63556ee1cd62
2020-08-04 23:32:44 +00:00
repo sync -c -j8
8d2ad2176f Rename blacklist to denylist
Test: no new test
Change-Id: If8bb7c923f1ce8d8ce8c3142bf1b674982a96573
Merged-In: If8bb7c923f1ce8d8ce8c3142bf1b674982a96573
2020-08-04 21:42:25 +00:00
Treehugger Robot
4aedb4cdad Merge "Use -target 8 for android_uiautomator" 2020-08-04 19:42:02 +00:00
Liz Kammer
a17375d057 Merge "Remove create_stubs: false from droiddoc" 2020-08-04 18:35:43 +00:00
Colin Cross
43ffc371f6 Use -target 8 for android_uiautomator
android_uiautomator is distributed as part of the SDK and should use
-target 8 for compatibility with old JDKs.

Bug: 150153790
Bug: 162522383
Test: javap -v -cp out/target/common/obj/JAVA_LIBRARIES/android_uiautomator_intermediates/classes.jar com.android.uiautomator.core.Configurator | grep "major version"
Change-Id: I6871ab5436232ad3bffff6bd26adf2de6b3c06ff
Merged-In: I6871ab5436232ad3bffff6bd26adf2de6b3c06ff
(cherry picked from commit 51387a027d)
2020-08-04 10:38:39 -07:00
Treehugger Robot
229720aee5 Merge "Update Visualizer implementation after changes in AudioEffect" 2020-08-04 17:25:30 +00:00
Jonathan Nieder
0b778939c7 Merge "Fix typo "thew" -> "threw" in AndroidTestRunner" 2020-08-04 14:35:43 +00:00
Andrei Onea
efd326d8bb Rename manual hidden api lists
Use newer terminology, as specified here: go/hiddenapi-list-renaming

Test: m
Bug: 162827370
Change-Id: Id273b975b9683c2a5ae2f6e34e703df5d8b8179c
2020-08-04 15:02:24 +01:00
Orion Hodson
6066f5dae1 Merge changes from topic "art-owners-update"
* changes:
  Update startop OWNERS file
  Update art-team members in pm OWNERS file
2020-08-04 13:17:58 +00:00
Orion Hodson
432dd133d1 Update startop OWNERS file
Test: build/make/tools/checkowners.py -c -v frameworks/base/startop/OWNERS
Change-Id: I5ed92452adea4d349843b5eb7ec199117c6a2a59
2020-08-04 08:02:04 +00:00
Orion Hodson
72d884b80f Update art-team members in pm OWNERS file
Test: build/make/tools/checkowners.py -c -v frameworks/base/services/core/java/com/android/server/pm/OWNERS
Change-Id: I8b5b8b09b425e52c15340af07771ee89c5807854
2020-08-04 07:36:40 +00:00
Ryan Chan
458aed0508 Fix typo "thew" -> "threw" in AndroidTestRunner
Change-Id: I63899c42fac7f52866a2d2f6db060cf7918547c8
2020-08-03 22:17:07 -07:00
Treehugger Robot
f08b133000 Merge "Update language to comply with Android's inclusive language guidance" 2020-08-04 03:47:36 +00:00
Mikhail Naganov
1c1667bff4 Update Visualizer implementation after changes in AudioEffect
AudioEffect was fixed to remove a call to AudioEffect::set
away from the constructor.

Bug: 162012829
Bug: 162323621
Test: repro steps from the bug
      atest android.media.cts.VisualizerTest
Change-Id: I90ac6e4fe0a1229758a98a63a3b7810de60469be
Merged-In: I90ac6e4fe0a1229758a98a63a3b7810de60469be
2020-08-03 23:45:13 +00:00
Liz Kammer
16f2f94b7e Remove create_stubs: false from droiddoc
`create_stubs: false` is the default behavior in soong as of
https://r.android.com/1380730

Test: m docs
Bug: 144248501
Bug: 143136634
Change-Id: If13de5c0a4071b032bc460f5c57e27819b33051d
2020-08-03 14:48:04 -07:00
Siarhei Vishniakou
21e6488ae7 Merge "Add KEYCODE_MEDIA_AUDIO_TRACK mapping to USB HID Usage consumer page (0x0c/0x173) "Alternate Audio Increment"" 2020-08-03 21:29:08 +00:00
Alex Light
56f5e6595b Merge "Update language to comply with Android's inclusive language guidance" 2020-08-03 20:39:29 +00:00
Lais Andrade
af1750e973 Merge "Change variable name fix from 'endingListener' to 'endListener'" 2020-08-03 18:01:09 +00:00
Alex Light
7b942c1f31 Update language to comply with Android's inclusive language guidance
See https://source.android.com/setup/contribute/respectful-code for reference

Bug: 162536543
Test: Treehugger
Change-Id: I971050a2665c177870ff257bd0f41343db702892
Merged-In: I971050a2665c177870ff257bd0f41343db702892
2020-08-03 17:04:58 +00:00
Lais Andrade
b491f9871c Change variable name fix from 'endingListener' to 'endListener'
Follow up aosp/1382536 by correcting the term used while renaming
a few variables and methods from AnimatorSet.

BUG=162536543

Change-Id: I9b914663790664b3f0de7774864207e90ce3f7a1
2020-08-03 14:04:00 +00:00
Chiachang Wang
a12dd22754 Update language to comply with Android's inclusive language guidance
See https://source.android.com/setup/contribute/respectful-code
for reference.

Bug: 161896447
Test: m
Change-Id: I990a1e98f04ce907ec8150720980980a36eae21a
2020-08-03 13:02:02 +00:00
Paul Hu
89ca9dd063 Merge "[RFPM04] Adjust hasRestrictedNetworkPermission method" 2020-08-03 10:37:52 +00:00
Orion Hodson
63ceb6abdb Merge "Update art-team members in OWNERS files" 2020-08-03 08:18:39 +00:00
Treehugger Robot
e803bb122f Merge "Update language to comply with Android's inclusive language guidance" 2020-08-03 01:27:50 +00:00
Treehugger Robot
4e6e7d7238 Merge "Update language to comply with Android's inclusive language guidance" 2020-08-02 22:19:05 +00:00
Treehugger Robot
dab3aaa5c6 Merge "Add support for Razer Kishi game controller." 2020-08-01 12:29:58 +00:00
Chris Ye
d91a29ac36 Add support for Razer Kishi game controller.
Add Razer Raiju Kishi controller keyboard layout mapping.

Bug: 140958486
Test: Connect Razer Kishi controller and play game with it.
Change-Id: I6f94e212fe10f777f04ad9815468e2148d4252f5
Merged-In: I6f94e212fe10f777f04ad9815468e2148d4252f5
2020-08-01 04:38:14 +00:00
Treehugger Robot
8ee49446ef Merge "Add support for Scuf Vantage game controller." 2020-08-01 04:36:44 +00:00
Chris Ye
b07e2f8093 Add support for Scuf Vantage game controller.
Add Scuf Vantage controller keyboard layout mapping.

Bug: 155223457
Test: ControllerTest App, Connect Scuf Vantage controller and play game with it.
Change-Id: I21d23dcbeb4ef24d212d4e386f6dbf8b1b89d9f6
Merged-In: I21d23dcbeb4ef24d212d4e386f6dbf8b1b89d9f6
2020-08-01 04:35:51 +00:00
Alice Kuo
75a3409546 Update language to comply with Android's inclusive language guidance
See https://source.android.com/setup/contribute/respectful-code for reference

 #inclusivefixit

Bug: 162536543
Change-Id: Id3228be845bffa340fdb0165b567e7cf1759c839
2020-08-01 00:43:39 +00:00
Treehugger Robot
0521eb758a Merge "Update language to comply with Android's inclusive language guidance" 2020-07-31 22:50:33 +00:00
Treehugger Robot
54bac103d2 Merge "address use of DummyIME in UI Automator" 2020-07-31 22:04:02 +00:00
Treehugger Robot
262d80ba06 Merge "Update language to comply with Android’s inclusive language guidance." 2020-07-31 21:34:31 +00:00
Michael Wachenschwanz
134766b33f Update language to comply with Android's inclusive language guidance
See https://source.android.com/setup/contribute/respectful-code for reference

  #inclusivefixit

Bug: 162536543
Change-Id: I478e3aca39be71f6e2df339a7b9702b2a76c9d29
2020-07-31 21:11:45 +00:00