Commit Graph

43100 Commits

Author SHA1 Message Date
Chalard Jean
10beb85d29 Merge "Check NetworkAgentInfo Map Before Destroying Network" am: 9d31c63e03 am: 8c06f9991b am: d4c7de35d5
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1802528

Change-Id: I572d6771cc4d5f078a3f58f5cb52656b94d6887d
2021-09-29 06:58:16 +00:00
Chalard Jean
d4c7de35d5 Merge "Check NetworkAgentInfo Map Before Destroying Network" am: 9d31c63e03 am: 8c06f9991b
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1802528

Change-Id: I7f5dc2bdc4f31b6ac60df12592247587c3d9875c
2021-09-29 06:42:51 +00:00
Chalard Jean
8c06f9991b Merge "Check NetworkAgentInfo Map Before Destroying Network" am: 9d31c63e03
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1802528

Change-Id: Ibcf989ffd494108faeeb4419041fb32389208c4d
2021-09-29 06:20:06 +00:00
Chalard Jean
9d31c63e03 Merge "Check NetworkAgentInfo Map Before Destroying Network" 2021-09-29 06:03:56 +00:00
Luke Huang
d4563c6c64 [automerger skipped] Merge "Modify Nsd{Service,Manager}Test to conform to its change" am: 38f82199ab -s ours am: 7f2cc5395f -s ours am: d3d5fe189f -s ours
am skip reason: Merged-In I3cf658498bef5755dcb01127a94fff913b6e6298 with SHA-1 952a55c62d is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1764165

Change-Id: Iae62ee090c4b1fe8cd997d6113d10a315108cb44
2021-09-29 04:26:15 +00:00
Luke Huang
d3d5fe189f [automerger skipped] Merge "Modify Nsd{Service,Manager}Test to conform to its change" am: 38f82199ab -s ours am: 7f2cc5395f -s ours
am skip reason: Merged-In I3cf658498bef5755dcb01127a94fff913b6e6298 with SHA-1 952a55c62d is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1764165

Change-Id: I502cb067ae4cef5ae5e7de838a88d1522401c5eb
2021-09-29 04:10:28 +00:00
Luke Huang
7f2cc5395f [automerger skipped] Merge "Modify Nsd{Service,Manager}Test to conform to its change" am: 38f82199ab -s ours
am skip reason: Merged-In I3cf658498bef5755dcb01127a94fff913b6e6298 with SHA-1 952a55c62d is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1764165

Change-Id: Icbe217fcfba27fd186af32d79fb3d61e2a868b7c
2021-09-29 03:50:49 +00:00
Luke Huang
38f82199ab Merge "Modify Nsd{Service,Manager}Test to conform to its change" 2021-09-29 03:35:20 +00:00
Tyler Wear
6bff267208 Fix NetworkOffer Death link does not exist am: 3ec7e6d9fb am: f405adead7 am: a5208a6aa2
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1799528

Change-Id: Id307e54a38054207ae164851c86bed1314ef7a2b
2021-09-29 01:22:00 +00:00
Tyler Wear
a5208a6aa2 Fix NetworkOffer Death link does not exist am: 3ec7e6d9fb am: f405adead7
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1799528

Change-Id: I8188f0bc257910e1ebb6353f60db078a3cf6a8e4
2021-09-29 01:09:27 +00:00
Tyler Wear
f405adead7 Fix NetworkOffer Death link does not exist am: 3ec7e6d9fb
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1799528

Change-Id: Ic1b0cb9e06d05d334cedd4b50bc7e8cf91dcc59a
2021-09-29 00:55:19 +00:00
Tyler Wear
614b27badd Check NetworkAgentInfo Map Before Destroying Network
updateNetworkInfo is called with the argument in a message,
which is initialized with `this` in NetworkAgentRegistry.
That means it's technically possible that CS calls
tearDownUnneededNetwork, calling nai.disconnect() and
queuing up a message to call this, but before it's done
the NA calls sendNetworkInfo with DISCONNECTED, which
never looks up the agent from the map. Throwing a
ServiceSpecificException and resulting in a System crash.

