Commit Graph

11656 Commits

Author SHA1 Message Date
Christian Wailes
4362acdb5c Merge "Make BackgroundDexOpt aware of thermal state" am: 6c914b4bc6 am: 1958d5853c am: fbd298a06a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1706449

Change-Id: Ifd4ef36701a2145f3f84f11a849f69d9a6d060a1
2021-05-19 23:22:58 +00:00
Siarhei Vishniakou
000beba278 Merge "Check mInputEventReceiver before sending timeline -- 2" into sc-dev am: 234adf7cb2 am: 12318a45bd
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14350504

Change-Id: I55ef308fcebb9323496916fffa8d7b8af24ff3ae
2021-05-19 23:20:43 +00:00
Benedict Wong
1f06b95c62 Merge "Remove underlying network caps" am: 886e94b0a3 am: a6006f1d44 am: 6452f6f978
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1709008

Change-Id: I53e774ed83fee2055814734ee4826b470e8b65e1
2021-05-19 22:44:47 +00:00
Nathan Harold
7a74a69551 Merge "Update VCN Owners Post-Initial-Development" am: 4b8d448b3b am: b9ec9c28ef am: e386a1fbe8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1709010

Change-Id: I824eb0cee121e8be4bdbe9f0d3bcd351b314fd0b
2021-05-19 22:44:29 +00:00
Nikita Iashchenko
6764e97f14 Move IoUtils#deleteContents from CorePlatformApi set to framework
As a part of internal core libraries cleanup move usages of
IoUtils#deleteContents from CorePlatformApi set to framework.

Bug: 154796679
Test: m update-api
Change-Id: If7037029026b6753ab64be09aa52c40e04d5c7b1
(cherry picked from commit 87e9624648)
2021-05-19 14:40:05 -07:00
Benedict Wong
046797c13d Merge "Make VcnTransportInfo unparcel to null if no data contained" into sc-dev am: e0ee346120 am: 0404e29859 am: 4d6dd92bf9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14554154

Change-Id: Ida8fa72ce34468686133149065a05b82ec340e38
2021-05-18 19:15:40 +00:00
Christian Wailes
fbd298a06a Merge "Make BackgroundDexOpt aware of thermal state" am: 6c914b4bc6 am: 1958d5853c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1706449

Change-Id: Ied9f85811da98f2332c921c5589b2661761abbd0
2021-05-17 20:19:12 +00:00
Siarhei Vishniakou
12318a45bd Merge "Check mInputEventReceiver before sending timeline -- 2" into sc-dev am: 234adf7cb2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14350504

Change-Id: I6c8c1670ead483b5dcb3cab3f8a018e6fcfcfc04
2021-05-17 17:43:52 +00:00
Siarhei Vishniakou
234adf7cb2 Merge "Check mInputEventReceiver before sending timeline -- 2" into sc-dev 2021-05-17 17:35:24 +00:00
Christian Wailes
6c914b4bc6 Merge "Make BackgroundDexOpt aware of thermal state" 2021-05-17 16:15:40 +00:00
Benedict Wong
b9b8c45d66 Merge "Make VcnTransportInfo unparcel to null if no data contained" into sc-dev am: e0ee346120
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14554154

Change-Id: I419ab78dbca7e418f702ad93b90dc481ff90578b
2021-05-14 23:18:15 +00:00
Benedict Wong
6452f6f978 Merge "Remove underlying network caps" am: 886e94b0a3 am: a6006f1d44
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1709008

Change-Id: I9dc2ede9a3e01b1f6988e847d2176a33c159a7fb
2021-05-14 23:13:41 +00:00
Nathan Harold
e386a1fbe8 Merge "Update VCN Owners Post-Initial-Development" am: 4b8d448b3b am: b9ec9c28ef
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1709010

Change-Id: I5fd07130187aed119c27d25082981964b7d12597
2021-05-14 23:12:57 +00:00
Benedict Wong
e0ee346120 Merge "Make VcnTransportInfo unparcel to null if no data contained" into sc-dev 2021-05-14 23:00:21 +00:00
Benedict Wong
d9695aced3 Make VcnTransportInfo unparcel to null if no data contained
When VcnTransportInfo is redacted, it contains no useful information. In
order to preserve the abstraction, the VcnTransportInfo should be
unparcelled to null


