Commit Graph

449246 Commits

Author SHA1 Message Date
Treehugger Robot
dd1415bbcd Merge "Update language to comply with Android's inclusive language guidance" 2020-08-12 11:59:45 +00:00
Lais Andrade
1077de0092 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: Icee71d95970b20776b34bc9873a665662da2ae03
2020-08-12 09:49:03 +00:00
Chiachang Wang
2dd299c5db Merge "Update language to comply with Android's inclusive language guidance" 2020-08-12 09:30:11 +00:00
Paul Hu
06697e0c43 Merge "[RFPM05] Add UidNetdPermissionInfo class" 2020-08-12 06:17:46 +00:00
Chiachang Wang
97698a6fc5 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 ; atest FrameworkNetTests
Change-Id: Ib6b4c9526992c31e05e82be80e2b9b86bc0b57ef
2020-08-12 12:23:59 +08:00
paulhu
26263b3cd0 [RFPM05] Add UidNetdPermissionInfo class
Add UidNetdPermissionInfo class to store netd permission info of
each uid. Use the bit mask for combining all netd permission into
one value which can update and get the uid permission easily.
Moreover, aosp/1340042 add carryover package info into this class
which centralizes all netd permissions relevant data.

Bug: 132784544
Test: atest FrameworksNetTests
Change-Id: I3b81ea2a5017e8f4d0d603144a33c9b08640d7ba
2020-08-12 10:33:18 +08:00
Treehugger Robot
bad5c4ec49 Merge "Update language to comply with Android's inclusive language guidance" 2020-08-11 08:10:58 +00:00
Sooraj Sasindran
922e9bfd95 Merge changes from topic "move-inflate-ss-to-cc"
* changes:
  Remove config_inflateSignalStrength
  Move config_inflateSignalStrength to CC
2020-08-11 00:03:09 +00:00
Treehugger Robot
b34c1fe4ba Merge "Update Dagger2 dependencies." 2020-08-10 23:41:18 +00:00
Treehugger Robot
e3b0b6d007 Merge "Parcelable getStability SystemApi MODULE_LIBRARIES" 2020-08-10 20:22:05 +00:00
Hasini Gunasinghe
d64ab1853d Merge "Add KeystoreKeyEventReported atom for keystore logging." 2020-08-10 15:09:49 +00:00
Paul Hu
f623c1e2c2 Merge "Verify pending intent flags" 2020-08-10 01:32:12 +00:00
Treehugger Robot
38edcd001a Merge "Add alecmouri@ to libhwui OWNERS" 2020-08-07 21:10:16 +00:00
Alec Mouri
bee43f5b19 Add alecmouri@ to libhwui OWNERS
Also alphabetize

Change-Id: Iadf6de2c2cec1ab50ef91c9b548b1087506dae9c
2020-08-07 19:38:47 +00:00
Treehugger Robot
4ec7604b48 Merge "Add KEYCODE_PROG_{BLUE,RED,GREEN,YELLOW} mappings to LKC equivalents" 2020-08-07 16:54:11 +00:00
Treehugger Robot
8f0008900d Merge "Fixed how com.android.server.pm.Settings handle pre-created users." 2020-08-07 16:23:36 +00:00
Treehugger Robot
3ca2400a53 Merge "Refactor of PointerController" 2020-08-07 16:20:14 +00:00
Chalard Jean
e286c5e1ef Merge changes I33b70b0a,I1074eedb
* changes:
  Remove the services.net-module-wifi module target.
  Revert "Revert "Move Inet[4]AddressUtils to libs/net""
2020-08-07 06:45:15 +00:00
Chalard Jean
90fd266418 Remove the services.net-module-wifi module target.
Test: still builds
Change-Id: I33b70b0a624b6ab786f4c584592d839309eaac3e
Merged-In: Icd141a992c46290c74929785e261a1cd57bc001b
2020-08-07 06:45:02 +00:00
Lorenzo Colitti
4f1a3c1c74 Merge "Fix fd leak in KeepaliveTracker." 2020-08-07 05:40:33 +00:00
wilsonshih
d9bebe5cfd 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: I8549339772c2199d35b43719c1a88872697629ab
2020-08-07 11:47:33 +08:00
Chalard Jean
be00709344 Revert "Revert "Move Inet[4]AddressUtils to libs/net""
This patch is still needed and should go in now that the
error is fixed.
The patch was submitted into rvc-dev and is already in
rvc-dev-plus-aosp (patch in in ag/11923559, revert
skipped in ag/12072199). A follow-up will remove the
unused services.net-module-wifi target.

