Commit Graph

16878 Commits

Author SHA1 Message Date
Jeff Chang
4436955d35 [RESTRICT AUTOMERGE] Add hide-non-system-overlay flag for HarmfulAppWarningActivity am: 9c5c42ad03 am: 0281b203d8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16743243

Change-Id: I9833001187073a9a148690e34c0960fc687a6022
2022-02-09 09:26:33 +00:00
Jeff Chang
0281b203d8 [RESTRICT AUTOMERGE] Add hide-non-system-overlay flag for HarmfulAppWarningActivity am: 9c5c42ad03
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16743243

Change-Id: I36a91c0de0d6a072f930277c0f235177b7822d33
2022-02-09 09:09:08 +00:00
Jean Chalard
1f929d9bd5 Merge "Allow VPN apps to ask for running the validation checks" am: cbb2fa2f00 am: 64ba50411e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1962928

Change-Id: I8dcb813cfe589411da7345bc2c4308e9f149b275
2022-02-09 06:38:31 +00:00
Jean Chalard
cbb2fa2f00 Merge "Allow VPN apps to ask for running the validation checks" 2022-02-09 06:03:45 +00:00
Felipe Leme
a9428c51ac Merge "Adds OWNERS to com.androd.internal.util.Dump*" am: 0b6e3a959b am: 2727d1af13
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1976675

Change-Id: I9094e6421123193cc474520d43c00f299e64a3ac
2022-02-08 19:05:18 +00:00
Felipe Leme
0b6e3a959b Merge "Adds OWNERS to com.androd.internal.util.Dump*" 2022-02-08 18:14:23 +00:00
Chiachang Wang
3fc98d5ebd Allow VPN apps to ask for running the validation checks
Expose an API to allow VPNs app to ask for running the validation
check on the VPN network built from Ikev2VpnProfile.

Bug: 184750836
Test: New test in Ikev2VpnTest
      Also FrameworksNetTests
Change-Id: I385bb887b6c697d8f5d87af750dbd2aab44afca6
CTS-Coverage-Bug: 184750836
 (but CTS is in the same topic, just not detected by the tool)
2022-02-09 02:19:15 +09:00
Felipe Leme
3c5dea3fe4 Adds OWNERS to com.androd.internal.util.Dump*
Test: no, thanks
Bug: 149254050

Change-Id: I1dbb8a4c04817f39de147927c26c14e461eb564b
2022-02-08 08:50:43 -08:00
Treehugger Robot
b754030dbe Merge "Delete legacy fs-verity support" am: 81568fa22f am: b4661e274c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1966068

Change-Id: I797f197a29a811795fc5be5339be1afbde2e5fcd
2022-02-08 01:26:39 +00:00
Treehugger Robot
81568fa22f Merge "Delete legacy fs-verity support" 2022-02-08 00:48:19 +00:00
Felipe Leme
72c121d807 Merge "Adds OWNERS to com.androd.internal.util.dump" am: 5f09bb49f0 am: 4019688e39
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1975006

Change-Id: Ic92a701e2fe530cad0f74e0cc5bb28dc67df9b2d
2022-02-08 00:45:31 +00:00
Felipe Leme
5f09bb49f0 Merge "Adds OWNERS to com.androd.internal.util.dump" 2022-02-08 00:24:38 +00:00
Felipe Leme
16c1aedbf3 Adds OWNERS to com.androd.internal.util.dump
Test: no, thanks
Bug: 149254050

Change-Id: I7af006ffdfa768b887ff2c7bde970efbc1b1f297
2022-02-07 09:42:26 -08:00
Victor Hsieh
e97a8700b0 Delete legacy fs-verity support
The "legacy" fs-verity was introduced in P in Pixel 3 kernel. During
fs-verity upstream to Linux, the API has changed. During Pixel 4 / Q
development, fs-verity was upstreamed to Linux kernel. By setting
ro.apk_verity.mode = 2, device vendors such as Pixel 4 can opt in to
enable the support. The feature has become mandatory for new devices
shipped with R.

Since Pixel 3 family is no longer supported, it's time to remove the
dead code.

Bug: 120629632
Test: m
Test: TH
Change-Id: I6dacd9bbd38b502ee510ff12970e76342d7b72dd
Merged-In: I6dacd9bbd38b502ee510ff12970e76342d7b72dd
2022-02-01 23:09:43 +00:00
Jeff Chang
9c5c42ad03 [RESTRICT AUTOMERGE] Add hide-non-system-overlay flag for HarmfulAppWarningActivity
A malicious application could overlay the activity. The overlay is
able to be tapped through, which can trick the user into starting a
harmful activity.

