Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
516,891 Commits 3 Branches 0 Tags
482802a76a8a902ae0c19fa178568694d8c61b59
Commit Graph

516891 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alec Mouri
482802a76a Support dispatchNullEvent virtual method am: 1315f1105e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12326214

Change-Id: Iffa6b5ea3a62a49ab98207c544ba921f394d795d
 2020-08-07 23:07:34 +00:00
Treehugger Robot
2ce7f8b1dd Merge "Add alecmouri@ to libhwui OWNERS" am: 38edcd001a am: ea49092992 am: 2a98e05f9a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1392715

Change-Id: I48c904ddff3768eb05ef4d789e441945e9f7e78f
 2020-08-07 22:01:09 +00:00
Treehugger Robot
2a98e05f9a Merge "Add alecmouri@ to libhwui OWNERS" am: 38edcd001a am: ea49092992 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1392715

Change-Id: Ie00877e1205be422b467854bea36cc104ea777d9
 2020-08-07 21:43:19 +00:00
Sooraj Sasindran
9da3d65fb3 Merge changes from topic "inflate-signal" into rvc-d1-dev-plus-aosp 
* changes:
  Remove config_inflateSignalStrength
  Move config_inflateSignalStrength to CC
 2020-08-07 21:39:31 +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
1315f1105e Support dispatchNullEvent virtual method 
Added for AChoreographer in I66abc2e28e60f06987ce3a54be294c94b77524fc

Bug: 154874011
Bug: 158680912
Bug: 161406626
Test: builds
Change-Id: Iac1f8eafc4d25a5a7c8b6d8eed3f6686705fc2fb
Merged-In: Iac1f8eafc4d25a5a7c8b6d8eed3f6686705fc2fb
 2020-08-07 21:01:38 +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
c7b8432e5a Merge "Add KEYCODE_PROG_{BLUE,RED,GREEN,YELLOW} mappings to LKC equivalents" am: 4ec7604b48 am: ab5d157062 am: 2db2e500ee 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1388616

Change-Id: I21b9567bf11eda9a678f4b6e2549d8297f395bd9
 2020-08-07 17:33:04 +00:00
Treehugger Robot
875cba236d Merge "Fixed how com.android.server.pm.Settings handle pre-created users." am: 8f0008900d am: 22ac3a45ea am: 8a027191d2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1393496

Change-Id: I92d8e2748b7ce3954646236dcacb318185c7385a
 2020-08-07 17:32:46 +00:00
Treehugger Robot
13d7aeb155 Merge "Refactor of PointerController" am: 3ca2400a53 am: adaedfa3fa am: 15bbc06795 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1364598

Change-Id: I67566cbe5e398c2da24dad800efe3d3136fe4cd3
 2020-08-07 17:32:14 +00:00
Treehugger Robot
2db2e500ee Merge "Add KEYCODE_PROG_{BLUE,RED,GREEN,YELLOW} mappings to LKC equivalents" am: 4ec7604b48 am: ab5d157062 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1388616

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

Change-Id: I46453773f083eaa4e3a8988ee1a496d79f756dc7
 2020-08-07 17:10:27 +00:00
Treehugger Robot
15bbc06795 Merge "Refactor of PointerController" am: 3ca2400a53 am: adaedfa3fa 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1364598

Change-Id: I46f3a14b56c18ae2977791e81ea5d768f5e163f3
 2020-08-07 17:09:31 +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
Yanting Yang
3b0453b440 Merge "Skip loading tiles from non-current user if primary profile only" into rvc-d1-dev am: 550d625622 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12316857

Change-Id: Ia357cca1e7d7af18daca43da420e3acfbe8c5198
 2020-08-07 12:18:33 +00:00
Yanting Yang
550d625622 Merge "Skip loading tiles from non-current user if primary profile only" into rvc-d1-dev 2020-08-07 12:08:11 +00:00
Santiago Seifert
70070892cc Merge "Add updatable-media jarjar rules to framework-all" into rvc-dev am: a52141c6ca am: e7b045a9fd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12324556

Change-Id: I2f44e2378aadc8dd703651568c856fc5bec91124
 2020-08-07 10:26:57 +00:00
