Treehugger Robot
42f972825d
Merge "Downgrade the log level of exception log" am: 7faee617b9 am: 1ca675172c
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1660002
Change-Id: I47bdd7a0c7355185372647f6f39d41c67f7a361b
2021-04-06 05:25:11 +00:00
Treehugger Robot
1ca675172c
Merge "Downgrade the log level of exception log" am: 7faee617b9
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1660002
Change-Id: Ic9d45e57e3ffc224670d85e4e09e02a4e134987f
2021-04-06 04:47:21 +00:00
Treehugger Robot
7faee617b9
Merge "Downgrade the log level of exception log"
2021-04-06 04:01:59 +00:00
lucaslin
3967e5f614
Downgrade the log level of exception log
...
This exception log is usually printed when the device connects to
a wifi. The cause is that when the device connects to a wifi,
wifi will send CONNECTING state first, then CONNECTED state.
And in CONNECTING state, wifi will send the LinkProperties to
ConnectivityService and ConnectivityService will try to update
that LinkProperties(including interface) to netd. But the netid
hasn't set to netd yet before wifi CONNECTED, so this exception
log will be printed.
There is no really issue in this case, so downgrade the log level
might be a better thing for all Android developer.
Bug: 181269159
Test: m
Change-Id: I61c09352225a610fcd6d3dd33b782ee114c35fc5
2021-04-06 02:02:50 +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
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
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
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
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
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
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
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
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
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
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
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
James Mattis
2da0729ad5
Merge "Calling linkToDeath on binder in NRI constructor" am: 6269d2eb7a am: eda48248c7
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1661222
Change-Id: Id0258e1a468f4b33141f45420913d3276764b04e
2021-04-01 03:57:46 +00:00
Chiachang Wang
b1cdc09edc
Merge "Add required permission to FrameworksNetIntegrationTests" am: 5e3d0c85b7
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1661659
Change-Id: Ie6f855ec7fd19a565344b817a60abdc5263a2cfa
2021-04-01 03:19:33 +00:00
James Mattis
eda48248c7
Merge "Calling linkToDeath on binder in NRI constructor" am: 6269d2eb7a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1661222
Change-Id: Iec83a93593e52cdb2baf12fa76c70af9df263ee4
2021-04-01 03:15:42 +00:00
Chiachang Wang
5e3d0c85b7
Merge "Add required permission to FrameworksNetIntegrationTests"
2021-04-01 03:15:07 +00:00
Suprabh Shukla
2adfd3ccb5
Add required permission to FrameworksNetIntegrationTests
...
Test: atest FrameworksNetIntegrationTests
Fixes: 184166194
Change-Id: I7ad920ba5962f9c71c3c3db86809e7cb6b934425
2021-03-31 18:52:04 -07:00
James Mattis
fdd2d3be95
Calling linkToDeath on binder in NRI constructor
...
Any NRI constructor that can possibly have a binder should call
linkToDeath on that binder if present. Not doing so can result in a
no such element exception when that NRI is removed.
Bug: 184155022
Test: atest FrameworksNetTests
atest FrameworksNetIntegrationTests
atest CtsNetTestCasesLatestSdk
Change-Id: I90d594e43474483c554d0d315ff7abb6f678e093
2021-03-31 14:45:27 -07:00
James Mattis
0aa2f9f8ec
Merge "Change the const for the unreachable network" am: 07ff79a595 am: 5522ed6e3c
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653190
Change-Id: I848bc411f919991eb795372b64023f951e310e6a
2021-03-31 03:40:16 +00:00
James Mattis
5522ed6e3c
Merge "Change the const for the unreachable network" am: 07ff79a595
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653190
Change-Id: I1e63766f07f3976abd36df117ffd3bf5ae1a8af4
2021-03-31 03:03:27 +00:00
James Mattis
9bdfa2c582
Change the const for the unreachable network
...
Changing the const used for the unreachable network for per-app
functionality for those apps whose traffic for the default network we
wish to lose connectivity as dictated by per app network preferences.
This is being done as per changes in https://r.android.com/1643182 .
Bug: 181579204
Test: atest FrameworksNetTests
Change-Id: I1bffadfa03a6221096100c9e0457ea00f94027a3
2021-03-30 17:16:44 -07:00
Lorenzo Colitti
e4ef990c5d
Merge changes I24580ea4,Id48b8eab am: cbc6a315c5 am: ce1d32cd36
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1657763
Change-Id: I8a7973e7ed4a8aac67d6f3da7c496a2eb0e28d92
2021-03-30 17:43:08 +00:00
Lorenzo Colitti
ce1d32cd36
Merge changes I24580ea4,Id48b8eab am: cbc6a315c5
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1657763
Change-Id: I3f90c94080e4d6f37cab3b5b43a0f5415fb50d8f
2021-03-30 17:09:01 +00:00
Lorenzo Colitti
cbc6a315c5
Merge changes I24580ea4,Id48b8eab
...
* changes:
Allow the system to register 250 NetworkCallbacks.
Add more test coverage for limiting the number of callbacks.
2021-03-30 16:01:58 +00:00