Treehugger Robot
bc59792e45
Merge "Fix TetheringManager memory leak" am: d7d41a73e7 am: 059afb99bb am: 6cecfae8ab am: c4660662c5
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1744513
Change-Id: I8f1f09b0e813182812ba6e2e6ced5563d5c5e5cc
2021-10-20 05:05:57 +00:00
Treehugger Robot
c4660662c5
Merge "Fix TetheringManager memory leak" am: d7d41a73e7 am: 059afb99bb am: 6cecfae8ab
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1744513
Change-Id: I5f337873d2f0ab8aca31a76b2331d8f9d727a84a
2021-10-20 04:53:00 +00:00
Treehugger Robot
6cecfae8ab
Merge "Fix TetheringManager memory leak" am: d7d41a73e7 am: 059afb99bb
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1744513
Change-Id: I93d4c5bb23cb45e10dbcd8b19792d9b79baa3ff4
2021-10-20 04:33:03 +00:00
Treehugger Robot
059afb99bb
Merge "Fix TetheringManager memory leak" am: d7d41a73e7
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1744513
Change-Id: I0cd6e631a1340d144ff052ec9b6ff6d449dc47c9
2021-10-20 04:12:42 +00:00
Treehugger Robot
d7d41a73e7
Merge "Fix TetheringManager memory leak"
2021-10-20 03:59:59 +00:00
Treehugger Robot
81cb25acef
Merge "Exclude testGetMultipathPreference on no Wi-Fi devices" am: 9755b43575 am: 69da276bc4 am: 0163c5b779 am: 73ca4431a8
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1848993
Change-Id: I86e31aa10e5f182fc429b9be398f3ed569dee218
2021-10-20 03:20:16 +00:00
Treehugger Robot
73ca4431a8
Merge "Exclude testGetMultipathPreference on no Wi-Fi devices" am: 9755b43575 am: 69da276bc4 am: 0163c5b779
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1848993
Change-Id: Ibc5373ed239564a1df609962de3da951bc093669
2021-10-20 02:54:16 +00:00
Treehugger Robot
0163c5b779
Merge "Exclude testGetMultipathPreference on no Wi-Fi devices" am: 9755b43575 am: 69da276bc4
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1848993
Change-Id: I99f87ff6e1400e1b4c368deaca6e07b022a37dfe
2021-10-20 02:39:46 +00:00
Treehugger Robot
69da276bc4
Merge "Exclude testGetMultipathPreference on no Wi-Fi devices" am: 9755b43575
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1848993
Change-Id: Ide421240ab056248b5464b54b6db52c7fd3c9c88
2021-10-20 02:22:04 +00:00
Treehugger Robot
9755b43575
Merge "Exclude testGetMultipathPreference on no Wi-Fi devices"
2021-10-20 02:10:47 +00:00
TreeHugger Robot
f3cf3d2abf
[automerger skipped] Merge "Support wifi and ethernet connection for DnsResolverTest." into sc-v2-dev am: e3b6dc0f67 -s ours
...
am skip reason: Merged-In Ie1c7522426314ccc83008b75f90a57f3a53339d4 with SHA-1 fa8dbc5da7 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/16074631
Change-Id: I42808c0629ded9431eb81fa962940275cf74d7c8
2021-10-19 13:12:30 +00:00
TreeHugger Robot
e3b6dc0f67
Merge "Support wifi and ethernet connection for DnsResolverTest." into sc-v2-dev
2021-10-19 12:58:20 +00:00
Chalard Jean
981d93ec8f
[automerger skipped] Wait for validation of WiFi in OEM pref test am: 71d8bb764f -s ours
...
am skip reason: Merged-In Icb9d7ff1ca5c3d93286ea3a79c27f15630d17ee6 with SHA-1 ae4c414c1f is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/16047192
Change-Id: I1a53e3bcdb8b6782440cf3d446f28acc468d28ff
2021-10-18 23:52:58 +00:00
Remi NGUYEN VAN
6637aead5f
[automerger skipped] Ensure wifi reconnects before waiting for metered am: bb323e0926 -s ours
...
am skip reason: Merged-In Iafe9837b97e4d654bb0f3962d48a94c1f31bbebc with SHA-1 c6be26e0ef is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/16061591
Change-Id: Ib63f5728db6226759b7139041ff4a89787158a64
2021-10-18 23:52:54 +00:00
Treehugger Robot
ab48d029e6
Support wifi and ethernet connection for DnsResolverTest.
...
bug: 199675828
Test: atest CtsNetTestCases:android.net.cts.DnsResolverTest
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1833253
Change-Id: I4deed4292a20df70cfefc7ffb3b0ad76fda3d393
Merged-In: Ie1c7522426314ccc83008b75f90a57f3a53339d4
(cherry picked from commit a974622461 )
2021-10-18 07:27:13 +00:00
Lucas Lin
36200a9e19
Merge "Add new APIs in NetworkCapabilities to set and get underlying networks" am: 39379a40bd am: f96e107603 am: 660904140c am: 0bab58fb24
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1829934
Change-Id: I17e78fdf562ce4679f4441fbfd9cf9a6f1c7a588
2021-10-18 06:33:24 +00:00
Lucas Lin
0bab58fb24
Merge "Add new APIs in NetworkCapabilities to set and get underlying networks" am: 39379a40bd am: f96e107603 am: 660904140c
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1829934
Change-Id: Ieae0c554ef5e23fd61249c9f42099279e76fe9e1
2021-10-18 06:19:08 +00:00
Lucas Lin
660904140c
Merge "Add new APIs in NetworkCapabilities to set and get underlying networks" am: 39379a40bd am: f96e107603
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1829934
Change-Id: I269398fde17a82cbc6b1a88abc2f57bcb908ed65
2021-10-18 06:03:56 +00:00
Lucas Lin
f96e107603
Merge "Add new APIs in NetworkCapabilities to set and get underlying networks" am: 39379a40bd
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1829934
Change-Id: I576812f62add322752c3991bec460b978c9fba61
2021-10-18 05:46:11 +00:00
Lucas Lin
39379a40bd
Merge "Add new APIs in NetworkCapabilities to set and get underlying networks"
2021-10-18 05:27:59 +00:00
lucaslin
8b2dfa7c02
Add new APIs in NetworkCapabilities to set and get underlying networks
...
Previously, the caller can only know about the transport type of
the underlying network. The information might not be enough if
the device support WiFi STA+STA.
Thus, provide an API for the caller to get the correct underlying
network.
Bug: 191918368
Test: atest FrameworksNetTests:NetworkCapabilitiesTest
Change-Id: I7752b2356770f4572f6ca4cbaecaa45c09d6d72f
2021-10-15 18:07:12 +08:00
Chalard Jean
71d8bb764f
Wait for validation of WiFi in OEM pref test
...
OEM_NETWORK_PREFERENCE_TEST prefers NOT_METERED&VALIDATED networks
then TEST networks. If the WiFi isn't validated by the time the
preference is set, then the TEST network is preferred and the test
fails. The best solution is simply to wait for the WiFi network to
validate before setting the preference.
Besides, some of the *wait* methods wait for validation and some
don't, creating confusion. Make this explicit on the
setWifiMeteredStatusAndWait method with a boolean argument, which
forces all users to make an explicit choice.
testSetOemNetworkPreferenceForTestOnlyPref is not affected, as
it does not change WiFi meteredness.
Ignore-AOSP-First: cherry-pick of an already-submitted AOSP change
Bug: 195365654
Test: testSetOemNetworkPreferenceForTestPref
Change-Id: I9f2bacd9b5433d7c907536af2f6c2653523271d2
Merged-In: Icb9d7ff1ca5c3d93286ea3a79c27f15630d17ee6
(cherry picked from commit ae4c414c1f )
2021-10-15 05:06:52 +00:00
Remi NGUYEN VAN
bb323e0926
Ensure wifi reconnects before waiting for metered
...
testGetMultipathPreference assumes that wifi will auto-reconnect after
changing its metered status, but this is not necessarily the case if the
BSSID has been blocklisted after it failed validating too many times.
Call ensureWifiConnected to force wifi to reconnect before waiting for
it to become metered.
Bug: 190913510
Test: atest ConnectivityManagerTest
Change-Id: Iafe9837b97e4d654bb0f3962d48a94c1f31bbebc
Merged-In: Iafe9837b97e4d654bb0f3962d48a94c1f31bbebc
2021-10-15 05:06:18 +00:00
Treehugger Robot
abb09ea697
Merge "Update Permission only if the network is created" am: 29f0350da3 am: 40ea750175 am: 0109ba492c am: 8dda9eb668
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1827912
Change-Id: I705e8e4aee9203a63238ff13d402cb727e7728a7
2021-10-14 07:02:42 +00:00
Treehugger Robot
8dda9eb668
Merge "Update Permission only if the network is created" am: 29f0350da3 am: 40ea750175 am: 0109ba492c
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1827912
Change-Id: I48d3d37421ec971904f4f1ca029f22abc3e10dcc
2021-10-14 06:46:44 +00:00
Treehugger Robot
0109ba492c
Merge "Update Permission only if the network is created" am: 29f0350da3 am: 40ea750175
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1827912
Change-Id: Icf77e2189bd13e4b75363d522a8ac9637760bf15
2021-10-14 06:37:12 +00:00
Treehugger Robot
40ea750175
Merge "Update Permission only if the network is created" am: 29f0350da3
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1827912
Change-Id: Iaa41edbfe275556c009c00c48dd4a712e6eff3a7
2021-10-14 06:27:02 +00:00
Treehugger Robot
29f0350da3
Merge "Update Permission only if the network is created"
2021-10-14 06:13:54 +00:00
markchien
1110b725a0
Fix TetheringManager memory leak
...
TetheringCallbackInteranl is inner class which explicitly reference
TetheringManager object. This causes TetheringManager can't be GC. Using
static nested class which has its own lifecycle and weak reference
TetheringManager object.
Still have a leak inside Tethering that TetheringCallbackInternal is
never unregistered. Currently it rely on binder died to remove the
reference, which usually happen in kill process. If process keep alive,
the TetheringCallbackInternal would not be freed even TetheringManager is
gone. Will have follow CL to fix this.
Bug: 177265744
Bug: 191798390
Bug: 187972579
Test: 1. lunch Settings with ON/OFF tethering, dump java heap.
2. close Settings and restart Settings again, dump java heap.
3. Compare java heap between step 1 and step 2.
Change-Id: I0e2a21b7988115098a033a581cd98da8bffe2791
2021-10-14 14:02:11 +08:00
Treehugger Robot
48723f3ced
Merge "Ignore testRestrictedNetworkPermission on Q" am: 6b6d2eb75b am: ccb213843c am: d4c5e13ebe am: bc29f21cfd
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1826056
Change-Id: I33c41bcbb4f5f8641450e8f59a66071a82a689cb
2021-10-13 08:11:44 +00:00
Treehugger Robot
bc29f21cfd
Merge "Ignore testRestrictedNetworkPermission on Q" am: 6b6d2eb75b am: ccb213843c am: d4c5e13ebe
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1826056
Change-Id: Ied6f3c44b899f23eb9544d2d98b14ce0c1fd2dbf
2021-10-13 07:57:19 +00:00
Treehugger Robot
d4c5e13ebe
Merge "Ignore testRestrictedNetworkPermission on Q" am: 6b6d2eb75b am: ccb213843c
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1826056
Change-Id: I57bd2a913cc23370ad064054b41cb29c68b80d46
2021-10-13 07:37:44 +00:00
Treehugger Robot
ccb213843c
Merge "Ignore testRestrictedNetworkPermission on Q" am: 6b6d2eb75b
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1826056
Change-Id: Ib8043933f8f3dcd029f0acb601035d96204e2ddd
2021-10-13 07:22:32 +00:00
Treehugger Robot
6b6d2eb75b
Merge "Ignore testRestrictedNetworkPermission on Q"
2021-10-13 07:01:33 +00:00
Xin Li
ab8659cf4f
[automerger skipped] Merge Android 12 am: 301d6bdfa6 -s ours am: 0d63d026fb -s ours am: 1fc4fa89ea -s ours am: 67ee516732 -s ours
...
am skip reason: Merged-In I3ae21d9b034e455ba48d9576712a102ccda0f647 with SHA-1 6e1c375f50 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1847635
Change-Id: I9c73f7dcd07233f25b26cd47e68352ec18cb6622
2021-10-08 08:30:03 +00:00
Xin Li
67ee516732
[automerger skipped] Merge Android 12 am: 301d6bdfa6 -s ours am: 0d63d026fb -s ours am: 1fc4fa89ea -s ours
...
am skip reason: Merged-In I3ae21d9b034e455ba48d9576712a102ccda0f647 with SHA-1 6e1c375f50 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1847635
Change-Id: I745ef4d42ecaf06bb81d9dbe0b7162267fea65a8
2021-10-08 07:57:05 +00:00
Xin Li
1fc4fa89ea
[automerger skipped] Merge Android 12 am: 301d6bdfa6 -s ours am: 0d63d026fb -s ours
...
am skip reason: Merged-In I3ae21d9b034e455ba48d9576712a102ccda0f647 with SHA-1 6e1c375f50 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1847635
Change-Id: I8a28a92726e1dadcecf2b4eef1b7784ca79b1ddf
2021-10-08 01:39:50 +00:00
Xin Li
0d63d026fb
[automerger skipped] Merge Android 12 am: 301d6bdfa6 -s ours
...
am skip reason: Merged-In I3ae21d9b034e455ba48d9576712a102ccda0f647 with SHA-1 6e1c375f50 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1847635
Change-Id: I00bbe32399a8a3952642c1ac1d02f2aeecfa373e
2021-10-08 01:20:24 +00:00
Chiachang Wang
1c3cdce86d
Exclude testGetMultipathPreference on no Wi-Fi devices
...
Bug: 202228414
Test: atest CtsNetTestCases
Change-Id: I3112ffb816fd16b2fc7a87c35d8f95eef0144281
2021-10-07 13:19:32 +08:00
Xin Li
301d6bdfa6
Merge Android 12
...
Bug: 202323961
Merged-In: I3ae21d9b034e455ba48d9576712a102ccda0f647
Change-Id: I0b895d155dfb440a3788cc950a8c76fe8b505dd0
2021-10-06 22:54:04 +00:00
Treehugger Robot
878abac790
Merge "Support wifi and ethernet connection for DnsResolverTest." am: f822038c1c am: 6e1c375f50 am: 039876779e am: 4178cb45dd
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1833253
Change-Id: I8b78f198353876207a0bf5d1f7c366f9b6d8d7ad
2021-10-06 09:36:51 +00:00
Treehugger Robot
4178cb45dd
Merge "Support wifi and ethernet connection for DnsResolverTest." am: f822038c1c am: 6e1c375f50 am: 039876779e
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1833253
Change-Id: I32c32b72233d66a7f4510618d33b4d5905a3f552
2021-10-06 09:21:19 +00:00
Treehugger Robot
039876779e
Merge "Support wifi and ethernet connection for DnsResolverTest." am: f822038c1c am: 6e1c375f50
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1833253
Change-Id: I595116f9996eca55f60708bfb817577a8b5b624b
2021-10-06 09:10:33 +00:00
Treehugger Robot
6e1c375f50
Merge "Support wifi and ethernet connection for DnsResolverTest." am: f822038c1c
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1833253
Change-Id: I3ae21d9b034e455ba48d9576712a102ccda0f647
2021-10-06 08:52:12 +00:00
Treehugger Robot
f822038c1c
Merge "Support wifi and ethernet connection for DnsResolverTest."
2021-10-06 08:34:52 +00:00
Chalard Jean
dfe07270bd
Merge "Add a small usage comment" am: a898f0a039 am: 7f40360e32 am: 5274a841f1 am: a29760aa9b
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1844182
Change-Id: I83f09310a81a1bc9dabca70890ea892baa8f3f5c
2021-10-05 11:52:40 +00:00
Chalard Jean
a29760aa9b
Merge "Add a small usage comment" am: a898f0a039 am: 7f40360e32 am: 5274a841f1
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1844182
Change-Id: I67f8526e4b959fc93ee7be5b5f83e55cf5d63c1d
2021-10-05 11:40:40 +00:00
Chalard Jean
5274a841f1
Merge "Add a small usage comment" am: a898f0a039 am: 7f40360e32
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1844182
Change-Id: Id953e7f7d5fa0067fc98a0489230c5ab480b7aa8
2021-10-05 11:27:22 +00:00
Chalard Jean
7f40360e32
Merge "Add a small usage comment" am: a898f0a039
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1844182
Change-Id: Ibe27d64cd16a2ef44d6a41b94f81a0daa06c523b
2021-10-05 11:14:01 +00:00
Chalard Jean
a898f0a039
Merge "Add a small usage comment"
2021-10-05 10:57:59 +00:00