Santiago Seifert
c6b868b1f5 Merge "Add updatable-media jarjar rules to framework-all" into rvc-dev am: a52141c6ca am: a1299a938d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12324556

Change-Id: I1347bb08a7594dddddcb07089f01de8aee0e7abe
 2020-08-07 10:26:44 +00:00
Santiago Seifert
a1299a938d Merge "Add updatable-media jarjar rules to framework-all" into rvc-dev am: a52141c6ca 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12324556

Change-Id: I14f83d532922ffcd343d1efd48b28513b5672154
 2020-08-07 10:18:15 +00:00
Santiago Seifert
e7b045a9fd Merge "Add updatable-media jarjar rules to framework-all" into rvc-dev am: a52141c6ca 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12324556

Change-Id: I59a2a2cec54d286299be1048db602e6c9c4071b0
 2020-08-07 10:18:06 +00:00
Santiago Seifert
a52141c6ca Merge "Add updatable-media jarjar rules to framework-all" into rvc-dev 2020-08-07 10:02:28 +00:00
Santos Cordon
69603f319e Merge "Allow Power-button to temporarily ignore proximity sensor." into rvc-d1-dev am: fdc35a2491 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12282513

Change-Id: I4913d33ac3e20e97ebdc524189e40f772f4dbbe3
 2020-08-07 09:46:31 +00:00
Yanting Yang
4393c7a562 Skip loading tiles from non-current user if primary profile only 
Symptom:
Disabling an injected activity or provider can't remove the tile
entirely. The tile is still shown if the device has a work profile.

Root cause:
Settings loads tiles from all injected components of all users via
PackageManager. When an injected app disables its component of current
user to remove tiles, the component for the work profile user is still
enabled. Therefore the tiles are still loaded.

Solution:
Skip loading tiles from non-current user if the injected component is
tagged "primary_profile_only".

Bug: 161885575
Test: make RunSettingsLibRoboTests
Change-Id: I00338204ddccfcbcf84a3eed34e6b8f8d5829d56
 2020-08-07 17:40:16 +08:00
Santos Cordon
fdc35a2491 Merge "Allow Power-button to temporarily ignore proximity sensor." into rvc-d1-dev 2020-08-07 09:33:05 +00:00
Chalard Jean
8b9473a80b [automerger skipped] Merge changes I33b70b0a,I1074eedb am: e286c5e1ef am: cbcb46cb87 -s ours am: 26187e2fba -s ours 
am skip reason: Change-Id Icd141a992c46290c74929785e261a1cd57bc001b with SHA-1 deae676127 is in history

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

Change-Id: I039772ce9b09d2f0f9d07fbf632d3d8efa01630b
 2020-08-07 07:26:54 +00:00
Chalard Jean
c64e1a0e2c [automerger skipped] Revert "Revert "Move Inet[4]AddressUtils to libs/net"" am: be00709344 am: 62a694f865 -s ours am: b4cf848fe7 -s ours 
am skip reason: Change-Id Icd141a992c46290c74929785e261a1cd57bc001b with SHA-1 deae676127 is in history

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

Change-Id: I853068e1d6301fc99466f255e9084a130d122971
 2020-08-07 07:26:47 +00:00
Chalard Jean
26187e2fba [automerger skipped] Merge changes I33b70b0a,I1074eedb am: e286c5e1ef am: cbcb46cb87 -s ours 
am skip reason: Change-Id Icd141a992c46290c74929785e261a1cd57bc001b with SHA-1 deae676127 is in history

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

Change-Id: I462f911d13e7574a0babd6d661c0b569f0265b58
 2020-08-07 07:16:28 +00:00
Chalard Jean
b4cf848fe7 [automerger skipped] Revert "Revert "Move Inet[4]AddressUtils to libs/net"" am: be00709344 am: 62a694f865 -s ours 
am skip reason: Change-Id Icd141a992c46290c74929785e261a1cd57bc001b with SHA-1 deae676127 is in history

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

Change-Id: I5b15fde5cb76d1dc178a3cb2b1597e0c27aa7af2
 2020-08-07 07:16:23 +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
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
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
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
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
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
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
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
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