Bug: 8675309
Test: atest VcnTransportInfoTest
Change-Id: Ia9dbb9f259027acc74004eb1207e0a13cea56088
2021-05-14 22:53:51 +00:00
Chris Wailes
d63d206f97 Make BackgroundDexOpt aware of thermal state
This change makes the BackgroundDexOpt service consider the thermal
state of the device before running.  If the device is in a moderate thermal
state or worse background dexopt will not run.

Bug: 165935246
Test: Treehugger && atest BackgroundDexOptServiceIntegrationTests
Change-Id: Ie5ccbab7aa6d414241780136407f397d326340bf
2021-05-14 15:42:29 -07:00
Benedict Wong
886e94b0a3 Merge "Remove underlying network caps" 2021-05-14 22:40:54 +00:00
Benedict Wong
b2632543c0 Remove underlying network caps
Bug: 182219992
Test: atest FrameworksVcnTests
Change-Id: Ic2fec8a87fd19a1780333c61759c4092598d349e
2021-05-14 15:28:34 -07:00
Nathan Harold
e0f865d554 Update VCN Owners Post-Initial-Development
Owners files update for VCN now that primary development
is complete and the codebase is stable.

Bug: 8675309
Test: compilation
Change-Id: Ie686729b33f0a7e1c3414374ce4bf3d7ef514a22
2021-05-14 15:05:26 -07:00
TreeHugger Robot
16f771b868 Merge "Close FDs even when throwing SecurityException." into sc-dev am: d285109ef2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14538250

Change-Id: Ie46f270a6ca157e46f66d9b10a9790a372612f8b
2021-05-14 16:43:01 +00:00
TreeHugger Robot
d285109ef2 Merge "Close FDs even when throwing SecurityException." into sc-dev 2021-05-14 16:40:14 +00:00
Kohsuke Yatoh
d3275de48e Close FDs even when throwing SecurityException.
Bug: 187879195
Test: atest UpdatableSystemFontTest
Change-Id: I34d04f152210fe2f89f4d96e920978dde21d06c8
2021-05-13 23:08:33 -07:00
Benedict Wong
964ccb9330 Merge "Custom network selection" am: bc3638ce5d am: b3f0495383 am: 2a86eae65e am: d9c05c23e6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1706226

Change-Id: I428ba0bd7fa886f51b9321f3893f55d5d15c722c
2021-05-14 05:31:43 +00:00
Benedict Wong
d9c05c23e6 Merge "Custom network selection" am: bc3638ce5d am: b3f0495383 am: 2a86eae65e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1706226

Change-Id: Icdf319d564e4eab468d9d4e722716a2ef7d2c3cd
2021-05-14 05:25:38 +00:00
Benedict Wong
9028cac4fe Custom network selection
This change adds a basic prioritization framework in the VCN, and signal
strength thresholds for WiFi.

Bug: 188104094
Test: atest FrameworksVcnTests
Change-Id: Iee4e3dbecf1102ddc127a8c8daf08a00b6fccbbd
2021-05-13 18:57:05 -07:00
Kohsuke Yatoh
4d003eafac Merge changes I09ac3f34,Id3e36922 into sc-dev am: c27e46f595
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14522711

Change-Id: I5cc78a7294946ef25f5fff4e9f9b2652c1f8aabe
2021-05-13 20:55:18 +00:00
Kohsuke Yatoh
048d4b1788 Close FDs / mmap handles promptly.
Currently we rely on GC to close them.
This may cause system_server crash depending on the timing of GC.

Bug: 187879195
Test: atest UpdatableSystemFontTest
Change-Id: I09ac3f349e5ec100e4164320cbf27977474cc4bb
2021-05-13 16:23:55 +00:00
Lorenzo Colitti
34748be150 Make VcnTransportInfoTest pass on AOSP.
AOSP contains the core networking redaction changes, but not the
wifi redaction changes, so the tests that depend on wifi S
behaviour will not pass on AOSP.

Fix testApplicableRedactions by checking that the applicable
redactions are the same ones as returned by the underlying
WifiInfo object.

