LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
15,020 Commits 2 Branches 0 Tags
4b84bc4febf8523a7b806c7dc84016e670292d2d
Commit Graph

15020 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Les Lee
4b84bc4feb [automerger skipped] Merge "Support to query TYPE_WIFI usage with subscriberId" into sc-dev am: 97385fe60d -s ours 
am skip reason: Merged-In Ia033521a24e2bb56182d74a41bb2b39710571782 with SHA-1 645be7b586 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14622496

Change-Id: If1a3eeb5077d7b078a3be260e01c4cf3f6790437
 2021-05-20 09:06:38 +00:00
Paul Hu
86d9827212 [automerger skipped] Merge "Register APPS_ALLOWED_ON_RESTRICTED_NETWORKS setting observer" into sc-dev am: 92357d0683 -s ours 
am skip reason: Merged-In I4b6a21bd3f47b7bcaac36fcabf1202a5a84a4520 with SHA-1 0d9553a5c1 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14622493

Change-Id: I2b1a734003cf71be772550bfef68f3c057d1f22f
 2021-05-20 09:06:24 +00:00
Les Lee
97385fe60d Merge "Support to query TYPE_WIFI usage with subscriberId" into sc-dev 2021-05-20 08:55:59 +00:00
Paul Hu
92357d0683 Merge "Register APPS_ALLOWED_ON_RESTRICTED_NETWORKS setting observer" into sc-dev 2021-05-20 08:45:35 +00:00
Paul Hu
2019dcef2e [automerger skipped] Merge "Read APPS_ALLOWED_ON_RESTRICTED_NETWORKS setting from PermissionMonitor" into sc-dev am: be72086fff -s ours 
am skip reason: Merged-In I856b545c0339a262abbe9d432cfda125bc82dc12 with SHA-1 5d847b19cd is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14622492

Change-Id: Idd31246804a7374929545c7a4c021058a33a9758
 2021-05-20 06:02:38 +00:00
Paul Hu
be72086fff Merge "Read APPS_ALLOWED_ON_RESTRICTED_NETWORKS setting from PermissionMonitor" into sc-dev 2021-05-20 05:57:25 +00:00
TreeHugger Robot
3c1aac187d Merge "Check NETWORK_SETTINGS permission for getAllNetworkStateSnapshots" into sc-dev am: a99476773f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14601670

Change-Id: Ib259c6351471aca6656dc4d46bb7242228a226c2
 2021-05-20 04:21:42 +00:00
TreeHugger Robot
a99476773f Merge "Check NETWORK_SETTINGS permission for getAllNetworkStateSnapshots" into sc-dev 2021-05-20 03:59:55 +00:00
Remi NGUYEN VAN
6a6e3859cf Merge "Remove legacy resources fallback from Connectivity" into sc-dev am: ae18da9ebe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14622504

Change-Id: Iee4dd439c3f98e600c6a6b1ed6a73384f9a1c2ac
 2021-05-20 03:35:35 +00:00
Remi NGUYEN VAN
ae18da9ebe Merge "Remove legacy resources fallback from Connectivity" into sc-dev 2021-05-20 03:03:16 +00:00
Les Lee
76b4c2abeb [automerger skipped] Merge "Add metered filter for API: buildTemplateCarrier" into sc-dev am: c95482c53d -s ours 
am skip reason: Merged-In I7196d62bb60844458a6c4b1d94e2baccb71e15cd with SHA-1 79ac43db9e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14622495

Change-Id: Ica7cf82e3d17cbe5d0577e14faa563cfbfdc9385
 2021-05-19 14:48:10 +00:00
Les Lee
c95482c53d Merge "Add metered filter for API: buildTemplateCarrier" into sc-dev 2021-05-19 14:32:29 +00:00
Junyu Lai
4d35445f7e [automerger skipped] Merge changes I3ba50cbd,I970ee365 into sc-dev am: 6ff0bbc3ac -s ours 
am skip reason: Merged-In I3ba50cbd8a7f60779c69ba85e10dc3cc8a52f8b1 with SHA-1 565a3085ce is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14562500

Change-Id: Ic87d5b62ddd55ec1c264839dd84c3c375794e428
 2021-05-19 12:57:00 +00:00
Junyu Lai
6ff0bbc3ac Merge changes I3ba50cbd,I970ee365 into sc-dev 
* changes:
  [FUI29] Migrate ConnectivityService to use getAllNetworkStateSnapshots
  [FUI27] Fix internal naming of notifyNetworkStatus
 2021-05-19 12:36:03 +00:00
Junyu Lai
0b2fd00acc [automerger skipped] Merge "[VCN21] Do not add NOT_VCN_MANAGED capability if specifier is present" into sc-dev am: 7290bf7e2e -s ours 
am skip reason: Merged-In I98dd3f4652dc067eb5c4666e952db6c854bcbb10 with SHA-1 59177af317 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14550548

Change-Id: I4bd31102915e420296d0e3566c07239cab2e0c3b
 2021-05-19 12:03:01 +00:00