Test: originally tested in aosp/1324109
Test: m; manual: flashed, wifi and telephony working
Test: atest NetworkStackCoverageTests
Change-Id: I1074eedb0b0f156a1135e11210ec102de15ea674
Merged-In: Icd141a992c46290c74929785e261a1cd57bc001b
2020-08-07 03:31:04 +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
b8017c9d03 Merge "Update language to comply with Android's inclusive language guidance" 2020-08-07 02:39:26 +00:00
Steven Moreland
7542475521 Parcelable getStability SystemApi MODULE_LIBRARIES
This method is intentionally overridden by subclasses. The
infrastructure doesn't detect that this is happening, but we should
still annotate this as part of the API.

As requested by API review council.

Bug: 162811168
Test: build only
Change-Id: I27714a93b71108cc0cc62fc858c260e2a6920ba9
2020-08-06 21:22:15 +00:00
Liam Harrington
c782be6e6f Refactor of PointerController
Abstracted logic that applies to all pointer types into general
PointerController class and moved implementation of logic specific
to the mouse cursor and touch spots to MouseCursorController and
TouchSpotController, respectively.
Test: Pixel 3XL device, atest PointerController_test, compile

Change-Id: Ia5825c37ca75951cc8bcd7d5102c986bd957e69f
2020-08-06 20:22:26 +00:00
felipeal
2b8bf40f60 Fixed how com.android.server.pm.Settings handle pre-created users.
Its getAllUsers() method was not returning pre-created users, so
packages installed for a "regular" user were not marked as
"installed=false" for the pre-created users. Hence, when the
pre-created was "promoted" to a full user, it contained such
packages.

Here's how to reproduce the issue:

$ m -j ApiDemos

$ adb shell pm create-user --pre-create-only
Success: created user id 10

$ adb install --user cur $OUT/testcases/ApiDemos/arm64/ApiDemos.apk
Performing Streamed Install
Success

$ adb shell pm list packages --user cur | grep com.example.android.apis || echo
package:com.example.android.apis

$ adb shell pm list packages --user 10 | grep com.example.android.apis || echo "NOT FOUND"
package:com.example.android.apis # Should return "NOT FOUND"

$ adb shell pm create-user FullUserIAm
Success: created user id 10

$ adb shell pm list packages --user 10 | grep com.example.android.apis || echo "NOT FOUND"
package:com.example.android.apis # Should return "NOT FOUND"

With this fix, it returns "NOT FOUND" in the expected steps.

Fixes: 160252062
Fixes: 162847145
Test: see above

Merged-In: I6cd17ac588a4d95bf0ea704dd18387e19eeab374
Change-Id: I6cd17ac588a4d95bf0ea704dd18387e19eeab374
(cherry picked from commit 00175974ba24d982ecfe760ee78a1a17bb326d04)
2020-08-06 10:12:24 -07:00
Aman Gupta
7395b0a265 Add KEYCODE_PROG_{BLUE,RED,GREEN,YELLOW} mappings to LKC equivalents
My goal is to allow colored keys on HDMI-CEC and Bluetooth remotes to be used by an Android TV app.

The USB HID spec [1] and CEC spec [2] both define distinct codes for these keys.

The kernel converts both the HID [4] and CEC [5] codes to standard LKC codes [6]:

  #define KEY_RED		0x18e
  #define KEY_GREEN		0x18f
  #define KEY_YELLOW	0x190
  #define KEY_BLUE		0x191

Android also defines KEYCODE_PROG_ constants for these keys in KeyEvent.java [3]. This commit maps these LKC codes starting at 0x18e (i.e 398) to the existing KeyEvent equivalents.

[1] https://www.usb.org/sites/default/files/color_buttons_0.pdf
[2] https://github.com/floe/CEC/raw/master/extras/CEC_Specs.pdf
[3] https://github.com/aosp-mirror/platform_frameworks_base/blob/master/core/java/android/view/KeyEvent.java#L539-L550
[4] https://github.com/torvalds/linux/blob/master/drivers/hid/hid-input.c#L897-L900
[5] https://github.com/torvalds/linux/blob/master/drivers/media/rc/keymaps/rc-cec.c#L142-L145
[6] https://github.com/torvalds/linux/blob/master/include/uapi/linux/input-event-codes.h#L470-L473

Signed-off-by: Aman Gupta <aman@tmm1.net>
Change-Id: I26c63732c8533390de91460acec312fd27ad8866
2020-08-06 08:03:19 -07: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
Puma Hsu
15630c0b43 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: I1eeee50e4c67ed176d464ef7252adac9fb99c31f
2020-08-06 06:13:51 +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
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