The CL added the flag SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS for
the activity to prevent the tapjacking/overlay attack.

Bug: 205595291
Test: atest CtsHarmfulAppWarningHostTestCases
Change-Id: Ia1a1ae0dc451e04bf5c31e3cb8cf30a0d8e32991
(cherry picked from commit a04b3666b8)
2022-01-28 03:19:44 +00:00
Treehugger Robot
35802e3cf5 Merge "Have BatteryStatsImpl use the public NetworkStats API" am: 25d96f8d4d am: f566c778a7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1955879

Change-Id: Ic25cef9d6ce7904bf818dcfd38aa924fac21fd6f
2022-01-25 08:33:00 +00:00
Treehugger Robot
25d96f8d4d Merge "Have BatteryStatsImpl use the public NetworkStats API" 2022-01-25 07:58:21 +00:00
Chalard Jean
bda5db8cb8 Have BatteryStatsImpl use the public NetworkStats API
Test: BatteryStatsManagerTest
Change-Id: I0bfb4df45e373aa3907b07a382ba8edd07c73895
Merged-In: I0bfb4df45e373aa3907b07a382ba8edd07c73895
2022-01-25 06:39:29 +00:00
Junyu Lai
211ee3e066 Merge "[MS61] Remove NetworkManagementSocketTagger#install dependency" am: 513d8dd2ac am: c756efe7bd
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1952099

Change-Id: I6f031219bcd375b0ac4ec0819ae3c8341819f555
2022-01-25 01:24:35 +00:00
Junyu Lai
513d8dd2ac Merge "[MS61] Remove NetworkManagementSocketTagger#install dependency" 2022-01-25 00:48:23 +00:00
Siim Sammul
1f0a6f7d4e Merge "Move binder latency data logging to a background thread to improve performance of the main thread." am: 3af0c6a106 am: b24b15c6f9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1942954

Change-Id: I3fd253bc0e023a3aa05222ef8c7105f26b6f95fe
2022-01-24 14:11:30 +00:00
Siim Sammul
3af0c6a106 Merge "Move binder latency data logging to a background thread to improve performance of the main thread." 2022-01-24 13:40:33 +00:00
Dmitri Plotnikov
4c21515da7 Merge "Include saved battery history chunks into BatteryUsageStats parcel" am: 2f7508a404 am: 587f8cec3d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1928178

Change-Id: I3f3d98d9e44f2807c5558127f84838f40c612297
2022-01-22 06:52:51 +00:00
Junyu Lai
5262c0eb82 [MS61] Remove NetworkManagementSocketTagger#install dependency
Expose TrafficStats#attachSocketTagger and use it instead.

Test: atest TrafficStatsTest
Bug: 204830222
CTS-Coverage-Bug: 214979748
Change-Id: I1748d349b499053ad08bd62202325fa759ad8da5
2022-01-22 13:51:55 +08:00
Dmitri Plotnikov
fb37eaa5df Merge "Fix concurrency issue with BatteryUsageStats" am: 587eef25c9 am: e855d9f17e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1927563

Change-Id: I5d98a075c1faca7e8cf3c1dfb673da9854114bbf
2022-01-21 23:31:34 +00:00
Dmitri Plotnikov
c4b9de7d95 Include saved battery history chunks into BatteryUsageStats parcel
Bug: 209297031
Test: Test: atest FrameworksCoreTests:BatteryUsageStatsTest FrameworksCoreTests:BatteryUsageStatsProviderTest
Merged-In: I369d863b6f6fd488030aa031cc465bef6ce99ab8
Change-Id: Ifc70a49b731b5510e7bcd049e0c12d9ac7f68f44
2022-01-21 22:44:46 +00:00
Dmitri Plotnikov
587eef25c9 Merge "Fix concurrency issue with BatteryUsageStats" 2022-01-21 22:44:28 +00:00
Phil Burk
bba74c1c8f Merge "Include MIDI service OWNERS for internal/midi" am: f5bf153f13 am: 191c4bd7de
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1955339

