LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,103 Commits 2 Branches 0 Tags
73ffff59ebff5556a6aa601a88efe44c421b370b
Commit Graph

1103 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Les Lee
73ffff59eb [automerger skipped] Merge "Add metered filter for API: buildTemplateCarrier" into sc-dev am: 8a2405cb6d -s ours 
am skip reason: Merged-In I7196d62bb60844458a6c4b1d94e2baccb71e15cd with SHA-1 575b5569f6 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
8a2405cb6d Merge "Add metered filter for API: buildTemplateCarrier" into sc-dev 2021-05-19 14:32:29 +00:00
Junyu Lai
3ce2e480ca [automerger skipped] Merge changes I3ba50cbd,I970ee365 into sc-dev am: 458a60dab5 -s ours 
am skip reason: Merged-In I3ba50cbd8a7f60779c69ba85e10dc3cc8a52f8b1 with SHA-1 5744432f28 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
458a60dab5 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
ed43c9e5bd [automerger skipped] Merge "[VCN21] Do not add NOT_VCN_MANAGED capability if specifier is present" into sc-dev am: 0dc5e2a8a2 -s ours 
am skip reason: Merged-In I98dd3f4652dc067eb5c4666e952db6c854bcbb10 with SHA-1 9ef2350d50 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
0dc5e2a8a2 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
35687f5979 [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
868f670bde [automerger skipped] Merge "Move config_apf* resources to NetworkStack" into sc-dev am: 1ac0e834c9 -s ours 
am skip reason: Merged-In I7a15ddcad5af11fa307d9dbe3a77b31a1179e5b3 with SHA-1 b11ba415f6 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
1ac0e834c9 Merge "Move config_apf* resources to NetworkStack" into sc-dev 2021-05-19 07:54:19 +00:00
Remi NGUYEN VAN
38670e2722 Merge "Move config_apf* resources to NetworkStack" am: 999427e138 am: 625ead50f8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684656

Change-Id: I93f5fd10f6c365365ff0e89ca4221d58d420c5ac
 2021-05-19 03:11:41 +00:00
lesl
f96f02703e 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
Remi NGUYEN VAN
625ead50f8 Merge "Move config_apf* resources to NetworkStack" am: 999427e138 
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
be047e2855 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
999427e138 Merge "Move config_apf* resources to NetworkStack" 2021-05-19 00:58:52 +00:00
Nikita Iashchenko
7623af2cf2 Merge "Move IoUtils#deleteContents from CorePlatformApi set to framework" am: fc41cdfd4c am: 0dd0180edb 
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
0dd0180edb Merge "Move IoUtils#deleteContents from CorePlatformApi set to framework" am: fc41cdfd4c 
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
fc41cdfd4c Merge "Move IoUtils#deleteContents from CorePlatformApi set to framework" 2021-05-18 22:13:56 +00:00
Les Lee
bb4bc3f5b4 Merge "Support to query TYPE_WIFI usage with subscriberId" am: ad9e8eeabd am: cd1dab8a12 
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
b4eb42ef34 Merge "Add metered filter for API: buildTemplateCarrier" am: 4c7cc726d1 am: 1851af8e93 
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
cd1dab8a12 Merge "Support to query TYPE_WIFI usage with subscriberId" am: ad9e8eeabd 
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
1851af8e93 Merge "Add metered filter for API: buildTemplateCarrier" am: 4c7cc726d1 
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
ad9e8eeabd Merge "Support to query TYPE_WIFI usage with subscriberId" 2021-05-18 13:02:07 +00:00
Les Lee
4c7cc726d1 Merge "Add metered filter for API: buildTemplateCarrier" 2021-05-18 13:01:38 +00:00
Chiachang Wang
1006632fb5 [automerger skipped] Merge "Dump only NORMAL priority information if no priority assigned" into sc-dev am: 646af9c067 -s ours 
am skip reason: Merged-In I6825c5038e48e3060c0c3ad1512bd584ef6d10a7 with SHA-1 c13a0a066c 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
646af9c067 Merge "Dump only NORMAL priority information if no priority assigned" into sc-dev 2021-05-18 11:57:53 +00:00
Treehugger Robot
963d7105d2 Merge "[VCN21] Do not add NOT_VCN_MANAGED capability if specifier is present" am: 4eedd4ac23 am: cc1fd37a6e 
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
cc1fd37a6e Merge "[VCN21] Do not add NOT_VCN_MANAGED capability if specifier is present" am: 4eedd4ac23 
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
4eedd4ac23 Merge "[VCN21] Do not add NOT_VCN_MANAGED capability if specifier is present" 2021-05-18 08:35:06 +00:00
Lorenzo Colitti
59871f3c96 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
86714b1fd2 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
4018d45d9e Merge "Dump only NORMAL priority information if no priority assigned" am: f93d99deae am: 0b80e965ac 
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
0b80e965ac 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
12d32a673f 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
a9d7b6dd4a Merge "Add ConnectivityAnnotations class" into sc-dev am: 1bbb7a7570 
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
1bbb7a7570 Merge "Add ConnectivityAnnotations class" into sc-dev 2021-05-17 14:07:45 +00:00
Chiachang Wang
c13a0a066c 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
9be9f5832b Merge "Register APPS_ALLOWED_ON_RESTRICTED_NETWORKS setting observer" am: 43864e564b am: 87938ce71d 
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
87938ce71d Merge "Register APPS_ALLOWED_ON_RESTRICTED_NETWORKS setting observer" am: 43864e564b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1689573

Change-Id: If352718bf7de1c6446f291710c2b114ffd57abc6
 2021-05-17 07:31:32 +00:00
junyulai
9ef2350d50 [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
43864e564b Merge "Register APPS_ALLOWED_ON_RESTRICTED_NETWORKS setting observer" 2021-05-17 06:45:52 +00:00
junyulai
0f57022302 [FUI29] Migrate ConnectivityService to use getAllNetworkStateSnapshots 
Test: atest FrameworksNetTests
Bug: 174123988
Merged-In: I3ba50cbd8a7f60779c69ba85e10dc3cc8a52f8b1
Change-Id: I3ba50cbd8a7f60779c69ba85e10dc3cc8a52f8b1
  (cherry-picked from aosp/1620859)
 2021-05-17 14:07:00 +08:00
junyulai
6322aeb7f0 [FUI27] Fix internal naming of notifyNetworkStatus 
Test: TH
Bug: 174123988
Merged-In: I970ee365ca221956ee85788005d331374b5fa71a
Change-Id: I970ee365ca221956ee85788005d331374b5fa71a
  (cherry-picked from aosp/1620539)
 2021-05-17 14:07:00 +08:00
Paul Hu
c5f851c933 Merge "Read APPS_ALLOWED_ON_RESTRICTED_NETWORKS setting from PermissionMonitor" am: 8665f56ca1 am: 8aa632a19e 
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
8aa632a19e Merge "Read APPS_ALLOWED_ON_RESTRICTED_NETWORKS setting from PermissionMonitor" am: 8665f56ca1 
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
8665f56ca1 Merge "Read APPS_ALLOWED_ON_RESTRICTED_NETWORKS setting from PermissionMonitor" 2021-05-17 03:04:59 +00:00
Chiachang Wang
d699381492 [automerger skipped] Merge "Replace clearAll with withoutDefaultCapabilities" am: b4c624aece am: f27534ba53 -s ours 
am skip reason: Merged-In Ida8d25d57504864f046e3403f593cc606fbfe982 with SHA-1 df9611cab7 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
f27534ba53 Merge "Replace clearAll with withoutDefaultCapabilities" am: b4c624aece 
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
b4c624aece Merge "Replace clearAll with withoutDefaultCapabilities" 2021-05-17 01:56:52 +00:00
paulhu
f11da7e205 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
a7b9535fde 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