Nikita Iashchenko
ecf93ebf39
Merge "Move IoUtils#deleteContents from CorePlatformApi set to framework" am: a8eb4abf4d am: a5b968f7ca
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1686657
Change-Id: I08b1d281a3b71556d783b1d4f352bc7a4ba8e879
2021-05-18 23:27:10 +00:00
Nikita Iashchenko
a5b968f7ca
Merge "Move IoUtils#deleteContents from CorePlatformApi set to framework" am: a8eb4abf4d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1686657
Change-Id: I2aced35532a572f7912abde832cfdce66c34a3d0
2021-05-18 23:07:28 +00:00
Nikita Iashchenko
a8eb4abf4d
Merge "Move IoUtils#deleteContents from CorePlatformApi set to framework"
2021-05-18 22:13:56 +00:00
Les Lee
b986c2352b
Merge "Support to query TYPE_WIFI usage with subscriberId" am: 0c461a4252 am: c890b3cfb5
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1608057
Change-Id: Ifeaab15fbf20b318bb7b35aa6b4604f21e2c98a1
2021-05-18 13:57:43 +00:00
Les Lee
727b2eac5b
Merge "Add metered filter for API: buildTemplateCarrier" am: bc5af1fa71 am: 71349734b7
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1699687
Change-Id: I46d8d8f0d9b83fb0a817a3455cbbc28d558b871c
2021-05-18 13:57:06 +00:00
Les Lee
c890b3cfb5
Merge "Support to query TYPE_WIFI usage with subscriberId" am: 0c461a4252
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1608057
Change-Id: I753603201bd935af055cf25135e4f8faf436bf2a
2021-05-18 13:35:08 +00:00
Les Lee
71349734b7
Merge "Add metered filter for API: buildTemplateCarrier" am: bc5af1fa71
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1699687
Change-Id: Iac42f02079de5c0507209741e648b13da667fb94
2021-05-18 13:26:24 +00:00
Les Lee
0c461a4252
Merge "Support to query TYPE_WIFI usage with subscriberId"
2021-05-18 13:02:07 +00:00
Les Lee
bc5af1fa71
Merge "Add metered filter for API: buildTemplateCarrier"
2021-05-18 13:01:38 +00:00
Chiachang Wang
69c73252a6
[automerger skipped] Merge "Dump only NORMAL priority information if no priority assigned" into sc-dev am: ad4e3bbd5b -s ours
...
am skip reason: Merged-In I6825c5038e48e3060c0c3ad1512bd584ef6d10a7 with SHA-1 987b73fbe0 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14580814
Change-Id: I5f08130dfd3434960bbda59ef98784873437882a
2021-05-18 12:12:54 +00:00
Chiachang Wang
ad4e3bbd5b
Merge "Dump only NORMAL priority information if no priority assigned" into sc-dev
2021-05-18 11:57:53 +00:00
Treehugger Robot
9493879b31
Merge "[VCN21] Do not add NOT_VCN_MANAGED capability if specifier is present" am: d5fbc078d1 am: 1587b248cd
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1705390
Change-Id: I6a009ce0b78fb684fe75cedb7fedb96a0ca9bdca
2021-05-18 09:57:20 +00:00
Treehugger Robot
1587b248cd
Merge "[VCN21] Do not add NOT_VCN_MANAGED capability if specifier is present" am: d5fbc078d1
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1705390
Change-Id: I0d8dd61da97e675ba70fd7dd5f1e889d8a2e54f7
2021-05-18 09:36:15 +00:00
Treehugger Robot
d5fbc078d1
Merge "[VCN21] Do not add NOT_VCN_MANAGED capability if specifier is present"
2021-05-18 08:35:06 +00:00
Lorenzo Colitti
30a5c3cca5
Merge "Allow unprivileged NetworkCallbacks to see other UIDs' networks." into sc-dev am: 846ae25be5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14597477
Change-Id: I83b704af8a5ee4a132030e973d301539c2e57fc3
2021-05-18 07:12:50 +00:00
Lorenzo Colitti
d82c1ec110
Allow unprivileged NetworkCallbacks to see other UIDs' networks.
...
Currently, unprivileged apps can call getAllNetworks() to see
all networks on the system, even networks that do not apply to
them. Allow them to do this via NetworkCallbacks as well.
This is the last piece of information that was only available
through getAllNetworks, so this CL deprecates that API.
Bug: 187921303
Test: new unit tests
Test: CTS test in other CL in topic
Change-Id: I30f1021927d3c8eae6525116c61ff4a4acecff6d
2021-05-18 12:24:07 +09:00
Chiachang Wang
c5b866e672
Merge "Dump only NORMAL priority information if no priority assigned" am: f93d99deae am: 7eaaaf6f1c
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1708333
Change-Id: Id1564d19efab63fbcfe161442fc85ba64a481160
2021-05-18 03:07:26 +00:00
Chiachang Wang
7eaaaf6f1c
Merge "Dump only NORMAL priority information if no priority assigned" am: f93d99deae
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1708333
Change-Id: I7c3bd130b67c40bb8be23073dbfa4aaf85624016
2021-05-18 02:37:13 +00:00
Chiachang Wang
dc8fdde331
Dump only NORMAL priority information if no priority assigned
...
The legacy design of "dumpsys connectivity" will only dump
information with NORMAL priority. It was updated to provide
both NORMAL and HIGH priority information in order to support
dump in bugreport. However, it will also affect the result
using dumpsys connectivity.
Update design to dump NORMAL priority only to align with legacy
design.
Bug: 188387185
Test: adb shell dumpsys connectivity
Test: adb bugreport and check the result in bugreport
Change-Id: I6825c5038e48e3060c0c3ad1512bd584ef6d10a7
Merged-In: I6825c5038e48e3060c0c3ad1512bd584ef6d10a7
2021-05-18 02:13:42 +00:00
Aaron Huang
ddf42f822b
Merge "Add ConnectivityAnnotations class" into sc-dev am: 3610ac6ad1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14186142
Change-Id: Ib74156e9f29e62e861d19f5b58a12ab106478b4c
2021-05-17 14:26:25 +00:00
Aaron Huang
3610ac6ad1
Merge "Add ConnectivityAnnotations class" into sc-dev
2021-05-17 14:07:45 +00:00
Chiachang Wang
987b73fbe0
Dump only NORMAL priority information if no priority assigned
...
The legacy design of "dumpsys connectivity" will only dump
information with NORMAL priority. It was updated to provide
both NORMAL and HIGH priority information in order to support
dump in bugreport. However, it will also affect the result
using dumpsys connectivity.
Update design to dump NORMAL priority only to align with legacy
design.
Bug: 188387185
Test: adb shell dumpsys connectivity
Test: adb bugreport and check the result in bugreport
Change-Id: I6825c5038e48e3060c0c3ad1512bd584ef6d10a7
2021-05-17 17:31:07 +08:00
Paul Hu
21860ce119
Merge "Register APPS_ALLOWED_ON_RESTRICTED_NETWORKS setting observer" am: accfb247b2 am: 993aaedf1e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1689573
Change-Id: Ide30d62481724f0c93b6302ddc871ef7fe10cfd8
2021-05-17 08:06:08 +00:00
Paul Hu
993aaedf1e
Merge "Register APPS_ALLOWED_ON_RESTRICTED_NETWORKS setting observer" am: accfb247b2
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1689573
Change-Id: If352718bf7de1c6446f291710c2b114ffd57abc6
2021-05-17 07:31:32 +00:00
junyulai
59177af317
[VCN21] Do not add NOT_VCN_MANAGED capability if specifier is present
...
Test: atest NetworkRequestTest#testBypassingVcn
Fix: 176939355
Change-Id: I98dd3f4652dc067eb5c4666e952db6c854bcbb10
2021-05-17 07:04:13 +00:00
Paul Hu
accfb247b2
Merge "Register APPS_ALLOWED_ON_RESTRICTED_NETWORKS setting observer"
2021-05-17 06:45:52 +00:00
Paul Hu
70c7639228
Merge "Read APPS_ALLOWED_ON_RESTRICTED_NETWORKS setting from PermissionMonitor" am: dec7232c75 am: 6d8b78770a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1689572
Change-Id: I216224011720d64316b9801ef54859b8de2bdb89
2021-05-17 03:52:42 +00:00
Paul Hu
6d8b78770a
Merge "Read APPS_ALLOWED_ON_RESTRICTED_NETWORKS setting from PermissionMonitor" am: dec7232c75
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1689572
Change-Id: I5515f041b783e36ca439e2b7b1d77e93ee329be0
2021-05-17 03:28:16 +00:00
Paul Hu
dec7232c75
Merge "Read APPS_ALLOWED_ON_RESTRICTED_NETWORKS setting from PermissionMonitor"
2021-05-17 03:04:59 +00:00
Chiachang Wang
420d77919d
[automerger skipped] Merge "Replace clearAll with withoutDefaultCapabilities" am: 98546082cc am: d19bda6e8c -s ours
...
am skip reason: Merged-In Ida8d25d57504864f046e3403f593cc606fbfe982 with SHA-1 c5c3bfb20e is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1708330
Change-Id: I7c3a7d6d8ba6b93546d0b436f2d63ab2ae1d2bb9
2021-05-17 03:04:50 +00:00
Chiachang Wang
d19bda6e8c
Merge "Replace clearAll with withoutDefaultCapabilities" am: 98546082cc
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1708330
Change-Id: Ibb29c90f818ca6f447d91f0eda0abe0ef82363dd
2021-05-17 02:29:35 +00:00
Chiachang Wang
98546082cc
Merge "Replace clearAll with withoutDefaultCapabilities"
2021-05-17 01:56:52 +00:00
paulhu
0d9553a5c1
Register APPS_ALLOWED_ON_RESTRICTED_NETWORKS setting observer
...
PermissionMonitor register APPS_ALLOWED_ON_RESTRICTED_NETWORKS
setting observer to listen setting changed callback. Then update
or revoke permission for those apps.
Bug: 185149952
Test: atest FrameworksNetTests
Change-Id: I4b6a21bd3f47b7bcaac36fcabf1202a5a84a4520
2021-05-16 15:52:36 +00:00
paulhu
5d847b19cd
Read APPS_ALLOWED_ON_RESTRICTED_NETWORKS setting from PermissionMonitor
...
Let PermissionMonitor read APPS_ALLOWED_ON_RESTRICTED_NETWORKS
setting and grant netd system permission to uids whose package
name is listed in setting.
Bug: 185149952
Test: atest FrameworksNetTests
Change-Id: I856b545c0339a262abbe9d432cfda125bc82dc12
2021-05-16 23:48:55 +08:00
lesl
645be7b586
Support to query TYPE_WIFI usage with subscriberId
...
Previous the API ignores subscriberId when network type is WIFI.
Allow caller to call querySummaryXXXX with TYPE: WIFI
+ subscriberId: IMSI to get carrier merged wifi usage which matches the wifi
network with the given IMSI.
Bug: 176396812
Test: atest -c NetworkStatsServiceTest
Change-Id: Ia033521a24e2bb56182d74a41bb2b39710571782
2021-05-16 22:18:32 +08:00
Junyu Lai
ae76c2c199
Merge changes I3ba50cbd,I970ee365 am: 260b398281 am: c3fde912c6
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1620859
Change-Id: If9a3e37e5359b955e330002d81cbeb48f90ee22b
2021-05-15 17:24:42 +00:00
Junyu Lai
c3fde912c6
Merge changes I3ba50cbd,I970ee365 am: 260b398281
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1620859
Change-Id: I2cf4ea0abb1ff7bc74302cce16cbe8041b08d321
2021-05-15 16:53:30 +00:00
Junyu Lai
260b398281
Merge changes I3ba50cbd,I970ee365
...
* changes:
[FUI29] Migrate ConnectivityService to use getAllNetworkStateSnapshots
[FUI27] Fix internal naming of notifyNetworkStatus
2021-05-15 16:21:38 +00:00
Jayachandran Chinnakkannu
db9428d005
Merge "QOS filter matching support based on remote address and port number for connected sockets" am: fd92919d9d am: 61736254b7 am: cea0264ef0 am: 2e83d431f0
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1687813
Change-Id: I6cd8f7852b2231a59b990a20658a232df6ce87e4
2021-05-14 21:26:14 +00:00
Jayachandran Chinnakkannu
2e83d431f0
Merge "QOS filter matching support based on remote address and port number for connected sockets" am: fd92919d9d am: 61736254b7 am: cea0264ef0
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1687813
Change-Id: I04ada71bdea2c3851fd6925126f6ff2bfdecad2c
2021-05-14 21:19:17 +00:00
Jayachandran Chinnakkannu
cf6df117e0
Merge "QOS filter matching support based on remote address and port number for connected sockets" am: fd92919d9d am: 61736254b7
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1687813
Change-Id: I32f71d0bc49e6a348d64cb0adb8abf421677f306
2021-05-14 20:54:05 +00:00
Jayachandran Chinnakkannu
cea0264ef0
Merge "QOS filter matching support based on remote address and port number for connected sockets" am: fd92919d9d am: 61736254b7
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1687813
Change-Id: I6f1d972f822b022995cfdc99942f1167a4f8ef0d
2021-05-14 20:53:05 +00:00
Jayachandran Chinnakkannu
61736254b7
Merge "QOS filter matching support based on remote address and port number for connected sockets" am: fd92919d9d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1687813
Change-Id: Ibd70a86d82d4810425288694f2e3904d471a2d24
2021-05-14 20:28:38 +00:00
Jayachandran Chinnakkannu
fd92919d9d
Merge "QOS filter matching support based on remote address and port number for connected sockets"
2021-05-14 20:02:30 +00:00
Junyu Lai
1bdbacd83c
Merge "[FUI26] Address comments on aosp/1560408" am: 819b9a637e am: ee455cedce am: 35039336a6
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1618845
Change-Id: I8c62d218953027ee2fb5426ddacae5a6f8bb6c73
2021-05-14 12:20:10 +00:00
Junyu Lai
35039336a6
Merge "[FUI26] Address comments on aosp/1560408" am: 819b9a637e am: ee455cedce
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1618845
Change-Id: If6b9da9ce754f33868305075013b0f82ff64fedb
2021-05-14 12:03:29 +00:00
junyulai
565a3085ce
[FUI29] Migrate ConnectivityService to use getAllNetworkStateSnapshots
...
Test: atest FrameworksNetTests
Bug: 174123988
Change-Id: I3ba50cbd8a7f60779c69ba85e10dc3cc8a52f8b1
2021-05-14 19:48:17 +08:00
junyulai
5eb5fbfce3
[FUI27] Fix internal naming of notifyNetworkStatus
...
Test: TH
Bug: 174123988
Change-Id: I970ee365ca221956ee85788005d331374b5fa71a
2021-05-14 19:48:17 +08:00
Junyu Lai
ee455cedce
Merge "[FUI26] Address comments on aosp/1560408" am: 819b9a637e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1618845
Change-Id: Idde0e161d6241a5c45c0b751e1fca912ed10c7a8
2021-05-14 11:48:14 +00:00
Junyu Lai
819b9a637e
Merge "[FUI26] Address comments on aosp/1560408"
2021-05-14 11:34:09 +00:00