Change-Id: I620d9290d66fa1848ee1a97b27fac1772f0dec4e
2022-01-21 15:11:04 +00:00
Phil Burk
f5bf153f13 Merge "Include MIDI service OWNERS for internal/midi" 2022-01-21 14:58:34 +00:00
Siim Sammul
42e84a4cc4 Move binder latency data logging to a background thread to improve performance of the main thread.
Bug: 213435093
Test: existing tests apply
Change-Id: Ic7a3a413d8e23c0405b4dd16f0b8c919a214eb32
2022-01-21 11:30:26 +00:00
Frank Li
3edf76ed6a Merge "[DU07]Remove BatteryStatsImpl NetworkStats.subtract dependences" am: a078c73c47 am: 991351f546
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1956076

Change-Id: I24f6e08ce84fc4259dfe862f9958e88a2fc9b4df
2022-01-21 09:57:49 +00:00
Frank Li
a078c73c47 Merge "[DU07]Remove BatteryStatsImpl NetworkStats.subtract dependences" 2022-01-21 09:19:34 +00:00
Frank Li
761a4eb36c Merge "[DU03-1]Remove INetworkStatsService from BatteryStatsImpl" am: acd0aef603 am: 9c737b782c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1948496

Change-Id: If2164db2bf7b8cc239a90341c68c623ac3a8518c
2022-01-21 08:43:37 +00:00
lifr
20689682e5 [DU03-1]Remove INetworkStatsService from BatteryStatsImpl
Expose systemapi NetworkStats.getDetailedUidStats for use by
BatteryStats.

BatteryStatsImpl is using INetworkStatsService APIs, which
cannot be accessed after moving into the mainline module. So, replace
and remove those hidden API usages.

Bug: 210066922
Test: atest BatteryStatsImplTest WifiPowerCalculatorTest
            MobileRadioPowerCalculatorTest NetworkStatsServiceTest
CTS-Coverage-Bug: 213437796
Change-Id: I40d713923278f4654d67bb4d12155cea85c10447
2022-01-21 13:52:41 +08:00
Phil Burk
a4cc251eb8 Include MIDI service OWNERS for internal/midi
Change-Id: Icabeeab73b3106e87041a0a9149560ad691640f4
2022-01-20 23:34:39 +00:00
Dmitri Plotnikov
0856f76846 Fix concurrency issue with BatteryUsageStats
BatteryUsageStats is created under a BatteryStatsImpl lock.  One of
the elements of BatteryUsageStats is the battery history buffer Parcel.
Once the BatteryUsageStats object is created, the BatteryStatsImpl lock
is released and the history buffer parcel continues to be appended
by BatteryStatsImpl.  The Parcel may even be reset altogether if the
battery stats session is reset.  The BatteryUsageStats object is parceled
during the getBatteryUsageStats binder call. Any modification of the
history buffer concurrent with parceling causes a crash.

Bug: 194256984
Test: atest FrameworksCoreTests:BatteryUsageStatsTest FrameworksCoreTests:BatteryUsageStatsProviderTest
Change-Id: I262c4608cd02943f926e8daaf3e782c6fe6eaee7
Merged-In: Ifb03a32275dfbea172cd28309a42349d6dd4bcd5
2022-01-20 23:04:22 +00:00
Frank
77fb00ddde [DU07]Remove BatteryStatsImpl NetworkStats.subtract dependences
BatteryStatsImpl is using INetworkStatsService APIs, which
cannot be accessed after moving into the mainline module. So, replace
and remove those hidden API usages.

Bug: 213523117
Test: atest BatteryStatsImplTest WifiPowerCalculatorTest
            MobileRadioPowerCalculatorTest
Change-Id: I9e8d94259ad9845d94bfd78d971ff1a2cd7bb38e
2022-01-20 20:08:19 +08:00
Junyu Lai
dba45b947a Merge "[MS24] Remove FileUtils.sync dependencies" am: f1245786d6 am: ff3bbac2a1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1934457

Change-Id: I0c921d46aec1ffde844c91fc95edb8b18331198d
2022-01-20 05:35:28 +00:00
Junyu Lai
57c59fba4c [MS24] Remove FileUtils.sync dependencies
FileRotator will be built with Connectivity mainline module
while the file location will be kept inside platform.
Thus, hidden api usage needs to be addressed.

This change removes some dependencies by inlining the content
of FileUtils.sync to remove the dependency, and change the
Slog to Log.

Test: TH
Bug: 204830222
Change-Id: I6105850dd8311072fd8de2e2864d11fdb052f061
2022-01-19 07:07:34 +00:00
Treehugger Robot
95d57bdc9d Merge "[DU03]Remove INetworkStatsService from BatteryStatsImpl" am: 296fbccd6e am: 33695e7a4f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1931589

