Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
449,577 Commits 3 Branches 0 Tags
50d99fe7c067edcdd76232124753f07cd453926f
Commit Graph

449577 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
50d99fe7c0 Merge "Update language to comply with Android's inclusive language guidance" am: dd1415bbcd 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1398112

Change-Id: I474986ba62b8b0c4ddad8491718aab690a7b2595
 2020-08-12 12:16:21 +00:00
Treehugger Robot
dd1415bbcd Merge "Update language to comply with Android's inclusive language guidance" 2020-08-12 11:59:45 +00:00
Chiachang Wang
0e7aefd000 Merge "Update language to comply with Android's inclusive language guidance" am: 2dd299c5db 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1379156

Change-Id: Iecf8601b2f9e286cefca0675476d0892436d5e5b
 2020-08-12 09:52:30 +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
f23a7a2d14 Merge "[RFPM05] Add UidNetdPermissionInfo class" am: 06697e0c43 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1322556

Change-Id: I91a603d8b37ee750c3f582363bec94977d70014e
 2020-08-12 06:37:34 +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
99ed998f0e Merge "Update language to comply with Android's inclusive language guidance" am: bad5c4ec49 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1393497

Change-Id: If5f29aac921bf42cbb219715e5e35808b8e47d33
 2020-08-11 08:26:11 +00: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
1e14220da2 Merge changes from topic "move-inflate-ss-to-cc" am: 922e9bfd95 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1219720

Change-Id: Ia3b10d7b602819e150cd4c0d7736ad8da446519b
 2020-08-11 00:21:29 +00:00
Mattias Nilsson
b6bd23c222 Move config_inflateSignalStrength to CC am: f8c6f34832 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1219719

Change-Id: I69456375e59c21d3ba56a6af8f934050fab8b615
 2020-08-11 00:21:25 +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
e73de8ccda Merge "Update Dagger2 dependencies." am: b34c1fe4ba 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1365961

Change-Id: I426fd822922c63705405204b90982f3a7a3018cf
 2020-08-10 23:54:24 +00:00
Treehugger Robot
b34c1fe4ba Merge "Update Dagger2 dependencies." 2020-08-10 23:41:18 +00:00
Treehugger Robot
1e16995094 Merge "Parcelable getStability SystemApi MODULE_LIBRARIES" am: e3b0b6d007 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1392003

Change-Id: Idc916d652044a00d7494e17dab2a689de5b7aa61
 2020-08-10 20:36:11 +00:00
Treehugger Robot
e3b0b6d007 Merge "Parcelable getStability SystemApi MODULE_LIBRARIES" 2020-08-10 20:22:05 +00:00
Hasini Gunasinghe
7896d08fec Merge "Add KeystoreKeyEventReported atom for keystore logging." am: d64ab1853d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1316774

Change-Id: I50b97bdd1ef26fbc43d3a45801846243211acb51
 2020-08-10 15:23:53 +00:00
Hasini Gunasinghe
d64ab1853d Merge "Add KeystoreKeyEventReported atom for keystore logging." 2020-08-10 15:09:49 +00:00
Paul Hu
d583f34df1 Merge "Verify pending intent flags" am: f623c1e2c2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1325696

Change-Id: I6764ac9bface86d26f395c6a4fd8b63f7a08df6e
 2020-08-10 01:46:50 +00:00
Paul Hu
f623c1e2c2 Merge "Verify pending intent flags" 2020-08-10 01:32:12 +00:00
Treehugger Robot
ea49092992 Merge "Add alecmouri@ to libhwui OWNERS" am: 38edcd001a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1392715

Change-Id: I25a51fcc04fce6257c3df7d3685ba1cc69774b68
 2020-08-07 21:22:15 +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
ab5d157062 Merge "Add KEYCODE_PROG_{BLUE,RED,GREEN,YELLOW} mappings to LKC equivalents" am: 4ec7604b48 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1388616

Change-Id: I32bb103ca0abdfde5688bc1208294dd1073be8d0
 2020-08-07 17:17:55 +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
22ac3a45ea Merge "Fixed how com.android.server.pm.Settings handle pre-created users." am: 8f0008900d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1393496

Change-Id: I51d38bc7e187c40b512cf3542ac802cb309a9530
 2020-08-07 16:43:22 +00:00
Treehugger Robot
adaedfa3fa Merge "Refactor of PointerController" am: 3ca2400a53 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1364598

Change-Id: I7345f718b827c049072459abebd5b13ddecdd138
 2020-08-07 16:42:40 +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
cbcb46cb87 Merge changes I33b70b0a,I1074eedb am: e286c5e1ef 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1392725

Change-Id: I18869fe6bddd51f77068a91034b524f12c5a3450
 2020-08-07 06:59:30 +00:00
Chalard Jean
62a694f865 Revert "Revert "Move Inet[4]AddressUtils to libs/net"" am: be00709344 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382497

Change-Id: Ia5e7e926bc3a9af8b03f8970738e6abe4c6d15b6
 2020-08-07 06:59:26 +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
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
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
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
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
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
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