summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-09-20Merge "Keep the RetryIndex if the Error is IKE Protocol Exception" into main ↵tmp_amf_298295554Kuen Yuet Cheung
am: 14b5cc157e Original change: https://android-review.googlesource.com/c/platform/packages/services/Iwlan/+/2751970 Change-Id: I6c00b136e0706aea181d75041aad83f60fa977c0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20Merge "Keep the RetryIndex if the Error is IKE Protocol Exception" into mainKuen Yuet Cheung
2023-09-20Keep the RetryIndex if the Error is IKE Protocol ExceptionKuen Yuet Cheung
Test: atest Bug: 292312000 Change-Id: I722f543de2ab6ce94410c7be1ce58528ae762626
2023-09-20Merge "Support DH group 15, 16 in Iwlan" into main am: 6e6eec87d2Jeremy Chow
Original change: https://android-review.googlesource.com/c/platform/packages/services/Iwlan/+/2746581 Change-Id: I28390627a0008abd449b00699007b1e5fd2389e8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20Merge "Support DH group 15, 16 in Iwlan" into mainJeremy Chow
2023-09-08Support DH group 15, 16 in IwlanJeremy Chow
Bug: 290731234 Test: Manual test with Swissom_CH b/294857632#comment6 Change-Id: I1ee7deaf0e391d6fc2576c983881da32454ce7f6
2023-08-31Skip UP1A.230905.019Xin Li
Merged-In: I5f4e79099ebc8f688bcb19fbb540ca5e50704c2f Change-Id: I6b5b197055ac9e0106d5cd3b98e92fd3c41064d3
2023-08-23Merge Android U (ab/10368041)Xin Li
Bug: 291102124 Merged-In: I6f63c7eaf36cb362f6d017a2c1480d146868f924 Change-Id: Ifb0d3735c13eebcd47273a080cc3be05b2e8d3d5
2023-08-23Merge "Revert "Revert "Add separated thread and handler for ↵Kuen Yuet Cheung
IwlanCarrierConfigChangeListener""" into main am: 42f2fd18e7 Original change: https://android-review.googlesource.com/c/platform/packages/services/Iwlan/+/2720973 Change-Id: I2f75e6a57110513fa4385cdc2c59c68c1201c62b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-23Merge "Revert "Revert "Add separated thread and handler for ↵Kuen Yuet Cheung
IwlanCarrierConfigChangeListener""" into main
2023-08-22Revert "Revert "Add separated thread and handler for ↵Kuen Yuet Cheung
IwlanCarrierConfigChangeListener"" This reverts commit a06fe23f077f94cfe73330afa4a10749941e0883. Reason for revert: This is not the root cause of b/296031825 The test failure looks like due to b/296077108 Change-Id: I625b937364a558f96e9ac4eef69af1d5f3bc60bf
2023-08-17Merge "Revert "Add separated thread and handler for ↵Chidera Olibie
IwlanCarrierConfigChangeListener"" into main am: 30fed8497f Original change: https://android-review.googlesource.com/c/platform/packages/services/Iwlan/+/2711716 Change-Id: I34b9b0a6b703d30392511a17a740eca39f027a7d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-17Merge "Revert "Add separated thread and handler for ↵Chidera Olibie
IwlanCarrierConfigChangeListener"" into main
2023-08-16Merge "Correct protocolType of setupDataCall response based on link ↵Tairu Wang
addresses" into main am: 81990f72ef Original change: https://android-review.googlesource.com/c/platform/packages/services/Iwlan/+/2691128 Change-Id: I6ddd9a4906faa1424177d407753bbe61598273be Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16Merge "Replace deprecated Matchers in GoogleTest" into main am: bcff7a8996Tairu Wang
Original change: https://android-review.googlesource.com/c/platform/packages/services/Iwlan/+/2702273 Change-Id: I807079c7567ba6da817d9dd63578ed1ca1a45fc4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16Merge "Correct protocolType of setupDataCall response based on link ↵Tairu Wang
addresses" into main
2023-08-16Merge "Replace deprecated Matchers in GoogleTest" into mainTairu Wang
2023-08-16Revert "Add separated thread and handler for IwlanCarrierConfigChangeListener"Naomi Musgrave
This reverts commit 3a252a3861929f71daa917e778a55c0ac714757d. Reason for revert: Investigating culprit for b/296031825 Change-Id: I93115e21eac154c1d8012fd6975c973b753d8004
2023-08-15Merge "Add separated thread and handler for ↵Kuen Yuet Cheung
IwlanCarrierConfigChangeListener" into main am: 1c59460fc3 Original change: https://android-review.googlesource.com/c/platform/packages/services/Iwlan/+/2695232 Change-Id: I2fa3cc395574a9ddf089bad1fd308814f1e77a18 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-15Merge "Add separated thread and handler for ↵Kuen Yuet Cheung
IwlanCarrierConfigChangeListener" into main
2023-08-15Add separated thread and handler for IwlanCarrierConfigChangeListenerKuen Yuet Cheung
Bug: 264919227 Test: atest Change-Id: I96d22a38a5b89e2fa862c171d9c2727709ad7d91
2023-08-10Correct protocolType of setupDataCall response based on link addressesTairu Wang
- Get protocolType based on link addresses intead of copying protocolType from setupDataCall request to setupDataCall response. Bug: 265214391 Test: atest IwlanTests (new test cases) Test: on-device regression test Change-Id: Id543250f8cdbb41dfc6b50d7937b3a4762a09448
2023-08-09Replace deprecated Matchers in GoogleTestTairu Wang
- The matchers.isnull matcher is deprecated in GoogleTest and will be removed in a future version. Replace with ArgumentMatchers. Bug: 295189120 Test: atest IwlanTest Change-Id: Ib39807ab6e373051e97a30811dc2c719d436d365
2023-08-08Merge "Refactor IPsec tunnel interface handling" into main am: 4794787154Po-Chun Lee
Original change: https://android-review.googlesource.com/c/platform/packages/services/Iwlan/+/2554872 Change-Id: I03f5fe42251035e28bd38c5a004f2891b022bba1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08Merge "Refactor IPsec tunnel interface handling" into mainPo-Chun Lee
2023-08-02Merge "Avoid network change during tunnel bring up not toggle tunnel ↵Tairu Wang
bringdown" into main am: 05cda1273e Original change: https://android-review.googlesource.com/c/platform/packages/services/Iwlan/+/2673759 Change-Id: I89a676e4589cd9b4d96b49ff275234ba2262f485 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-02Merge "Avoid network change during tunnel bring up not toggle tunnel ↵Tairu Wang
bringdown" into main
2023-08-02Avoid network change during tunnel bring up not toggle tunnel bringdownTairu Wang
- Update sNetwork at the end of setNetworkConnected(). Bug: 289446567 Test: atest IwlanTests (new test cases) Test: on-device regression test Change-Id: I5aa7becf7613c38cc473a5d0c49f18ba661d296d Merged-In: I5aa7becf7613c38cc473a5d0c49f18ba661d296d
2023-08-02Refactor IPsec tunnel interface handlingPo-Chun Lee
Pre-allocate tunnel interface and network ID prior to IKE tunnel activation. This prevents IKE sessions from appearing open at the protocol level while ultimately failing due to internal UE errors. In case of a handover request, it helps avoid PDN loss following the handover, as the network has already transferred the PDN to IWLAN, which may have failed to initialize internally. Additionally, this update prevents duplicate interfaces by verifying their existence in EVENT_IPSEC_TRANSFORM_CREATED. Bug: 263969433 Test: atest, on-device regression Change-Id: I22dc9332b797871a3d11da48fbfece38b25cc5a2
2023-08-01IwlanEventListener#onCarrierConfigChanged should be synchronized am: b2a76a9930Kuen Yuet Cheung
Original change: https://android-review.googlesource.com/c/platform/packages/services/Iwlan/+/2678735 Change-Id: I1505274ccf3937d40e92794528a879d17c009fb0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27Replace CarrierConfigChange receiver with listener am: 815faecf95Kuen Yuet Cheung
Original change: https://android-review.googlesource.com/c/platform/packages/services/Iwlan/+/2666757 Change-Id: I9fb7333ebec43ac101f72bb227a5f761db735ade Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-27IwlanEventListener#onCarrierConfigChanged should be synchronizedKuen Yuet Cheung
The CarrierConfigChangeListener is register with Runnable::run, which mean the callback will run on handler thread. Therefore the onCarrierConfigChanged should be synchronized. Bug: 264919227 Test: atest Change-Id: I71a2b10419e9c35667754e7033c819cac35a99d6
2023-07-25Replace CarrierConfigChange receiver with listenerKuen Yuet Cheung
Using onCarrierConfigChanged() in CarrierConfigChangeListener to replace ACTION_CARRIER_CONFIG_CHANGED Bug: 264919227 Test: atest Change-Id: I9f6ca502ff8f8b545bb85cc4a6a143ff37bdec79
2023-07-12Merge "Only report call state to corresponding slot in IwlanEventListener" ↵Jeremy Chow
into main am: e42ca01d61 Original change: https://android-review.googlesource.com/c/platform/packages/services/Iwlan/+/2627940 Change-Id: Icbd091851b53ee3912c7e610c180824ee56e17af Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-12Merge "Only report call state to corresponding slot in IwlanEventListener" ↵Jeremy Chow
into main
2023-07-11Use Objects.equals() for mCarrierConfigErrorPolicyString to protect against ↵Jeremy Chow
future NPEs am: f7b5aa100e Original change: https://android-review.googlesource.com/c/platform/packages/services/Iwlan/+/2653364 Change-Id: Icf533354cd87fdb43777171d4fb301b7b34926de Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11Use Objects.equals() for mCarrierConfigErrorPolicyString to protect against ↵Jeremy Chow
future NPEs Bug: 279676451 Test: atest IwlanTests Change-Id: Ib892ddc2e6ed7c887310237144d5a4bf2dabc87d
2023-07-11Only report call state to corresponding slot in IwlanEventListenerJeremy Chow
Bug: 285728334 Test: atest IwlanTests, on device test Change-Id: I8611b85283559287b4c504b9670918f1bc50dce9
2023-07-10Merge "[Iwlan Metrics] Block unexpected IwlanSetupDataCallResultReported" ↵Eden Su
into main am: b5e60eb616 Original change: https://android-review.googlesource.com/c/platform/packages/services/Iwlan/+/2620175 Change-Id: Ica01b3129d38d80f181488035191cfd29ac91b83 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10Merge "[Iwlan Metrics] Block unexpected IwlanSetupDataCallResultReported" ↵Eden Su
into main
2023-07-07Merge "Avoid NPE for null static LinkProperties object" into main am: 05ce0424a3Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/packages/services/Iwlan/+/2650229 Change-Id: I093b5a61b08bcc98b5fdbc1ed1647f3f315a8fd4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07Update Network to EpdgTunnelManager when SetupDataCall am: 0db4073c40EdenSu
Original change: https://android-review.googlesource.com/c/platform/packages/services/Iwlan/+/2650386 Change-Id: I5621152b675986c735f6c797227a17350ecbf3a5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07Merge "Avoid NPE for null static LinkProperties object" into mainTreehugger Robot
2023-07-07Update Network to EpdgTunnelManager when SetupDataCallEdenSu
Issue: After Iwlan crached/restarted, the default network updated before DP created. The EpdgTunnelManager isn't updated the default network so it blocked the IWLAN PDN setup. Solution: Udpate the network to EpdgTunnelmanager when processing SETUP_DATA_CALL request. Bug: 285069037 Test: Iwlan PDN can be restored after kill Iwlan process PtsRadioIwlanTest#IwlanRestartTest passed (cherry picked from https://android-review.googlesource.com/q/commit:9a58b44149ec5e4d761a92ca74382dde5c83a023) Merged-In: I34aeae147ccad1934d697c34da4bb35bfb96de68 Change-Id: I34aeae147ccad1934d697c34da4bb35bfb96de68
2023-07-07Avoid NPE for null static LinkProperties objectAswin Sankar
- LinkProperties can be null at onCapabilitiesChanged(). - Reverse equality check to access @NonNull variable first. - Update static variable 'sNetworkConnected' to fix flaky test. Fix: 288475484, 287627889 Test: IwlanDataServiceTest, Live regression test. (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:df62b646fbbd7ed5982cbb56b6ffa994548e5e26) (cherry picked from https://android-review.googlesource.com/q/commit:a7e197d1d5f105135282ae85c21157844d1ecc27) Merged-In: I5f4e79099ebc8f688bcb19fbb540ca5e50704c2f Change-Id: I5f4e79099ebc8f688bcb19fbb540ca5e50704c2f
2023-07-05Merge cherrypicks of ['googleplex-android-review.googlesource.com/23879885'] ↵android-vts-14.0_r4android-vts-14.0_r3android-vts-14.0_r2android-vts-14.0_r1android-security-14.0.0_r8android-security-14.0.0_r7android-security-14.0.0_r6android-security-14.0.0_r5android-security-14.0.0_r4android-security-14.0.0_r3android-security-14.0.0_r2android-platform-14.0.0_r7android-platform-14.0.0_r6android-platform-14.0.0_r5android-platform-14.0.0_r4android-platform-14.0.0_r3android-platform-14.0.0_r2android-platform-14.0.0_r1android-cts-14.0_r4android-cts-14.0_r3android-cts-14.0_r2android-cts-14.0_r1android-14.0.0_r28android-14.0.0_r2android-14.0.0_r15android-14.0.0_r14android-14.0.0_r13android-14.0.0_r1android14-tests-releaseandroid14-security-releaseandroid14-s2-releaseandroid14-s1-releaseandroid14-releaseandroid14-platform-releaseAndroid Build Coastguard Worker
into udc-release. Change-Id: Iaf9d3daccd121c3a662c96bff88ab678cdc9ca03
2023-07-05Avoid NPE for null static LinkProperties objectAswin Sankar
- LinkProperties can be null at onCapabilitiesChanged(). - Reverse equality check to access @NonNull variable first. - Update static variable 'sNetworkConnected' to fix flaky test. Fix: 288475484, 287627889 Test: IwlanDataServiceTest, Live regression test. (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:d3d87114e767f9aa5b0b48c17c5d598ff0b76cd9) Merged-In: I5f4e79099ebc8f688bcb19fbb540ca5e50704c2f Change-Id: I5f4e79099ebc8f688bcb19fbb540ca5e50704c2f
2023-06-09[Iwlan Metrics] Block unexpected IwlanSetupDataCallResultReportedEdenSu
Clear MessageId after sending metrics data to prevent the unexpected IwlanSetupDataCallResultReported. Test: Local test to verified the IwlanSetupDataCallResultReported won't be sent when IWLAN PDN was torn down by deactivation request. Bug: 285454913 Change-Id: I822b46df4804bf3ad87639f6c6bfd8dbe1a48bd0
2023-06-07Reset carrier error policy in ErrorPolicyManager if new carrier has no error ↵Jeremy Chow
policy. am: 7b1ca476af am: 76ca2d8116 am: ed6c97caf5 Original change: https://android-review.googlesource.com/c/platform/packages/services/Iwlan/+/2613109 Change-Id: I6f63c7eaf36cb362f6d017a2c1480d146868f924 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-07Reset carrier error policy in ErrorPolicyManager if new carrier has no error ↵Jeremy Chow
policy. am: 7b1ca476af am: 76ca2d8116 Original change: https://android-review.googlesource.com/c/platform/packages/services/Iwlan/+/2613109 Change-Id: I0a1a33b8be638f288308da86e94fc40ea2d3b627 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>