Fix testMakeCopyRedactForAccessFineLocation by testing the wifi
redaction code iff Build.VERSION.SDK_INT is S or later. This is
different from SdkLevel.isAtLeastS, because the latter returns
true in AOSP.

Bug: 183938194
Test: atest VcnTransportInfoTest
Change-Id: Ia5bc896c92be19f570638f8051492e0f2d7342f9
2021-05-13 20:24:20 +09:00
Lorenzo Colitti
1ad18702f1 Immediately redact VcnTransportInfo.
Redaction of NetworkCapabilities is changing from redacting at
parcel time to redacting immediately when makeCopy() is called.
Update VcnTransportInfo redaction accordingly.

Bug: 183938194
Test: atest VcnTransportInfoTest
Change-Id: I0c9406f426b66fd36b47d11799955def531c16ba
2021-05-13 20:24:20 +09:00
Remi NGUYEN VAN
d502cc832d Merge "Move net unit tests to packages/Connectivity" into sc-dev am: 5f7ffd4136
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14500983

Change-Id: Id09180982b29447e65bbf5ff4ebffa1f3c6efc55
2021-05-13 09:27:35 +00:00
Remi NGUYEN VAN
1665a3d634 Move net unit tests to packages/Connectivity
Move the tests together with packages/Connectivity code, so both can be
moved to packages/modules/Connectivity together.

Also reorganize unit tests in a unit/ directory, as other tests
(integration/, common/ etc.) have been added in tests/net since they
were created. This makes the directory structure consistent.

Test: atest FrameworksNetTests
Bug: 187814163
Merged-In: I254ffd1c08ec058d594b4ea55cbae5505f8497cc

Change-Id: I254ffd1c08ec058d594b4ea55cbae5505f8497cc
2021-05-13 08:30:33 +00:00
Remi NGUYEN VAN
007a886baf Move net unit tests to packages/Connectivity
Move the tests together with packages/Connectivity code, so both can be
moved to packages/modules/Connectivity together.

Also reorganize unit tests in a unit/ directory, as other tests
(integration/, common/ etc.) have been added in tests/net since they
were created. This makes the directory structure consistent.

Test: atest FrameworksNetTests
Bug: 187814163
Ignore-AOSP-First: needs per-branch move for merge conflicts
Change-Id: I254ffd1c08ec058d594b4ea55cbae5505f8497cc
2021-05-13 05:55:44 +00:00
Ken Chen
bfd7694639 Merge "Add testVpnTypesEqual to verify consistency" am: 785dc4871c am: 3ae939569e am: 233682e675 am: 92bc335785
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1705385

Change-Id: Icd7cf6f3cf36685e0b4b243030a78187b1fc7c79
2021-05-13 03:22:06 +00:00
Ken Chen
787c99f1fc Merge "Switch from networkCreate[Physical/Vpn] to networkCreate" am: c9d5cd9fbc am: 62258932ff am: a4d53bfa6d am: 2216da85aa
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669648

Change-Id: I17d2a2d07c024a8f8a3e4fedccb337c41f2f1251
2021-05-13 03:21:09 +00:00
Ken Chen
92bc335785 Merge "Add testVpnTypesEqual to verify consistency" am: 785dc4871c am: 3ae939569e am: 233682e675
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1705385

Change-Id: I53d58c5b2277ba2d88a848ed3e6d6269b4b886b3
2021-05-13 03:00:17 +00:00
Ken Chen
2216da85aa Merge "Switch from networkCreate[Physical/Vpn] to networkCreate" am: c9d5cd9fbc am: 62258932ff am: a4d53bfa6d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669648

Change-Id: I3475e674c3914c4c61fd0a4246c9ee3e7e02c4fb
2021-05-13 02:59:30 +00:00
Ken Chen
785dc4871c Merge "Add testVpnTypesEqual to verify consistency" 2021-05-13 01:22:08 +00:00
Ken Chen
c9d5cd9fbc Merge "Switch from networkCreate[Physical/Vpn] to networkCreate" 2021-05-13 01:20:39 +00:00
Cody Kesting
68acd527d8 Merge changes I4b135749,If4fcaa52 am: 576dad4673 am: cd4e6ae6d6 am: 5cdc27d2ac am: be6088d11c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1704175

