Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
683,371 Commits 3 Branches 0 Tags
4e3b453baf2ad1723e2cf7b27d2f77f3fae57aed
Commit Graph

17180 Commits

Author SHA1 Message Date
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
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
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
Taras Antoshchuk
c159f90aa8 Merge "Revert "Revert "Add APIs that allow to exclude routes from VPN""" am: f4177e94ee am: 464eb8bc19 am: accf4c69a5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1931085

Change-Id: I8e7f48702c2fca7af6279d4cc3f67f724ed2f758
 2022-01-07 17:20:29 +00:00
Taras Antoshchuk
accf4c69a5 Merge "Revert "Revert "Add APIs that allow to exclude routes from VPN""" am: f4177e94ee am: 464eb8bc19 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1931085

Change-Id: Iffa989b5fe71ba259e1d4221ae203b746ad7ddd1
 2022-01-07 17:05:54 +00:00
Taras Antoshchuk
464eb8bc19 Merge "Revert "Revert "Add APIs that allow to exclude routes from VPN""" am: f4177e94ee 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1931085

Change-Id: Ic6b7dd2cd547b29e1407601d508f8256bfc878cb
 2022-01-07 16:44:00 +00:00
Taras Antoshchuk
f4177e94ee Merge "Revert "Revert "Add APIs that allow to exclude routes from VPN""" 2022-01-07 16:27:12 +00:00
Treehugger Robot
3fe0c62490 Merge "[MS22] Move NetworkManagementSocketTagger into the module" am: 81589202e5 am: bc8cdbeecb am: cb6617a563 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1933091

Change-Id: I24ef55a8dc58e5917109c3993b02ddfe147e1064
 2022-01-07 16:15:23 +00:00
Treehugger Robot
cb6617a563 Merge "[MS22] Move NetworkManagementSocketTagger into the module" am: 81589202e5 am: bc8cdbeecb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1933091

Change-Id: I561e94026c5ab362638a1e1e387ca9e02afdeb13
 2022-01-07 15:53:51 +00:00
TreeHugger Robot
d31bba2d5c Merge "Add PACKAGE_MANAGER_OWNERS as owners of SystemConfig.java" into stage-aosp-master am: 105f98c38c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16576463

Change-Id: I2539ffd6d175a1cda9100055f37a4b92184c6a83
 2022-01-07 14:05:53 +00:00
Treehugger Robot
bc8cdbeecb Merge "[MS22] Move NetworkManagementSocketTagger into the module" am: 81589202e5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1933091

Change-Id: Ie15d4d9d2e8239f89d0561dd22863726d732ab3c
 2022-01-07 12:30:46 +00:00
TreeHugger Robot
105f98c38c Merge "Add PACKAGE_MANAGER_OWNERS as owners of SystemConfig.java" into stage-aosp-master 2022-01-07 12:00:48 +00:00
Junyu Lai
b7d0199763 [MS22] Move NetworkManagementSocketTagger into the module 
This is heavily used by TrafficStats, and no other modules
are using it. Hence it should be moved to the module as well.

Test: TH
Bug: 204830222

Change-Id: I7ea1ccb916e796c786c29d53e4ecf3970a8af6dd
 2022-01-07 09:57:15 +00:00
Winson Chung
64f486017f Notify sysui of side swipe gestures that will show the bars transiently 
- This won't be needed in T when immersive mode gestures are moved
  to SysUI (b/161689946)

Bug: 208886351
Test: atest SystemUITests
Test: In both 3button/gestural (all orientations), swipe from bar
      areas, swipe from sides show entry point only when swiping over
      bars
Change-Id: Ie8f15a5fbd3248bc86a50ffcd1fc73cd08c4e214
 2022-01-06 17:41:58 +00:00
Artur Satayev
6a3b51690e Add PACKAGE_MANAGER_OWNERS as owners of SystemConfig.java 
Merged-In: Iabd1ee367d8234425c5770455a20a413cc37c6a7
Change-Id: Iabd1ee367d8234425c5770455a20a413cc37c6a7
 2022-01-06 15:31:35 +00:00
Artur Satayev
2a1baa94d8 Add PACKAGE_MANAGER_OWNERS as owners of SystemConfig.java 
Merged-In: Iabd1ee367d8234425c5770455a20a413cc37c6a7
Change-Id: Iabd1ee367d8234425c5770455a20a413cc37c6a7
 2022-01-06 15:23:42 +00:00
Taras Antoshchuk
5b1d7c2ead Revert "Revert "Add APIs that allow to exclude routes from VPN"" 
This reverts commit 487b2e645a.

Reason for revert: failing build target configuration is fixed

Change-Id: I7c69b7244b4262336e427e4c671aaebb70ddc6ed
 2022-01-06 14:49:02 +00:00
Junyu Lai
f23caacaf1 Merge changes from topics "ms34-tm", "ms40-clock" am: beb9fb3cc8 am: 08c51b04ca am: d312550ff8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1914533

Change-Id: I13c1439933d33c81e3f8668ad0b86bea2b6b68a7
 2022-01-06 14:23:37 +00:00
Junyu Lai
d312550ff8 Merge changes from topics "ms34-tm", "ms40-clock" am: beb9fb3cc8 am: 08c51b04ca 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1914533

Change-Id: I244779c19fab00eede1b7e9f3980679131e75cbb
 2022-01-06 14:09:31 +00:00
Junyu Lai
0cf9e87c79 [MS27] Expose noteUntaggedSocket SystemApi 
While Data usage related codes are moving to mainline module,
StrictMode#vmUntaggedSocketEnabled() and onUntaggedSocket()
can no longer be accessed from NetworkManagementSocketTagger.