Bug: 196423147
Change-Id: Ia52f2b794f32c263200c14b8dc2eb6b184bff5ff
2021-09-28 17:41:23 -07:00
Tyler Wear
3ec7e6d9fb Fix NetworkOffer Death link does not exist
unregisterNetworkProvider is being called from binderDied()
and handleUnregisterNetworkProvider() at the same time. This results
in NoSuchElementException being thrown.

Check than noi can be removed from network offers before unregistering
death link.

Bug: 196423150
Change-Id: If5bd5f2894fa0509a89340efdc85180c54e72e0e
2021-09-20 10:40:19 -07:00
Chalard Jean
f2b4b33bef Merge "Add a mode for cell radios unable to time share" am: c80a5d56db am: d4ec13a400 am: a4ac96cf27
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1827923

Change-Id: I486eb7fd1a8296e3c4b75605f79442420fc3147b
2021-09-18 13:20:53 +00:00
Chalard Jean
a4ac96cf27 Merge "Add a mode for cell radios unable to time share" am: c80a5d56db am: d4ec13a400
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1827923

Change-Id: I76d81c750f00aa4d976b52a2d5cb5a375533f941
2021-09-18 13:06:16 +00:00
Chalard Jean
d4ec13a400 Merge "Add a mode for cell radios unable to time share" am: c80a5d56db
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1827923

Change-Id: I5ded48c8498c32977adcfe2363599d6cfa246e1b
2021-09-18 12:50:52 +00:00
Chalard Jean
c80a5d56db Merge "Add a mode for cell radios unable to time share" 2021-09-18 12:39:24 +00:00
Chalard Jean
0702f98edc Add a mode for cell radios unable to time share
Upon changing the default SIM card, the radio will create a
new connection to the new subscription. If that subscription
works correctly, the stack will prefer it to the old one as
the new subscription will be marked with a Primary policy
flag it its score.

Normally, at this point the old network lingers to give apps
an opportunity to gracefully migrate their connections. But
with some radios, this may have a dramatic effect on the
performance of the new connection.

This patch introduces a flag so that devices with such radios
can be marked. In this case the stack will move to a degraded
mode and eschew the grace delay for apps and give them a hard
break instead, so that the new network can reach a good
performance immediately. Apps with existing connections will
suffer a worse experience.

If there is a request that can only be served by the old
connection, still keep it, as arguably the user still
expects their MMS be sent on the old connection, even if the
new connection doesn't work well until it's done.

Test: new test in this patch, and add relevant tests in both modes
      also manually change the value of the flag and run
      FrameworksNetTests and CtsNetTestCasesLatestSdk
Bug: 200226979
Change-Id: I4ace82f90e873bf06298cc689bb1d794ed5124bd
2021-09-18 04:03:13 +00:00
Aaron Huang
49862bb282 Merge "Remove ForceAllNetworkTypes from test" am: f7762c823a am: fed2d0614f am: 33c22439a4
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1824632

Change-Id: Ic08f408e882f2378844cd416bf8f749153d607a9
2021-09-17 12:53:36 +00:00
Aaron Huang
33c22439a4 Merge "Remove ForceAllNetworkTypes from test" am: f7762c823a am: fed2d0614f
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1824632

Change-Id: Id03c0eb742af83c08cb7ea84eb0ff217b3fab0e0
2021-09-17 12:44:27 +00:00
Aaron Huang
fed2d0614f Merge "Remove ForceAllNetworkTypes from test" am: f7762c823a
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1824632

Change-Id: Ib5ef798b75c473e4e2c62cf295b55e3669508648
2021-09-17 12:25:04 +00:00
Aaron Huang
f7762c823a Merge "Remove ForceAllNetworkTypes from test" 2021-09-17 12:08:59 +00:00
Aaron Huang
3db9d3691a Merge "Test a template matches mobile and mobile wildcard" am: 3cbd991ab4 am: 952f97c84b am: fc01806b57
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1784390

