Merge "Test [set|get]AppExclusionList" am: 34a257ad5f am: 227e4f18a5
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2076483
Change-Id: I93b2b057f6c2ab0fd63f2d39de5eefad0743ddc1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Chiachang Wang
authored and
Automerger Merge Worker
commited 2022-05-05 02:20:04 +00:00
e85648b4a5
Test [set|get]AppExclusionList
...
Bug: 192078259
Test: atest FrameworksNetTests
Change-Id: Iee81d84b4127420121ce2d5a7defc3dbe34b6cde
chiachangwang
authored and
Chiachang Wang
commited 2022-05-04 10:13:46 +00:00
218d5652de
Merge "Follow-up 2076940: Allow device owner to configure profile network preference " am: a14bd2a032 am: 82e76fab0a
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2083405
Change-Id: I6e6f284076e1eb4de8dc09b7eebdbf2eff19ae95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Treehugger Robot
authored and
Automerger Merge Worker
commited 2022-05-02 15:49:56 +00:00
2d30a274d9
Merge "Follow-up 2076940: Allow device owner to configure profile network preference "
Treehugger Robot
authored and
Gerrit Code Review
commited 2022-05-02 15:00:55 +00:00
a14bd2a032
Follow-up 2076940: Allow device owner to configure profile network preference
...
https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2076940
Fixes build failure
Bug: 231104107
Test: tests/unit/java/com/android/server/ConnectivityServiceTest.java
Change-Id: I7b6a3880ce0b0b9ad6fc6aa7a5fd4e249bb1606d
Vadim Caen
commited 2022-05-02 09:22:32 +00:00
baade1ca1e
Merge "Allow device owner to configure profile network preference" am: 07a20408db am: 87f4d52d9f
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2076940
Change-Id: I3c170a47f89bfe87cacdc7332cb318b63c05d5a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Sooraj Sasindran
authored and
Automerger Merge Worker
commited 2022-05-02 07:43:12 +00:00
19f11ae93c
Merge "Allow device owner to configure profile network preference"
Sooraj Sasindran
authored and
Gerrit Code Review
commited 2022-05-02 07:13:21 +00:00
07a20408db
Allow device owner to configure profile network preference
...
isMangedProfile returns true for managed profiles.
But enterprise device can be fully managed like device owner.
Hence check specifically if request is coming on fully managed
device.
Bug: 226966328
Bug: 231071836
Test: ran DevicePolicyManager CTS and ConnectivityServiceTest
Change-Id: I7827466bd61e24ba9c36c3a2e25043257e2ed602
Sooraj Sasindran
commited 2022-05-01 21:20:36 -07:00
bb65aa8fc2
Merge changes from topics "CATEGORY_ERROR_IKE", "CATEGORY_ERROR_NETWORK", "CATEGORY_ERROR_USER_DEACTIVATED", "CATEGORY_EVENT_ALWAYS_ON_STATE_CHANGED" am: 025a3c993a am: be18923405
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1956069
Change-Id: Idbb887a00e1e1b45a47bf1be4cadc89649ebbc0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Lucas Lin
authored and
Automerger Merge Worker
commited 2022-04-29 20:13:08 +00:00
f0b7e57ca7
Test VpnManager event for CATEGORY_EVENT_IKE_ERROR am: 827b44daea am: cef31c9562
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1956036
Change-Id: I3825e450f1e74217dfa6cfd41ceb8a1c487f64e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
lucaslin
authored and
Automerger Merge Worker
commited 2022-04-29 20:13:06 +00:00
ceebe448d7
Test VpnManager event for CATEGORY_EVENT_ALWAYS_ON_STATE_CHANGED am: 0772c169b5 am: 84992958f6
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2070968
Change-Id: I70eb9d90f41e0100ede17af4bd670ab422fe308e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
lucaslin
authored and
Automerger Merge Worker
commited 2022-04-29 20:13:04 +00:00
1c6fd861aa
Test VpnManager event for CATEGORY_EVENT_DEACTIVATED_BY_USER am: c5bf088ced am: 4ebe1bdd4f
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1955936
Change-Id: I87d29e1078d8aa8a3516080ee438168e036af11e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
lucaslin
authored and
Automerger Merge Worker
commited 2022-04-29 20:13:01 +00:00
472ec76971
Test VpnManager event for CATEGORY_EVENT_IKE_ERROR am: 827b44daea
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1956036
Change-Id: Ifde51b2ee0c3e252911fca5314b2808e4adb94cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
lucaslin
authored and
Automerger Merge Worker
commited 2022-04-29 19:53:47 +00:00
cef31c9562
Test VpnManager event for CATEGORY_EVENT_ALWAYS_ON_STATE_CHANGED am: 0772c169b5
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2070968
Change-Id: I51615394160058bc1defa4b298a8a61fb0b1a52e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
lucaslin
authored and
Automerger Merge Worker
commited 2022-04-29 19:53:44 +00:00
84992958f6
Test VpnManager event for CATEGORY_EVENT_DEACTIVATED_BY_USER am: c5bf088ced
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1955936
Change-Id: I08dfbc1cb8895bae5151c2ef1d7042d4f7c03e6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
lucaslin
authored and
Automerger Merge Worker
commited 2022-04-29 19:53:39 +00:00
4ebe1bdd4f
Merge changes from topics "CATEGORY_ERROR_IKE", "CATEGORY_ERROR_NETWORK", "CATEGORY_ERROR_USER_DEACTIVATED", "CATEGORY_EVENT_ALWAYS_ON_STATE_CHANGED"
...
* changes:
Test VpnManager event for CATEGORY_EVENT_NETWORK_ERROR
Test VpnManager event for CATEGORY_EVENT_IKE_ERROR
Test VpnManager event for CATEGORY_EVENT_ALWAYS_ON_STATE_CHANGED
Test VpnManager event for CATEGORY_EVENT_DEACTIVATED_BY_USER
Lucas Lin
authored and
Gerrit Code Review
commited 2022-04-29 08:13:51 +00:00
025a3c993a
Test VpnManager event for CATEGORY_EVENT_NETWORK_ERROR
...
Bug: 191413541
Test: atest FrameworksNetTests:VpnTest
Change-Id: Idffd5f5f8fc6614281f3fb0884228a797d783fe3
lucaslin
authored and
Lucas Lin
commited 2022-04-26 01:10:10 +00:00
cfec723ef9
Test VpnManager event for CATEGORY_EVENT_IKE_ERROR
...
Bug: 191413541
Test: atest FrameworksNetTests:VpnTest
Change-Id: Iebc0ac281eb03fac9626c64e44cdd14be1462d89
lucaslin
authored and
Lucas Lin
commited 2022-04-26 01:10:03 +00:00
827b44daea
Test VpnManager event for CATEGORY_EVENT_ALWAYS_ON_STATE_CHANGED
...
Bug: 225010642
Test: atest FrameworksNetTests:VpnTest
Change-Id: I078be4e00470efd9d7a2a87b40919116b99c83b8
lucaslin
commited 2022-04-26 09:09:03 +08:00
0772c169b5
Test VpnManager event for CATEGORY_EVENT_DEACTIVATED_BY_USER
...
Bug: 191413541
Test: atest FrameworksNetTests:VpnTest
Change-Id: Idc876275b88c2f4ddeb85c43d37d5f657b0f307b
lucaslin
commited 2022-04-25 23:12:26 +08:00
c5bf088ced
Merge "Test Ikev2VpnProfile provisioned with IkeTunnelConnectionParams" am: 2e670756ac am: 43e3eed32a
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2063922
Change-Id: Ic632dbf24734b9d80ab33a6f3ff915ed854ec89f
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Chiachang Wang
authored and
Automerger Merge Worker
commited 2022-04-25 09:31:53 +00:00
9d8045fbc1
Merge "Test Ikev2VpnProfile provisioned with IkeTunnelConnectionParams"
Chiachang Wang
authored and
Gerrit Code Review
commited 2022-04-25 08:44:45 +00:00
2e670756ac
adjust for new T bpfloader net_shared location am: 0736d7bd91 am: 2d59dc9854
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2071008
Change-Id: I1c90acd36a7105fcf9997c08443d3b624d487f76
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Maciej Żenczykowski
authored and
Automerger Merge Worker
commited 2022-04-23 09:56:36 +00:00
d560797e5e
adjust for new T bpfloader net_shared location
...
(this is safe because on pre-T none of these maps and programs are mainlined
and thus safe to access from mainline code anyway)
Test: TreeHugger, manual
Bug: 218408035
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I23e565d665247f33e084978890a1ee8ffe0fe568
Maciej Żenczykowski
commited 2022-04-23 09:03:06 +00:00
0736d7bd91
Merge "[CLATJ#27] Use ClatdCoordinator since T+ devices" am: b4bf6cea38 am: 8d75a93995
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1951099
Change-Id: I3878e5359349d8195e8741ea69ae437edab68909
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Maciej Żenczykowski
authored and
Automerger Merge Worker
commited 2022-04-21 14:34:12 +00:00
2fadc5413c
Test Ikev2VpnProfile provisioned with IkeTunnelConnectionParams
...
Bug: 223841137
Test: atest CtsNetTestCases FrameworksNetTests
Change-Id: I683f6242e4ed4a469893e3a17fe7b479a7a768e5
chiachangwang
commited 2022-04-21 14:49:41 +08:00
476e2a08bf
[CLATJ#27] Use ClatdCoordinator since T+ devices
...
- For clatd start and stop, use ClatdCoordinator on T+ and Netd on S-
- Fix the unit test for T+ and S- devices
Note that mokito.verify(.., times(1)) is replaced by verify(..)
because times(1) is the default and can be omitted.
See verify in mockito/src/main/java/org/mockito/Mockito.java
Note that this commit needs to be merged with aosp/1956072.
Bug: 212345928
Test: atest FrameworksNetTests
manual test
1. Connect to ipv6-only wifi.
2. Try IPv4 traffic.
$ ping 8.8.8.8
3. Check bpf entries are added
4. Disconnect from ipv6-only wifi.
5. Check bpf entries are removed
6. testipv4.com shows 10/10
Change-Id: I7dfda6eec19de94e4258971effcd8a1210542473
Hungming Chen
commited 2022-04-21 13:24:36 +08:00
eb15a2d816
Fix permission bypass problem for Tethering deprecated APIs
...
Since the tethering functions in ConnectivityService is delegated
to TetheringManager instance and get caches informataion in
TetheringManager without checking ACCESS_NETWORK_STATE permission.
If application use reflection call getTetherXXX functions in
ConnectivityService, it can get tethering status with no additional
execution privileges needed.
Bug: 162952629
Test: manual
Ignore-AOSP-First: security fix
Change-Id: I5b897f216db19fead6ba6ac07915aa0f6ff5bf42
markchien
commited 2022-04-19 19:13:10 +08:00
28160b3141
Merge "Save appIds permissions for each user"
Natasha Lee
authored and
Gerrit Code Review
commited 2022-04-12 23:55:06 +00:00
7f85379b07
Save appIds permissions for each user
...
PermissionMonitor does not store any information regarding
traffic permission. It just checks permission from each package
and sends the result to netd. In addition, bpf can store traffic
permissions for appIds only because of memory limitations.
However, there is a mistaken permission overwriting when
different packages are installed on multi-user. Because
PermissionMonitor updates appIds traffic permissions to netd
from each user, so the permission result will depend on the
latest user state.
To fix the problem, save the traffic permissions by each user and
appId on PermissionMonitor. An appId has a permission if and
only if at least one uid in that appId has that permission.
bug: 224775316
Test: atest FrameworksNetTests CtsNetTestCases \
CtsNetTestCasesUpdateStatsPermission \
CtsNetTestCasesInternetPermission
Change-Id: Ieb01fb21f6201a58723eb7e6446b127627be2c0e
paulhu
commited 2022-04-12 11:06:46 +00:00
a501e47e19
Merge "Remove NativeDaemonConnector relevant files"
Paul Hu
authored and
Gerrit Code Review
commited 2022-04-12 07:37:16 +00:00
631c2387a6
Remove NativeDaemonConnector relevant files
...
NsdService is using binder call to communicate with
mdnsresponder, so there is no one to use NativeDaemonConnector
now. Thus, remove NativeDaemonConnector relevant files.
Bug: 209894875
Test: atest FrameworksNetTests
Change-Id: Ic70d9417dc85c04c537e09d8f8586a762ac9a97b
paulhu
authored and
Paul Hu
commited 2022-04-12 07:35:31 +00:00
cee953bd09
Merge changes I2c3242f8,Iaa67d5ae
...
* changes:
Remove unused TcUtils{, Test}, bpfhelper from libclat
ClatCoordinator: use Java class TcUtils to detach program
Maciej Żenczykowski
authored and
Gerrit Code Review
commited 2022-04-11 20:47:50 +00:00
b3bf5fedab
Merge "ClatCoordinator: use Java class TcUtils to attach program"
Maciej Żenczykowski
authored and
Gerrit Code Review
commited 2022-04-11 20:47:26 +00:00
932459748a
Merge changes from topic "access_clat_bpf_map_from_clatcoordinator"
...
* changes:
ClatCoordinator: use Java class BpfMap to remove clat rule
ClatCoordinator: use Java class BpfMap to add clat rule
Maciej Żenczykowski
authored and
Gerrit Code Review
commited 2022-04-11 20:46:59 +00:00
7b75c07cda
Merge "Use completeExceptionally instead of second future"
Patrick Rohr
authored and
Gerrit Code Review
commited 2022-04-07 12:12:32 +00:00
da294fc886
Merge "Update test for new IkeTunnelConnectionParams field"
Chiachang Wang
authored and
Gerrit Code Review
commited 2022-04-07 10:24:03 +00:00
5850372963
Merge changes from topic "MDns_AIDL"
...
* changes:
Use MDns aidl on NsdService
Add MDnsManager
Paul Hu
authored and
Gerrit Code Review
commited 2022-04-07 02:06:35 +00:00
09475308b7
Use MDns aidl on NsdService
...
- Use MDns aidl to communicate with mdns service and register
event listener to receive callback.
- Remove all NDC relevant code on NsdService.
- Use MDns aidl on NsdServiceTest.
Bug: 209894875
Test: atest FrameworksNetTests CtsNetTestCases
Change-Id: I65929dee3838fef753396e86c665abd66b6fec81
paulhu
commited 2022-04-04 15:18:27 +00:00
2b9ed95ae5
Use completeExceptionally instead of second future
...
The onError callback can use the same future as the onResult callback by
calling completeExceptionally.
This change is also removing the test for a specific exception message.
Testing for a specific exception message would mean that tests break if we
ever were to update them. If we decide that there is value to
distinguish between different types of
EthernetNetworkManagementException we should probably subclass it
internally.
Test: atest EthernetNetworkFactoryTest
Change-Id: Ib6f8cf79fc26e0f856c880cbe505b101f12aa187
Patrick Rohr
commited 2022-04-04 14:59:42 +02:00
fd87fb65fb
Merge EthernetServiceTests into FrameworksNetTests
...
As per the TODO, merge EthernetServiceTests into the larger
FrameworksNetTests suite.
Similarly to NetworkStats, NSD or IpSec tests, the tests are also marked
as "non-connectivity-module-test", where "module" actually refers to
modules being built for release (from an S-based branch) today. This is
necessary as the tests and associated code cannot build without T APIs.
Also add FrameworksNetTests to presubmit as non-connectivity-module
tests are not run in presubmit without this.
Test: TH
Merged-In: Id533cdb4ac184b963f570af299dea04754ba88e9
Change-Id: I9950fcb49fdc2217134a59e993941cbe5da0b556
Remi NGUYEN VAN
commited 2022-04-01 15:12:18 +09:00
40da62da48
ClatCoordinator: use Java class TcUtils to attach program
...
This a preparation to replace duplicated native functions with the
existing Java class.
Bug: 221213090
Test: atest FrameworksNetTests
Test: manual test
Steps:
1. Connect to IPv6-only wifi
2. Check tc filter on wlan0 and v4-wlan0
$ adb shell tc filter show dev wlan0 ingress
filter protocol ipv6 pref 4 bpf chain 0
filter protocol ipv6 pref 4 bpf chain 0 handle 0x1 prog_clatd_schedcls_ingress6_clat_ether:[*fsobj] direct-action not_in_hw id 23 tag 40918e0675598c8d
$ adb shell tc filter show dev v4-wlan0 egress
filter protocol ip pref 4 bpf chain 0
filter protocol ip pref 4 bpf chain 0 handle 0x1 prog_clatd_schedcls_egress4_clat_rawip:[*fsobj] direct-action not_in_hw id 26 tag 5d0057eab14480b7
$ adb shell tc filter show dev wlan0 egress
(empty)
$ adb shell tc filter show dev v4-wlan0 ingress
(empty)
Change-Id: Id4edbfd87de8f9c5d2fa483b2024718b484cb044
Hungming Chen
commited 2022-03-31 16:04:42 +08:00
3dc0577ed3
ClatCoordinator: use Java class BpfMap to remove clat rule
...
This a preparation to replace duplicated native functions with the
existing Java class.
Bug: 221213090
Test: atest FrameworksNetTests
Test: manual check
Steps:
1. Connect wlan and check map content {iface index, v4addr, v6addr, pfx96} manually
after clat started.
$ adb shell dumpsys netd
ClatdController
BPF ingress map: iif(iface) nat64Prefix v6Addr -> v4Addr oif(iface)
47(wlan0) 64:ff9b::/96 2a00:79e1:abc:6f02:2479:2f51:25a9:28f1 -> 192.0.0.4 53(v4-wlan0)
BPF egress map: iif(iface) v4Addr -> v6Addr nat64Prefix oif(iface)
53(v4-wlan0) 192.0.0.4 -> 2a00:79e1:abc:6f02:2479:2f51:25a9:28f1 64:ff9b::/96 47(wlan0) ether
2. Disconnect wlan and check the bpf map is removed.
$ adb shell dumpsys netd
ClatdController
BPF ingress map: iif(iface) nat64Prefix v6Addr -> v4Addr oif(iface)
BPF egress map: iif(iface) v4Addr -> v6Addr nat64Prefix oif(iface)
Change-Id: Ia0c90c7104c4a42d34a28a5ddf3cf13a289f8c76
Hungming Chen
commited 2022-03-31 16:04:42 +08:00
bd85f8903e
ClatCoordinator: use Java class TcUtils to detach program
...
This a preparation to replace duplicated native functions with the
existing Java class.
Bug: 221213090
Test: atest FrameworksNetTests
Test: manual test
Steps:
1. Connect to IPv6-only wifi
2. Check tc filter on wlan0 and v4-wlan0
$ adb shell tc filter show dev wlan0 ingress
filter protocol ipv6 pref 4 bpf chain 0
filter protocol ipv6 pref 4 bpf chain 0 handle 0x1 prog_clatd_schedcls_ingress6_clat_ether:[*fsobj] direct-action not_in_hw id 23 tag 40918e0675598c8d
$ adb shell tc filter show dev v4-wlan0 egress
filter protocol ip pref 4 bpf chain 0
filter protocol ip pref 4 bpf chain 0 handle 0x1 prog_clatd_schedcls_egress4_clat_rawip:[*fsobj] direct-action not_in_hw id 26 tag 5d0057eab14480b7
$ adb shell tc filter show dev wlan0 egress
(empty)
$ adb shell tc filter show dev v4-wlan0 ingress
(empty)
3. Disconnect from wifi
4. Check tc filter on wlan0 and v4-wlan0
$ adb shell tc filter show dev wlan0 ingress
(empty)
$ adb shell tc filter show dev v4-wlan0 egress
(empty)
$ adb shell tc filter show dev wlan0 egress
(empty)
$ adb shell tc filter show dev v4-wlan0 ingress
(empty)
Change-Id: Iaa67d5ae7c867d791d5f92a70a54bf549085053a
Hungming Chen
commited 2022-03-31 16:04:42 +08:00
cddd855f9e
ClatCoordinator: use Java class BpfMap to add clat rule
...
This a preparation to replace duplicated native functions with the
existing Java class.
Bug: 221213090
Test: atest FrameworksNetTests
Test: check map content {iface index, v4addr, v6addr, pfx96} manually.
The map fileds are the same as "ip addr" and clatd logging.
$ adb shell dumpsys netd
ClatdController
BPF ingress map: iif(iface) nat64Prefix v6Addr -> v4Addr oif(iface)
47(wlan0) 64:ff9b::/96 2a00:79e1:abc:6f02:f9e1:8c2d:604e:bc06 -> 192.0.0.4 53(v4-wlan0)
BPF egress map: iif(iface) v4Addr -> v6Addr nat64Prefix oif(iface)
53(v4-wlan0) 192.0.0.4 -> 2a00:79e1:abc:6f02:f9e1:8c2d:604e:bc06 64:ff9b::/96 47(wlan0) ether
$ adb shell ip addr
47: wlan0: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 ..
53: v4-wlan0: <POINTOPOINT,MULTICAST,NOARP,UP,LOWER_UP> mtu 1472 ..
03-14 18:35:04.822 30852 30852 I clatd : Starting clat version 1.5 on wlan0 plat=64:ff9b:: v4=192.0.0.4 v6=2a00:79e1:abc:6f02:f9e1:8c2d:604e:bc06
Change-Id: I91d0cb6e76c4ef7bacf91b996786308ff4918f35
Hungming Chen
commited 2022-03-31 15:53:33 +08:00
07fcf9ca49
Update test for new IkeTunnelConnectionParams field
...
Bug: 184750836
Test: atest FrameworksNetTests
Change-Id: Iab55eba74b94f295a358c6e8474ebf9230c9b019
Chiachang Wang
commited 2022-03-31 14:45:59 +08:00
69aa988090
Merge "Revert "Use RECEIVER_NOT_EXPORTED in CarrierPrivilegeAuthenticator.""
Michael Groover
authored and
Gerrit Code Review
commited 2022-03-31 01:39:28 +00:00
3e712761a4
Merge "Don't throw in FullScore#policyNameOf."
Lorenzo Colitti
authored and
Gerrit Code Review
commited 2022-03-29 08:38:21 +00:00
644fe232cd
Don't throw in FullScore#policyNameOf.
...
This code is correct on userdebug builds, but it is dangerous on
user builds because proguard might strip out the POLICY_*
constants and that would lead to crashes.
For now just log a wtf if an invalid policy name is found. A
better solution would be to make MessageUtils robust to this
problem, e.g., by having it store the SparseArray internally and
providing getters that do not throw, instead of the current
behaviour that returns the SparseArray. That is left to a future
CL.
Fix: 227161413
Test: atest FullScoreTest
Change-Id: I68b69ee9dd84773018e62c9a8f43e754ae04c486
Lorenzo Colitti
commited 2022-03-29 08:38:06 +00:00
1727d9f1f2
Merge "Add tests for VPN validation in NetworkMonitor"
Chiachang Wang
authored and
Gerrit Code Review
commited 2022-03-28 13:51:34 +00:00
59e6e2b730