Change-Id: Iec474f98457ca27366ff19cd7c840e421d343921
2022-01-12 19:59:56 +00:00
Treehugger Robot
296fbccd6e Merge "[DU03]Remove INetworkStatsService from BatteryStatsImpl" 2022-01-12 19:33:52 +00:00
Taras Antoshchuk
3dafac7b7c Merge "Revert "Revert "Revert "Revert "Add APIs that allow to exclude r..."" am: bc8f256721 am: 8c3fa67bbd
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1938732

Change-Id: Ib2087b4e20b7b92c3c26ed9f8edb1c57555ce6e6
2022-01-12 16:03:09 +00:00
Taras Antoshchuk
bc8f256721 Merge "Revert "Revert "Revert "Revert "Add APIs that allow to exclude r..."" 2022-01-12 15:27:30 +00:00
lifr
ca904a8ea8 [DU03]Remove INetworkStatsService from BatteryStatsImpl
BatteryStatsImpl is using INetworkStatsService APIs, which
cannot be accessed after moving into the mainline module. So, replace
and remove those hidden API usages.

Bug: 210066922
Test: atest BatteryStatsImplTest WifiPowerCalculatorTest
            MobileRadioPowerCalculatorTest
CTS-Coverage-Bug: 213437796

  (cherry-picked from ag/16548638)

Change-Id: I584897ff8ba303c717a9df3756c9f6778c1cfb10
Merged-In: I584897ff8ba303c717a9df3756c9f6778c1cfb10
2022-01-12 07:28:55 +00:00
Artur Satayev
c89ed260a2 Add PACKAGE_MANAGER_OWNERS as owners of SystemConfig.java
Merged-In: Iabd1ee367d8234425c5770455a20a413cc37c6a7
Change-Id: Iabd1ee367d8234425c5770455a20a413cc37c6a7
2022-01-10 18:23:21 +00:00
Taras Antoshchuk
fe5a57e8c4 Revert "Revert "Revert "Revert "Add APIs that allow to exclude r..."
Revert "Revert "Revert "Revert "Add VpnServiceBuilderShim for Vp..."

Revert submission 1941195-revert-1931760-reland-vpn-impl-part-2-WGARECSJEM

Reason for revert: fixed merge conflict with aosp/1938197
Reverted Changes:
Ic25e5e4ea:Revert^2 "Revert "Add CTS tests for exclude VPN ro...
Ic72cafcf5:Revert "Revert "Revert "Add APIs that allow to exc...
I53802190a:Revert "Revert "Revert "Add VpnServiceBuilderShim ...

Change-Id: Id3e5f698cf8965fa8386a98bed1fd0170a9e0344
2022-01-10 10:20:29 +00:00
Matt Buckley
366582cbae Merge "Revert "Revert "Revert "Add APIs that allow to exclude routes fr..."" am: f7a327e8d5 am: 086cbfd1bf
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1941194

Change-Id: Ia3dc04920b8941a9528547cf608099195bd948bf
2022-01-07 18:17:35 +00:00
Matt Buckley
086cbfd1bf Merge "Revert "Revert "Revert "Add APIs that allow to exclude routes fr..."" am: f7a327e8d5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1941194

Change-Id: Ifacb9e5cd98ddd1e5acd4757b9474c89fb1de3fc
2022-01-07 17:50:51 +00:00
Matt Buckley
f7a327e8d5 Merge "Revert "Revert "Revert "Add APIs that allow to exclude routes fr..."" 2022-01-07 17:48:45 +00:00
Matt Buckley
7153b105e7 Revert "Revert "Revert "Add APIs that allow to exclude routes fr..."
Revert "Revert "Revert "Add VpnServiceBuilderShim for VpnService..."

Revert submission 1931760-reland-vpn-impl-part-2

Reason for revert: DroidMonitor-triggered revert due to breakage https://android-build.googleplex.com/builds/quarterdeck?branch=aosp-master&target=test_suites_x86_64&lkgb=8053795&lkbb=8053908&fkbb=8053828, bug b/213588956.
BUG: b/213588956
Reverted Changes:
Ic8ed8fce7:Revert "Revert "Add CTS tests for exclude VPN rout...
I07104340a:Revert "Revert "Add VpnServiceBuilderShim for VpnS...
I7c69b7244:Revert "Revert "Add APIs that allow to exclude rou...

Change-Id: Ic72cafcf5c7e2c62236f1cef61b0764882bacaad
2022-01-07 17:44:52 +00:00