Chiachang Wang
9be3432c2e
Merge "Add visibility of framework-connectivity.impl for wifi test" into sc-dev
2021-04-06 00:23:37 +00:00
Steven Moreland
eed29df970
Merge "Remove unstable IpPrefix" am: 3f6415a2f5 am: 2babf25cf0 am: 75968dae24
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1662674
Change-Id: Idfa92d12a45385412c2013637c657acfb9fec3a2
2021-04-06 00:05:48 +00:00
Steven Moreland
75968dae24
Merge "Remove unstable IpPrefix" am: 3f6415a2f5 am: 2babf25cf0
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1662674
Change-Id: I41d891c9a4e0c3c0c42fcc425ea5230d23dbb86e
2021-04-05 23:19:09 +00:00
Steven Moreland
2babf25cf0
Merge "Remove unstable IpPrefix" am: 3f6415a2f5
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1662674
Change-Id: I7517ae6cefa96ee3ca38fbcca36970677cb6469b
2021-04-05 22:37:44 +00:00
Steven Moreland
3f6415a2f5
Merge "Remove unstable IpPrefix"
2021-04-05 21:59:47 +00:00
Treehugger Robot
bbd768d50f
Merge "Fix broken testCaptivePortalApp" am: 5110c6dad6 am: 0fa2dde613 am: adef15dabb
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1659999
Change-Id: I015c98915193a28d3b53b309b38479247346519b
2021-04-05 15:09:51 +00:00
Treehugger Robot
adef15dabb
Merge "Fix broken testCaptivePortalApp" am: 5110c6dad6 am: 0fa2dde613
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1659999
Change-Id: Iaebc7427cafaf77c025885f2ac317cbead21b068
2021-04-05 14:24:03 +00:00
Treehugger Robot
0fa2dde613
Merge "Fix broken testCaptivePortalApp" am: 5110c6dad6
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1659999
Change-Id: I7a77b050fd844f76e4f7aafa319017382ac06602
2021-04-05 13:44:51 +00:00
Treehugger Robot
5110c6dad6
Merge "Fix broken testCaptivePortalApp"
2021-04-05 13:05:41 +00:00
Chalard Jean
01a6b34d1d
Merge "Fix a bug where the wrong profile is queried" am: 167cc4a044 am: 92bbfaf0a2 am: 1bc19cb6a9
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1662362
Change-Id: I5498b7eb2b1b3e4e195ac47d8d3b471496b779b6
2021-04-05 08:10:29 +00:00
Chalard Jean
1bc19cb6a9
Merge "Fix a bug where the wrong profile is queried" am: 167cc4a044 am: 92bbfaf0a2
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1662362
Change-Id: I314686498e3412866e6e17fc2d4377523007589f
2021-04-05 07:20:07 +00:00
Chalard Jean
92bbfaf0a2
Merge "Fix a bug where the wrong profile is queried" am: 167cc4a044
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1662362
Change-Id: Id60b4897a749136010f00d5ede018991b54c7b70
2021-04-05 06:35:20 +00:00
Chalard Jean
167cc4a044
Merge "Fix a bug where the wrong profile is queried"
2021-04-05 05:48:17 +00:00
Remi NGUYEN VAN
7e09bc5b24
Merge "Reduce framework-connectivity footprint" into sc-dev
2021-04-05 02:15:32 +00:00
Benedict Wong
54c906b000
Merge "Downgrade list of subIds in NetworkCapabilities to @SystemApi" am: 87e0ab8905 am: d5af88a835 am: 01001e2ddf
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652974
Change-Id: I7a85feb9753ae91ff3d67dc82c8bc880a6626074
2021-04-03 02:01:25 +00:00
Benedict Wong
01001e2ddf
Merge "Downgrade list of subIds in NetworkCapabilities to @SystemApi" am: 87e0ab8905 am: d5af88a835
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652974
Change-Id: Ib714d9a03e5b5152a576330711a8894178db4a95
2021-04-03 01:15:50 +00:00
Benedict Wong
d5af88a835
Merge "Downgrade list of subIds in NetworkCapabilities to @SystemApi" am: 87e0ab8905
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652974
Change-Id: I4dc51bf65af853a7510586169caa12b083c2f94b
2021-04-02 23:10:21 +00:00
Benedict Wong
87e0ab8905
Merge "Downgrade list of subIds in NetworkCapabilities to @SystemApi"
2021-04-02 22:33:20 +00:00
Sarah Chin
b1120b4edb
[automerger skipped] Merge "API to get network visible network capability name" am: 129857619f am: 7d29a97aa8 am: b50ae931f1 -s ours
...
am skip reason: skip tag Change-Id Iae63ac4d62641cee2bd0f0c5f50dd729750d514c with SHA-1 89888d72e7 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653200
Change-Id: Ia36214cc8bf32e5b39d27f55d5e7eb4ac3c22c84
2021-04-02 18:41:49 +00:00
Sarah Chin
b50ae931f1
Merge "API to get network visible network capability name" am: 129857619f am: 7d29a97aa8
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653200
Change-Id: Ia6c65d6cd6d322d5599942ec65323a0d62e4dd1b
2021-04-02 17:56:48 +00:00
Sarah Chin
7d29a97aa8
Merge "API to get network visible network capability name" am: 129857619f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653200
Change-Id: I7f8b909ec061d8bb875ff2688e2fb9a4cea54318
2021-04-02 17:45:29 +00:00
Sarah Chin
129857619f
Merge "API to get network visible network capability name"
2021-04-02 16:50:10 +00:00
Chalard Jean
70b2d9ac2f
Fix broken testCaptivePortalApp
...
This was broken by aosp/1657763, only on eng builds because
of a wtf. The root cause of the issue is that the test is
acquiring MAINLINE_NETWORK_STACK after it registers a callback
but before in unregisters it. After aosp/1657763, the objects
keeping track of callbacks are separate for processes with and
without MAINLINE_NETWORK_STACK, which means the removal is
looked up in a different counter.
Solve this by having the NRI remember the relevant counter
keeping track of it.
Bug: none
Test: testCaptivePortalApp
Change-Id: I566a28522fa68be9cc2bdb4624b588b4f01d3b7e
2021-04-02 20:18:18 +09:00
Chalard Jean
0a04bdb730
Fix a bug where the wrong profile is queried
...
UserManager#isManagedProfile() is not aware of the user
handle of the context the UM instance is created on.
Instead, call isManagedProfile(int).
Bug: 183625645
Test: ConnectivityServiceTest
Change-Id: I1fef22d67d75df25a8c2d0694f857c3e1c1a1306
2021-04-02 19:24:44 +09:00
Remi NGUYEN VAN
560da938dd
Reduce framework-connectivity footprint
...
Cleanup framework-connectivity to reduce its memory and storage usage:
- Build libframework-connectivity-jni using standard C and removing
dependencies on libc++. This saves about 100kB of storage (40+60kB
on the 32+64 bit variants).
- Remove dependency on protobuffer libraries, as their usage has been
removed. This saves about 15kB of storage.
From local measurements, the reduced code size also improves memory
usage.
This also removes a jarjar workaround for net-utils-device-common, as
the library is no longer used either.
Bug: 184111895
Test: device boots, connectivity working
Change-Id: Ibfbd0fe1098293812ae24812621752a7a44f9130
2021-04-02 10:18:00 +00:00
Benedict Wong
4310e45eff
Downgrade list of subIds in NetworkCapabilities to @SystemApi
...
This change downgrades API visibility for the list-of-subIds in the
NetworkCapabilities to SystemApi
Bug: 175662146
Test: atest NetworkCapabilitiesTest#testSubIds
Test: atest FrameworksNetTests
Change-Id: I372fa9eaa7585aefd1710948ca007456feedd578
2021-04-02 01:18:11 -07:00
Steven Moreland
0fb772f6df
Remove unstable IpPrefix
...
Seems nothing is using this.
Bug: 183654927
Test: N/A
Change-Id: I94233d79fb5d93970b38a79a09fc4d50822c3620
2021-04-01 22:59:02 +00:00
Aaron Huang
67f98b5025
[automerger skipped] Merge "Move some constants from TrafficStatsConstants to NetworkStackConstants" am: 5c520a3650 am: 348a73f1f0 am: 0896806110 -s ours
...
am skip reason: skip tag Change-Id Ib667c115e5f1e01237d88b77bba753363da309cc with SHA-1 7370ec0110 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1625861
Change-Id: Ia90d90c5bf7429ad2a7f50d6e055f6dec28f3ea9
2021-04-01 17:09:23 +00:00
Aaron Huang
0896806110
Merge "Move some constants from TrafficStatsConstants to NetworkStackConstants" am: 5c520a3650 am: 348a73f1f0
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1625861
Change-Id: Ideb5a5abbd074a8c905861e902977c442317fc02
2021-04-01 16:45:22 +00:00
Aaron Huang
348a73f1f0
Merge "Move some constants from TrafficStatsConstants to NetworkStackConstants" am: 5c520a3650
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1625861
Change-Id: I1a21497634c2ee53abfca8dea4b8bab40cf28b3a
2021-04-01 16:25:44 +00:00
Aaron Huang
5c520a3650
Merge "Move some constants from TrafficStatsConstants to NetworkStackConstants"
2021-04-01 15:59:39 +00:00
Aaron Huang
dc732aa06f
[automerger skipped] Merge "Expose BIP and VSIM relavent definitions" am: 55a22edbab am: f73b66fadf am: 224f95e57d -s ours
...
am skip reason: skip tag Change-Id I41e881c6fe39e92d5cdac2d0a02fa8a8e814c9c5 with SHA-1 38e6236781 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652223
Change-Id: I82342526cd5d9983d0459b4da014dc8e9bda9482
2021-04-01 13:49:44 +00:00
Aaron Huang
e36801fe3d
[automerger skipped] Merge "Move deduceRestrictedCapability to libs/net and rename it" am: e36b232c4a am: 929c1f171a am: 5d43332227 -s ours
...
am skip reason: skip tag Change-Id I77970b3a5e5e0e9d263639694b1f06519169bf64 with SHA-1 1fc20d4fa7 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1644999
Change-Id: I6a434d0839828f3c2692a5cc8d523dbddc92b4ef
2021-04-01 13:47:59 +00:00
Aaron Huang
224f95e57d
Merge "Expose BIP and VSIM relavent definitions" am: 55a22edbab am: f73b66fadf
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652223
Change-Id: Ibab74f3bcf6c804a31be54d4b7183ea75a6e172e
2021-04-01 13:04:07 +00:00
Aaron Huang
5d43332227
Merge "Move deduceRestrictedCapability to libs/net and rename it" am: e36b232c4a am: 929c1f171a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1644999
Change-Id: Idc33279ef58a6c2bc971271ccf85cafa264b1d1d
2021-04-01 13:03:23 +00:00
Aaron Huang
f73b66fadf
Merge "Expose BIP and VSIM relavent definitions" am: 55a22edbab
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652223
Change-Id: I1e9d92cd27fc0dcd84cc62ad7c2a591c9f5a54e5
2021-04-01 12:26:04 +00:00
Aaron Huang
929c1f171a
Merge "Move deduceRestrictedCapability to libs/net and rename it" am: e36b232c4a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1644999
Change-Id: I088dfe837eb986c2de792d0672a2e707112b6042
2021-04-01 12:21:47 +00:00
Aaron Huang
55a22edbab
Merge "Expose BIP and VSIM relavent definitions"
2021-04-01 11:38:17 +00:00
Aaron Huang
e36b232c4a
Merge "Move deduceRestrictedCapability to libs/net and rename it"
2021-04-01 11:37:51 +00:00
Chalard Jean
4ebc0197f2
Merge "Fix testLegacyLockdownVpn flaky" am: 58b8d1eb22 am: b08d1c3095 am: 4ac82f64c9
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1659998
Change-Id: Ib3ec17315225e4f0ed173d4d17165b8f21e07acb
2021-04-01 10:10:39 +00:00
Chalard Jean
4ac82f64c9
Merge "Fix testLegacyLockdownVpn flaky" am: 58b8d1eb22 am: b08d1c3095
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1659998
Change-Id: If5e7a4038b58b3beb52c517cfa1208cf08fcac2a
2021-04-01 09:22:48 +00:00
Chalard Jean
86b272d81d
Merge changes Ib5cd2c27,I4448a354 into sc-dev
...
* changes:
[NS10] Fix a bug where registerIgnoringScore is broken
[NS09] Implement the new ranking code
2021-04-01 09:02:15 +00:00
Chalard Jean
b08d1c3095
Merge "Fix testLegacyLockdownVpn flaky" am: 58b8d1eb22
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1659998
Change-Id: I7ab3a57e07a2e48dabb95dd6f671176727d58cdb
2021-04-01 08:44:55 +00:00
Chalard Jean
58b8d1eb22
Merge "Fix testLegacyLockdownVpn flaky"
2021-04-01 08:19:53 +00:00
Chalard Jean
8a30bb6048
Merge "Expose sendNetworkScore that takes a NetworkScore" into sc-dev
2021-04-01 07:17:48 +00:00
Chalard Jean
face022980
Fix testLegacyLockdownVpn flaky
...
When WiFi disconnects, the VPN disconnects immediately. The
broadcast can therefore be sent before the broadcast receiver is
registered, which causes the receiver to not see the broadcast.
The puzzling part is that CONNECTIVITY_ACTION is a sticky
broadcast, so one would expect the broadcast to still be
received, even if the registration is done after the broadcast
is sent. The reason this doesn't happen is that the context used
by the test is a BroadcastInterceptingContext, which does not
treat sticky broadcasts as sticky.
Bug: 184115648
Test: atest --iterations 1000 'ConnectivityServiceTest#testLegacyLockdownVpn'
Change-Id: Ib44c92839d25951cc7d2db0f923e1b104690e1e0
2021-04-01 06:27:46 +00:00
Aaron Huang
e3ea1200ad
Move some constants from TrafficStatsConstants to NetworkStackConstants
...
Keep the constants are only used by framework in TrafficStatsConstants
and move the others to NetworkStackConstants which is in libs/net.
Bug: 182349970
Test: FrameworksNetTests
NetworkStackTests
TetheringTests
Change-Id: Ib667c115e5f1e01237d88b77bba753363da309cc
Merged-In: Ib667c115e5f1e01237d88b77bba753363da309cc
2021-04-01 05:10:03 +00:00
Chiachang Wang
bc779eb28b
Merge "Add required permission to FrameworksNetIntegrationTests" am: 5e3d0c85b7 am: b1cdc09edc am: f5cd84594e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1661659
Change-Id: Ibb523b767c246701d8024f618491c8a125beca18
2021-04-01 04:51:01 +00:00
James Mattis
43bebc4d19
Merge "Calling linkToDeath on binder in NRI constructor" am: 6269d2eb7a am: eda48248c7 am: 2da0729ad5
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1661222
Change-Id: Ic7bea025d69f3ea7f6388dfe6a01942cf5ae039d
2021-04-01 04:50:31 +00:00
Chiachang Wang
f5cd84594e
Merge "Add required permission to FrameworksNetIntegrationTests" am: 5e3d0c85b7 am: b1cdc09edc
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1661659
Change-Id: I644bfe6309efb657e7ffd94445d3b26427f0c594
2021-04-01 04:00:33 +00:00