Change-Id: Ida6883962f4df67800931145b5f2ca7d47dc182e
2021-09-16 10:33:34 +00:00
Aaron Huang
fc01806b57 Merge "Test a template matches mobile and mobile wildcard" am: 3cbd991ab4 am: 952f97c84b
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1784390

Change-Id: Iac083d8cbb4c77a4f13a20df1ee6a4675d282aa9
2021-09-16 10:18:44 +00:00
Aaron Huang
952f97c84b Merge "Test a template matches mobile and mobile wildcard" am: 3cbd991ab4
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1784390

Change-Id: Ia33a4d9fb1e543680af7c6a25df619bed80799a9
2021-09-16 10:03:56 +00:00
Aaron Huang
3cbd991ab4 Merge "Test a template matches mobile and mobile wildcard" 2021-09-16 09:42:22 +00:00
Chiachang Wang
3007db2308 Merge "Correct the calling method in removeDefaultNetworkActiveListener" am: a6e3069c27 am: 7c04a51a95 am: 97fa4cc109
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1827914

Change-Id: I2bfa4942fb9696189f9973553f250e859b1c8df2
2021-09-16 07:03:33 +00:00
Chiachang Wang
97fa4cc109 Merge "Correct the calling method in removeDefaultNetworkActiveListener" am: a6e3069c27 am: 7c04a51a95
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1827914

Change-Id: I7dfc06f15683c4e4502636cc0eab1285d1e6ee02
2021-09-16 06:50:32 +00:00
Chiachang Wang
7c04a51a95 Merge "Correct the calling method in removeDefaultNetworkActiveListener" am: a6e3069c27
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1827914

Change-Id: I69a199d8253aca744a43b04e89a88da65f6bd8b9
2021-09-16 06:39:32 +00:00
Chiachang Wang
a6e3069c27 Merge "Correct the calling method in removeDefaultNetworkActiveListener" 2021-09-16 06:29:36 +00:00
Chiachang Wang
e54c8199aa Correct the calling method in removeDefaultNetworkActiveListener
The removeDefaultNetworkActiveListener should do the
unregisteration but it's incorrectly calling
registerNetworkActivityListener into the ConnectivityService.

Bug: 199753782
Test: atest FrameworksNetTests CtsNetTestCases
Change-Id: I65a2ddc82989d736316d51f5058e707f5b261a82
2021-09-16 02:25:48 +00:00
markchien
749338fd19 Test QosSocketInfo.getNetwork am: 059bfa6149 am: 3e14f7df9f am: 0b21a5c104
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1826063

Change-Id: I972aff619886aeb9b5495dd2f4b1fc461d4247c0
2021-09-15 11:46:22 +00:00
markchien
0b21a5c104 Test QosSocketInfo.getNetwork am: 059bfa6149 am: 3e14f7df9f
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1826063

Change-Id: I7c348c5524e3c2c003d9b166b4f5872f458fa213
2021-09-15 11:33:23 +00:00
markchien
3e14f7df9f Test QosSocketInfo.getNetwork am: 059bfa6149
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1826063

Change-Id: I29e01f008d6dfeb516dc71f7c3cf4637828b2b6c
2021-09-15 11:19:50 +00:00
markchien
059bfa6149 Test QosSocketInfo.getNetwork
Bug: 183239152
Test: atest NetworkAgentTest
Change-Id: I9848608e0aa500ff7668350a080537dd4a549214
2021-09-15 03:09:26 +00:00
Aaron Huang
cbb4d498c2 Test a template matches mobile and mobile wildcard
Add two test cases for matchesMobile and matchesMobileWildcard

Bug: 183776809
Test: FrameworksNetTests:NetworkTemplateTest
Change-Id: I14d31071655204fe6ad36c71f7f521640e01c96e
2021-09-14 23:36:04 +08:00
Treehugger Robot
0bb8639bc0 Merge "Add logging on UnfinishedStubbingException" am: f2ddb4151c am: e41baf1752 am: c25331f111
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1805818

