Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
684,870 Commits 3 Branches 0 Tags
2511ec37ee07cd5ba95ce2bfeb3cfe4ebb44ca6a
Commit Graph

17064 Commits

Author SHA1 Message Date
Treehugger Robot
eb94286598 Merge "Have BatteryStatsImpl use the public NetworkStats API" am: 25d96f8d4d am: f566c778a7 am: 35802e3cf5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1955879

Change-Id: I042d2e008c113735c0b9e7a13da3b33927ea3e64
 2022-01-25 08:49: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
0c8b1eed04 Merge "[MS61] Remove NetworkManagementSocketTagger#install dependency" am: 513d8dd2ac am: c756efe7bd am: 211ee3e066 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1952099

Change-Id: Ia76d1cf3d75f1189be719a9ded3d107ce1fd8221
 2022-01-25 01:36:05 +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
4e38ab22c6 Merge "Move binder latency data logging to a background thread to improve performance of the main thread." am: 3af0c6a106 am: b24b15c6f9 am: 1f0a6f7d4e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1942954

Change-Id: I047b1a6e06a35e4f8fdd7be363e30c59982e0cee
 2022-01-24 14:22:12 +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
d012a49df3 Merge "Include saved battery history chunks into BatteryUsageStats parcel" am: 2f7508a404 am: 587f8cec3d am: 4c21515da7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1928178

Change-Id: I283453f3391287e7c2d672db178acbdd57fe715f
 2022-01-22 07:10:25 +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
256a465181 Merge "Fix concurrency issue with BatteryUsageStats" am: 587eef25c9 am: e855d9f17e am: fb37eaa5df 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1927563

Change-Id: Ie0e2b0be5d90cf1a40957a343a44489714446d0f
 2022-01-22 00:01:17 +00: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
ba160b15ab Merge "Include MIDI service OWNERS for internal/midi" am: f5bf153f13 am: 191c4bd7de am: bba74c1c8f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1955339

Change-Id: I01ced3aacc6b32bc4a44459cea575780db883cec
 2022-01-21 15:28:54 +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
c8e0e63e44 Merge "[DU07]Remove BatteryStatsImpl NetworkStats.subtract dependences" am: a078c73c47 am: 991351f546 am: 3edf76ed6a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1956076

Change-Id: Ibe90f9f1baf1950b9095747b2515e1cc9ffd7fd0
 2022-01-21 10:15:23 +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
c7e673cb90 Merge "[DU03-1]Remove INetworkStatsService from BatteryStatsImpl" am: acd0aef603 am: 9c737b782c am: 761a4eb36c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1948496

Change-Id: I06e8e68ec621c70698eb464f36a770c361ae4c13
 2022-01-21 09:06:50 +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
cff87d506b Merge "[MS24] Remove FileUtils.sync dependencies" am: f1245786d6 am: ff3bbac2a1 am: dba45b947a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1934457

Change-Id: I2b477e6da025fd53577733c8e8894f67a68ba70f
 2022-01-20 05:47:13 +00: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
TreeHugger Robot
4e3b453baf Merge "Enable nested scrolling for locale picker" into sc-v2-dev am: 67e26d7469 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16636785

Change-Id: Id0a594a3f00e9a2cafdced22c62ab9d8238d494b
 2022-01-19 14:49:46 +00:00
TreeHugger Robot
67e26d7469 Merge "Enable nested scrolling for locale picker" into sc-v2-dev 2022-01-19 14:46:19 +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
Kalesh Singh
17a6606ec1 Add system_server to readtracefs group 
This allows system_server to search/read tracefs entries. It is needed
for attaching cpu timeinstate bpf programs to tracepoints.

Bug: 208892266
Bug: 209513178
Bug: 214061655
Test: libtimeinstate_test
Change-Id: I4139605eb7c5277887092b3d6a3fb26bf4f8f171
Merged-In: I4139605eb7c5277887092b3d6a3fb26bf4f8f171
 2022-01-14 18:50:40 +00:00
Mill Chen
fa861a6b5d Enable nested scrolling for locale picker 
This change is to make the locale picker list enable the nested
scrolling feature. It is necessay to enable this feature to be able to
work with CollapsingToolbarLayout.

Fixes: 207318265
Fixes: 213036789
Test: manual test
1. Verify the locale picker works with Activity
2. Verify the locale picker works with SettingsBaseActivity

Change-Id: Iaf90211da640cd265fc2b23dd34b3149c4406891
 2022-01-14 09:25:49 +00:00
Treehugger Robot
c5e2547ecd Merge "[DU03]Remove INetworkStatsService from BatteryStatsImpl" am: 296fbccd6e am: 33695e7a4f am: 95d57bdc9d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1931589

Change-Id: I0dd29dd55ec9e71f53ab32d59440fde638bb592d
 2022-01-12 20:25:58 +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
0b4f3bd970 Merge "Revert "Revert "Revert "Revert "Add APIs that allow to exclude r..."" am: bc8f256721 am: 8c3fa67bbd am: 3dafac7b7c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1938732

Change-Id: Ie87d82fb28e48aa8a7ed7c0dcad669ddffd4097e
 2022-01-12 16:14:35 +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
Winson Chung
c80ff17275 Merge "Notify sysui of side swipe gestures that will show the bars transiently" into sc-v2-dev am: f80552b605 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16422448

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

Change-Id: I9cae0caca7360861d59be3daf5f8406c8598da2d
 2022-01-07 18:35:23 +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