Commit Graph

43239 Commits

Author SHA1 Message Date
Chalard Jean
71b24161aa Merge "Cleanup shims usage in Tethering" am: 7949b8c557 am: 9a492016d9 am: 4a393b4ab2
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1864041

Change-Id: I08d4e45b1ee5224e1ab7cdd78afb988f3ac3c04d
2021-10-20 13:49:10 +00:00
Chalard Jean
4a393b4ab2 Merge "Cleanup shims usage in Tethering" am: 7949b8c557 am: 9a492016d9
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1864041

Change-Id: I7d73c887ec3922656924412192c60b5f2bf51d13
2021-10-20 13:31:20 +00:00
Chalard Jean
9a492016d9 Merge "Cleanup shims usage in Tethering" am: 7949b8c557
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1864041

Change-Id: I84e1892270207230f2dfa5bb6725ad395988ef57
2021-10-20 13:17:29 +00:00
Chalard Jean
7949b8c557 Merge "Cleanup shims usage in Tethering" 2021-10-20 13:06:24 +00:00
Chalard Jean
732ebcbc7f Cleanup shims usage in Tethering
Now that S has gone to AOSP, this dependency is no longer
needed. It is, on the contrary, harmful as it prevents us
from adding shims that depend on T APIs in AOSP.

Test: builds
Change-Id: I64f0f394e826e58a9b7e772043bb6008428892e6
2021-10-20 19:44:09 +09:00
Treehugger Robot
eed118a4bf Merge "Unregister the tethering internal callback in finalize" am: f8d1f3d1cd am: c472eed19a am: e92e0a4e9a
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1838543

Change-Id: I097d9f5702f3898d809730674497f84fca817906
2021-10-20 09:31:03 +00:00
Treehugger Robot
e92e0a4e9a Merge "Unregister the tethering internal callback in finalize" am: f8d1f3d1cd am: c472eed19a
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1838543

Change-Id: I84a8f72bec2d7559e938d16f30716e957018d3c8
2021-10-20 09:12:31 +00:00
Treehugger Robot
c472eed19a Merge "Unregister the tethering internal callback in finalize" am: f8d1f3d1cd
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1838543

Change-Id: I3523da57b7d0feac11b2cdf62f254e694d5b7269
2021-10-20 08:57:57 +00:00
Treehugger Robot
f8d1f3d1cd Merge "Unregister the tethering internal callback in finalize" 2021-10-20 08:40:08 +00:00
Treehugger Robot
4123670bf5 Merge "Test TetheringManager could be GC after getting connector" am: 9d0c5419c9 am: 695b4c170e am: 6ae4b7e227
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1838542

Change-Id: I51d1ff8d9bbc7bccaf599b5a53639c7203a0ca5a
2021-10-20 08:32:13 +00:00
Treehugger Robot
6ae4b7e227 Merge "Test TetheringManager could be GC after getting connector" am: 9d0c5419c9 am: 695b4c170e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1838542

Change-Id: I75834a014f0f4e3297393b860d82b1e642520580
2021-10-20 08:16:54 +00:00
Treehugger Robot
695b4c170e Merge "Test TetheringManager could be GC after getting connector" am: 9d0c5419c9
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1838542

Change-Id: I3a11200db5de2143bada839d7b4268dc393afab9
2021-10-20 08:01:33 +00:00
Treehugger Robot
9d0c5419c9 Merge "Test TetheringManager could be GC after getting connector" 2021-10-20 07:48:10 +00:00
Paul Hu
efca18d4cc Merge "Crash bad callers earlier" am: 7a30d04659 am: ad329392a7 am: c04b1e707f
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1862335

Change-Id: I208aad86a1315e452f723eb1d130d9af2bbd5693
2021-10-20 07:32:12 +00:00
Paul Hu
c04b1e707f Merge "Crash bad callers earlier" am: 7a30d04659 am: ad329392a7
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1862335

Change-Id: Iaff0abe5a4720447244fd118141d6a9e8898f6ee
2021-10-20 07:17:27 +00:00
Paul Hu
ad329392a7 Merge "Crash bad callers earlier" am: 7a30d04659
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1862335

Change-Id: Id32847468921b060b2a7607f598ff801d84fa2f7
2021-10-20 07:05:11 +00:00
markchien
819e19ea2a Unregister the tethering internal callback in finalize
Bug: 177265744
Bug: 191798390
Bug: 187972579
Test: atest TetheringServiceTest
Change-Id: Ie7f9535b923db5073a59329ead22546a54e6ef47
2021-10-20 06:57:58 +00:00
Paul Hu
7a30d04659 Merge "Crash bad callers earlier" 2021-10-20 06:53:39 +00:00
Paul Hu
9763c2ec56 Merge "Specify which callback is unexpected in testMobileDataPreferredUids" am: c4898b85ce am: 17c492e08f am: 9bcde3bd20
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1817916

Change-Id: I32491555d58fc72fa7e781763802a828878e6694
2021-10-20 06:16:33 +00:00
markchien
e7b4a505aa Test TetheringManager could be GC after getting connector
There is pollingConnector thread which start polling connector if
TetheringManager is created earlier than TetheringService started(during
device boot up). TetheringManager won't be GCed if pollingConnector
thread do not finish its task yet.

Bug: 177265744
Bug: 191798390
Bug: 187972579
Test: atest TetheringServiceTest
Change-Id: Id8c7d10c5172e1d5de460c5311ff9c20261facef
2021-10-20 06:06:04 +00:00
Paul Hu
9bcde3bd20 Merge "Specify which callback is unexpected in testMobileDataPreferredUids" am: c4898b85ce am: 17c492e08f
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1817916

Change-Id: Ib7464c690d3b57773eb029e30daa2acaeb217a57
2021-10-20 06:05:10 +00:00
Paul Hu
17c492e08f Merge "Specify which callback is unexpected in testMobileDataPreferredUids" am: c4898b85ce
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1817916

Change-Id: I7210fea1f79ccb5d0e1e7db6d724759b4c686824
2021-10-20 05:52:41 +00:00
Paul Hu
c4898b85ce Merge "Specify which callback is unexpected in testMobileDataPreferredUids" 2021-10-20 05:39:19 +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
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
paulhu
c344c9fb9c Specify which callback is unexpected in testMobileDataPreferredUids
This test is flaky due to assertNoCallback(). Because this
method expects no any callback received but the wifi network
may update its capabilities during testing and trigger
onCapabilitiesChanged() to cause test failed. Thus, these
callbacks should be ignored in the tests.

Replace the assertNoCallback to assertNoCallbackThat with
callback type specified to deflake tests.

Also align the available callback verification in the test to
avoid confusion.

Fix: 198367703
Test: atest android.net.cts.ConnectivityManagerTest\
      --iterations 20
Change-Id: Ifde5e9730823c3b6f32590cc436cc4ba11d2b36e
2021-10-19 18:27:19 +08:00
Chalard Jean
4b918ab1a4 Crash bad callers earlier
Instead of crashing when parceling the NetworkInfo object,
crash at the time the bad call is made.

Bug: 145972387
Test: FrameworksNetTests
Change-Id: If8b5fd3d7b800c97211bcd16c9a8c5812708d4ab
2021-10-19 16:43:50 +08: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
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
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
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