Change-Id: I9cfc82e726b3b5ed7699eb0455c9349199f10f20
2021-09-13 03:14:48 +00:00
Treehugger Robot
c25331f111 Merge "Add logging on UnfinishedStubbingException" am: f2ddb4151c am: e41baf1752
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1805818

Change-Id: I612f1e6631ca2a8193ae32d2079128ca3d726f9c
2021-09-13 02:58:02 +00:00
Treehugger Robot
e41baf1752 Merge "Add logging on UnfinishedStubbingException" am: f2ddb4151c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1805818

Change-Id: Id8aa8e2c460891500b2926b0585edd0bfd972fa9
2021-09-13 02:46:35 +00:00
Treehugger Robot
f2ddb4151c Merge "Add logging on UnfinishedStubbingException" 2021-09-13 02:34:27 +00:00
Luke Huang
df75378ad4 Modify Nsd{Service,Manager}Test to conform to its change
(clean cherry-pick from downstream branch)
Test: atest NsdManagerTest NsdServiceTest
Bug: 191844585
Merged-In: I3cf658498bef5755dcb01127a94fff913b6e6298

Change-Id: I3cf658498bef5755dcb01127a94fff913b6e6298
2021-09-13 10:18:04 +09:00
Bill Yi
d5e28474f7 Merge changes from topic "presubmit-am-647350e3bf134d7da0e8df1bfb2dc418" into sc-qpr1-dev am: 814a8e4d90
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15806632

Change-Id: I215f6d9652d78191cf4e622c53a6c64deeb93335
2021-09-12 13:22:31 +00:00
Bill Yi
b60415ce32 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 069a442dc2 am: cf16330636 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15806632

Change-Id: Ib389e4f065815e7947fd53fd0085193f85209cbb
2021-09-12 13:22:30 +00:00
Bill Yi
c5a3438483 Merge changes from topic "presubmit-am-647350e3bf134d7da0e8df1bfb2dc418" into sc-dev-plus-aosp am: 1dcc8f8ab2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15806632

Change-Id: I8a3d167b51c24d37d493cb39cdc314b42f88f9c2
2021-09-12 13:22:01 +00:00
Bill Yi
dec586c025 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 069a442dc2 am: 826d98b7fa -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15806632

Change-Id: I27f40f7a9576db0e5cdd481cd69c20f627ebf1e6
2021-09-12 13:22:00 +00:00
Bill Yi
1dcc8f8ab2 Merge changes from topic "presubmit-am-647350e3bf134d7da0e8df1bfb2dc418" into sc-dev-plus-aosp
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 069a442dc2
  Import translations. DO NOT MERGE ANYWHERE
2021-09-12 13:03:49 +00:00
Bill Yi
814a8e4d90 Merge changes from topic "presubmit-am-647350e3bf134d7da0e8df1bfb2dc418" into sc-qpr1-dev
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 069a442dc2
  Import translations. DO NOT MERGE ANYWHERE
2021-09-12 13:03:49 +00:00
Bill Yi
e69f09a1b8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 166f5fe82b -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15806603

Change-Id: I80d05215fff665f65de1e845097edfd210c42760
2021-09-12 08:29:01 +00:00
Paul Hu
f8270ee51e Merge "Remove NetworkUtils.queryUserAccess in test" am: c7d5ea0bbd am: acffb5cc5a am: 31f4fd40b0
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1775930

Change-Id: Iad4b613d78cb3ad3d362a823daf2684405d4649f
2021-09-11 06:54:41 +00:00
Paul Hu
31f4fd40b0 Merge "Remove NetworkUtils.queryUserAccess in test" am: c7d5ea0bbd am: acffb5cc5a
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1775930

Change-Id: I9543ed320b47fa38558dfe9ab3f1bbaebfba59d1
2021-09-11 06:36:55 +00:00