Thus, expose alternative SystemApi to allow invocations from
the module.

Test: TH
Bug: 204830222
Exempt-From-Owner-Approval: 1. Owner approved the change with
  explicitly granted submission after adderessing the
  straight-forward comment. 2. Owner is OOO for 3 months.
Change-Id: Ib54ff54ce3617ae0d04080a1740e78b086bbb039
 2022-01-06 08:49:46 +00:00
Chiachang Wang
ba123cee70 Merge "Add configuration whether to exclude local traffic in the VPN" am: 80178db312 am: 0ea8189d38 am: 4974ca5f52 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1926899

Change-Id: I7cd9bc4cb5e7ff27e773137cb73a490733b27170
 2021-12-28 08:22:57 +00:00
Chiachang Wang
4974ca5f52 Merge "Add configuration whether to exclude local traffic in the VPN" am: 80178db312 am: 0ea8189d38 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1926899

Change-Id: I0827c33efc8661a1788f124812c9685bfa57733b
 2021-12-28 08:09:40 +00:00
Chiachang Wang
de8c621832 Add configuration whether to exclude local traffic in the VPN 
Add a extra variable to store whether the local traffic is
exempted from the VPN.

Bug: 184750836
Test: atest FrameworksNetTests
Change-Id: I70301901c2374ded9fdf179d0ce64e7bb2d7b1ab
 2021-12-28 11:14:01 +08:00
Junyu Lai
499790f024 Merge "[MS10.1] Move multiplySafeByRational to NetworkStatsUtils" am: 6ff6240694 am: 239ffb98df am: c12c9ad508 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1920477

Change-Id: I6bff9f75d9426978d2d4077a3bc54d5c0cb0fe4a
 2021-12-21 01:51:06 +00:00
Junyu Lai
c12c9ad508 Merge "[MS10.1] Move multiplySafeByRational to NetworkStatsUtils" am: 6ff6240694 am: 239ffb98df 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1920477

Change-Id: Icf376927fd8c66ccf22e825f0157fc5b61d985a1
 2021-12-21 01:46:03 +00:00
Junyu Lai
6ff6240694 Merge "[MS10.1] Move multiplySafeByRational to NetworkStatsUtils" 2021-12-21 01:22:14 +00:00
Junyu Lai
b241707f03 [MS10.1] Move multiplySafeByRational to NetworkStatsUtils 
Since NetworkStats related code will be moved to the module.
multiplySafeByRational in the NetworkUtilsInternal cannot be
accessed after that. Thus, create another utils class that
will be moved with NetworkStats code and put the function
into it.

Test: atest NetworkStaticLibTests:com.android.net.moduletests.util.NetworkStatsUtilsTest
Bug: 204830222
Change-Id: I96f3ac02e57b7325ed53988285770f478dee529e
 2021-12-20 09:12:13 +00:00
Hunter Knepshield
93a25e9cd1 Merge "Create CarrierPrivilegesListener callback." am: d54e1126ab am: e66c82b449 am: c7a0de9f6f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1912993

Change-Id: Id89455067252fd32f2c8890af120c4241185fcf7
 2021-12-16 19:48:39 +00:00
Hunter Knepshield
c7a0de9f6f Merge "Create CarrierPrivilegesListener callback." am: d54e1126ab am: e66c82b449 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1912993

Change-Id: Ia3a4afac2c703b6ff411dd981d4899be78d78281
 2021-12-16 19:40:11 +00:00
Hunter Knepshield
d54e1126ab Merge "Create CarrierPrivilegesListener callback." 2021-12-16 19:00:24 +00:00
Ayush Sharma
e41e71aca7 Merge "Revert "Add APIs that allow to exclude routes from VPN"" am: da37e0f471 am: d48a67e944 am: 05fad87223 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1927301

Change-Id: I84505e56bfdb32ab4dc43559d56390d60bc1ff73
 2021-12-16 15:52:37 +00:00
Ayush Sharma
05fad87223 Merge "Revert "Add APIs that allow to exclude routes from VPN"" am: da37e0f471 am: d48a67e944 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1927301

Change-Id: I2847af72de65564d3bda4145ebc05261e9fbe61e
 2021-12-16 15:39:49 +00:00
Ayush Sharma
da37e0f471 Merge "Revert "Add APIs that allow to exclude routes from VPN"" 2021-12-16 15:01:30 +00:00
Ayush Sharma
487b2e645a Revert "Add APIs that allow to exclude routes from VPN" 
Revert "Suppress NewApi warnings for @SystemApi -> public APIs"

Revert "Add VpnServiceBuilderShim for VpnService.Builder"

Revert submission 1551943-vpn-impl

Reason for revert: <DroidMonitor-triggered revert due to breakage https://android-build.googleplex.com/builds/quarterdeck?branch=aosp-master&target=mainline_modules_x86_64-userdebug&lkgb=8007224&lkbb=8008168&fkbb=8007902 >, bug b/210979001
Reverted Changes:
I0e7aa077a:Add VpnServiceBuilderShim for VpnService.Builder
Ib12f5ab39:Suppress NewApi warnings for @SystemApi -> public ...
I59b9185cf:Unhide RouteInfo#getType and related fields
Ie5b62b2b2:Unhide IpPrefix(InetAddress, int)
I993a32d40:Add CTS tests for exclude VPN routes APIs
Ib24b2d3fb:Suppress NewApi warnings for @SystemApi -> public ...
Ic3b10464a:Add APIs that allow to exclude routes from VPN

Change-Id: I89209357ab4bb206d206adcf9fd6d3498ce6ef4c
BUG: 210979001
 2021-12-16 14:40:13 +00:00