Junyu Lai
7290bf7e2e Merge "[VCN21] Do not add NOT_VCN_MANAGED capability if specifier is present" into sc-dev 2021-05-19 11:31:39 +00:00
junyulai
1ebade181e [VCN21] Do not add NOT_VCN_MANAGED capability if specifier is present 
Test: atest NetworkRequestTest#testBypassingVcn
Fix: 176939355
Fix: 188597540
Merged-In: I98dd3f4652dc067eb5c4666e952db6c854bcbb10
Change-Id: I98dd3f4652dc067eb5c4666e952db6c854bcbb10
  (cherry-picked from aosp/1705390)
 2021-05-19 09:52:03 +00:00
Remi NGUYEN VAN
498261b15c [automerger skipped] Merge "Move config_apf* resources to NetworkStack" into sc-dev am: 66b0a0361b -s ours 
am skip reason: Merged-In I7a15ddcad5af11fa307d9dbe3a77b31a1179e5b3 with SHA-1 e9836cc431 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14622500

Change-Id: Ic8d42beef91705149641db3f63bc1a3c0ee162f4
 2021-05-19 08:11:23 +00:00
Remi NGUYEN VAN
66b0a0361b Merge "Move config_apf* resources to NetworkStack" into sc-dev 2021-05-19 07:54:19 +00:00
Remi NGUYEN VAN
4806af5218 Remove legacy resources fallback from Connectivity 
Stop reading legacy resources as fallback, and only use resources in
ServiceConnectivityResources.

Bug: 185850634
Test: atest CtsNetTestCases FrameworksNetTests
Change-Id: I224f1ef9a1a8d6e636c7e9550845ab3e1394d7f3
 2021-05-19 12:13:48 +09:00
Remi NGUYEN VAN
159c362b21 Merge "Move config_apf* resources to NetworkStack" am: c52f4eb2c6 am: 8f0380f066 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684656

Change-Id: I93f5fd10f6c365365ff0e89ca4221d58d420c5ac
 2021-05-19 03:11:41 +00:00
lesl
2ef2fa7605 Add metered filter for API: buildTemplateCarrier 
This CL modifies NetworkTemplate#buildTemplateCarrier to force on
metered carrier network and rename to buildTemplateCarrierMetered.
This method was introduced recently and has no callers.

This method will be used in Settings and NetworkPolicyManagerService
to display and manage data usage on carrier metered networks.

Settings/NetworkPolicyManagerService will use it instead of the existing
method buildTemplateMobileAll method, which only matches metered networks.
That code will change from matching metered mobile networks to matching
metered carrier networks.

Note: The carrier metered network includes metered mobile network and
metered "merged carrier wifi network" that is a specific cerrier wifi network
which provides the same user experience as mobile.

Bug: 176396812
Test: atest -c NetworkTemplateTest
Change-Id: I7196d62bb60844458a6c4b1d94e2baccb71e15cd
Merged-In: I7196d62bb60844458a6c4b1d94e2baccb71e15cd
 2021-05-19 02:53:39 +00:00
lesl
e650c5d898 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
Merged-In: Ia033521a24e2bb56182d74a41bb2b39710571782
 2021-05-19 02:53:16 +00:00
Remi NGUYEN VAN
8f0380f066 Merge "Move config_apf* resources to NetworkStack" am: c52f4eb2c6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684656

Change-Id: Ie51eae491092389fbc7321491da6129c24c3de00
 2021-05-19 02:37:01 +00:00
Remi NGUYEN VAN
3aee5b63e6 Move config_apf* resources to NetworkStack 
The resources are only read by NetworkStack through their respective
ApfCapabilities SystemApi methods.
As the resources are being migrated out of frameworks/base resources
anyway, move them directly to NetworkStack instead of moving them to
ServiceConnectivityResources.

Also test that the framework resources are not overlaid or modified.
This should avoid OEM integration errors where the overlays are kept as
in R, without overlaying the resource in the NetworkStack package.

Bug: 185850634
Test: atest CtsNetTestCases
BYPASS_INCLUSIVE_LANGUAGE_REASON=Need to mention legacy APIs

Merged-In: I7a15ddcad5af11fa307d9dbe3a77b31a1179e5b3
(clean cherry-pick)

Change-Id: I7a15ddcad5af11fa307d9dbe3a77b31a1179e5b3
 2021-05-19 11:00:58 +09:00
Remi NGUYEN VAN
c52f4eb2c6 Merge "Move config_apf* resources to NetworkStack" 2021-05-19 00:58:52 +00:00
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
Paul Hu
aacdca1227 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
Merged-In: I4b6a21bd3f47b7bcaac36fcabf1202a5a84a4520
(clean cherry-pick)

Change-Id: I4b6a21bd3f47b7bcaac36fcabf1202a5a84a4520
 2021-05-18 14:19:56 +00:00
Paul Hu
8ee4d96282 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
Merged-In: I856b545c0339a262abbe9d432cfda125bc82dc12
(clean cherry-pick)

Change-Id: I856b545c0339a262abbe9d432cfda125bc82dc12
 2021-05-18 14:16:57 +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
junyulai
91113d4f4a Check NETWORK_SETTINGS permission for getAllNetworkStateSnapshots 
This is declared in the API surface, but the implementation
does not match.

Ignore-AOSP-First: Needs cherry-picks
Test: atest CtsNetTestCases:android.net.cts.ConnectivityManagerTest#testGetAllNetworkStateSnapshots
Bug: 188140631
Change-Id: I97aa69651461ebe5c323ec669372f9a61b84e6a6
 2021-05-17 21:53:18 +08:00