Change-Id: Iaa4960f4812a4819e487e7c84d681e7cde67285b
2021-05-12 23:47:05 +00:00
Cody Kesting
be6088d11c Merge changes I4b135749,If4fcaa52 am: 576dad4673 am: cd4e6ae6d6 am: 5cdc27d2ac
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1704175

Change-Id: I7d636497dbc26008e659495e4236f161c90599ab
2021-05-12 23:40:05 +00:00
Cody Kesting
576dad4673 Merge changes I4b135749,If4fcaa52
* changes:
  Restructure Test Network requests for VCN connections.
  Correct variable name in VcnManagementService.
2021-05-12 22:55:17 +00:00
Lorenzo Colitti
51fb7c59dc Merge changes from topic "transportinfo-explicit-redaction" into sc-dev am: 79d74a6448
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14484636

Change-Id: Ic02ed2cacd5fe3d83a8c5a2b411b37e721e766e6
2021-05-12 22:53:50 +00:00
Lorenzo Colitti
79d74a6448 Merge changes from topic "transportinfo-explicit-redaction" into sc-dev
* changes:
  Immediately redact VcnTransportInfo.
  Do not automatically redact TransportInfo objects.
2021-05-12 22:46:36 +00:00
Treehugger Robot
1b8146b3da Merge changes Icb59b15d,I6fc6a266,I5cc340e5,I94db52a8 am: b79dcb24d0 am: 5804521e8c am: 32c2d34383 am: 1761a873cb
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1700309

Change-Id: I752bc37fa76b131f7b2e5dc202f614263f536298
2021-05-12 17:21:48 +00:00
Treehugger Robot
1761a873cb Merge changes Icb59b15d,I6fc6a266,I5cc340e5,I94db52a8 am: b79dcb24d0 am: 5804521e8c am: 32c2d34383
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1700309

Change-Id: Ifab0469fb2687cae7b361b5009abe152a35048c5
2021-05-12 17:16:19 +00:00
Lucas Lin
1742bf024c Merge "Update PrivateDnsMode from StringDef to IntDef" 2021-05-12 17:09:50 +00:00
Treehugger Robot
b79dcb24d0 Merge changes Icb59b15d,I6fc6a266,I5cc340e5,I94db52a8
* changes:
  Request Test Networks for VCNs when in Test Mode.
  Specify if a VCN is in 'test-mode' in VcnContext.
  Create test-mode for VcnConfig.
  Require MOBIKE for IkeSessionParams in VCN configs.
2021-05-12 16:21:25 +00:00
Paul Hu
9c8384b8b3 Merge "Add MATCH_ANY_USER flag to PackageInfo queries" am: 68301eb7cb am: 2b0351ce1e am: 168172c2c0 am: 47d38bc76c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1689207

Change-Id: Ieb65ba4365b61688aa8f0d250fc16acf66f8a4fd
2021-05-12 10:33:06 +00:00
Paul Hu
47d38bc76c Merge "Add MATCH_ANY_USER flag to PackageInfo queries" am: 68301eb7cb am: 2b0351ce1e am: 168172c2c0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1689207

Change-Id: Ie3dd72aa4b8166198884f348f59c77befc229dc0
2021-05-12 10:19:57 +00:00
Ken Chen
bf8bf735d6 Add testVpnTypesEqual to verify consistency
VPN types are defined in both VpnManager.java and NativeVpnType.aidl.
The definitions on both sides should match (except TYPE_VPN_NONE).

VpnManager.java:
TYPE_VPN_NONE = -1
TYPE_VPN_SERVICE = 1
TYPE_VPN_PLATFORM = 2
TYPE_VPN_LEGACY = 3
TYPE_VPN_OEM = 4

NativeVpnType.aidl:
SERVICE = 1
PLATFORM = 2
LEGACY = 3
OEM = 4

Bug: N/A
Test: atest android.net.VpnManagerTest#testVpnTypesEqual
Change-Id: Ie618e227d861100c5318da696140e486af1093a0
2021-05-12 17:34:34 +08:00