summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-06-25Merge "Send normal termination metrics on wifi off" into rvc-dev am: 9e9451f3b5Remi NGUYEN VAN
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/11970035 Change-Id: I1e50ae3894e56d7ced7e59cfa07d07b8e89431a0
2020-06-25Merge "Get link state with same lock as LinkProperties" into rvc-devRemi NGUYEN VAN
2020-06-25Merge "Send normal termination metrics on wifi off" into rvc-devRemi NGUYEN VAN
2020-06-24Fix NullPointerException on addErrorCode when input is Invalid error code ↵Frank Li
am: ad90e1bfe1 am: c2cdb2c764 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/11987398 Change-Id: I56d1e71a1ce100a5306f5a53abe25d194c7f869b
2020-06-24Fix NullPointerException on addErrorCode when input is Invalid error code ↵Frank Li
am: ad90e1bfe1 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/11987398 Change-Id: I78c4025468341c9a515bcedd83cf19ea6795e283
2020-06-24Fix NullPointerException on addErrorCode when input is Invalid error codeFrank Li
Problem: 1. When the errocode is not defined in DhcpErrorCode enum. Then the DhcpErrorCode.forNumber(errorCode) will return null. 2. Then use null as the parameter cause NullPointerException on addErrorCode. (Because the addErrorCode need nonNullable parameter) Solution: If the errorcode is not defined in the Dhcp ErrorCode enumeration, please use ET_UNKNOWN instead as AddErrorCode parameter, not null. Bug: 151796056 Test: atest Original-Change: https://android-review.googlesource.com/1346103 Merged-In: I43b8415ab98b4cf6520c3240dc544a9f62730a4e Change-Id: I43b8415ab98b4cf6520c3240dc544a9f62730a4e
2020-06-24Merge "Jarjar com.google.protobuf" into rvc-dev am: 65e067f32e am: 4a61b59c36Remi NGUYEN VAN
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/11952738 Change-Id: Ie066dd85ec991e391ff75a593c2bcc941dfe39aa
2020-06-24Merge "Jarjar com.google.protobuf" into rvc-dev am: 65e067f32eRemi NGUYEN VAN
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/11952738 Change-Id: I546461bbd9e498b605045743ce3108c8a7484015
2020-06-24Merge "Jarjar com.google.protobuf" into rvc-devRemi NGUYEN VAN
2020-06-24Get link state with same lock as LinkPropertiesRemi NGUYEN VAN
The previous IpClientLinkObserver code could in theory call mCallback.update with a linkState that came from another update; for example: 1. onInterfaceAddressUpdated - mLinkProperties.addLinkAddress 2. onInterfaceLinkStateChanged - setInterfaceLinkState(false) 1. mCallback.update(false) <- should be true ? 2. mCallback.update(false) In practice this would not happen because the onFoo methods are all called in order (same binder token from netd), but IpClientLinkObserver should not need to make such assumptions. Bug: 151796056 Test: atest NetworkStackIntegrationTests (see also test-only change) Change-Id: I60f5a319519069070eb5a07643686bf5ec937665
2020-06-24Send normal termination metrics on wifi offRemi NGUYEN VAN
When turning wifi off, the interface gets torn down and empty LinkProperties are received before wifi calls stop(). This causes a loss of provisioning to be logged, instead of normal termination. Watch interface link status up/down events, and when provisioning is lost when the interface is down, consider it a normal termination. Bug: 151796056 Test: manual: turn wifi off, observe events Test: atest NetworkStackIntegrationTests (see also test-only change) Original-Change: https://android-review.googlesource.com/1343236 Merged-In: I9d086a199de0017aa425219d20882211423925e0 Change-Id: I9d086a199de0017aa425219d20882211423925e0
2020-06-24[automerger skipped] Import translations. DO NOT MERGE am: e8c06ffbf4 -s oursBill Yi
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/11978142 Change-Id: I12de798e923d1ebba59484e95ff7a8ea6c1b013a
2020-06-24Jarjar com.google.protobufRemi NGUYEN VAN
This avoids potential conflicts if the library is also added to the bootclasspath. com.google.protobuf is pulled as a dependency when adding protobuffers, like those used for data stall, IP provisioning and validation metrics. Bug: 159587267 Test: m; manual: booted, wifi working Change-Id: I3339e47c1ca1cd8b0186da0dbf880eff245b4c67
2020-06-23Import translations. DO NOT MERGEBill Yi
Auto-generated-cl: translation import Change-Id: I7c206a514811f63ed975aa068e8696464837a99f
2020-06-23[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev ↵TreeHugger Robot
am: c7d725bbf5 -s ours am: 142cac669b -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/11964997 Change-Id: Ie2090a0f9312efa0e0ddeb30da6b670268a01892
2020-06-23[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev ↵TreeHugger Robot
am: c7d725bbf5 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/11964997 Change-Id: I763ab2c2912c127b2e126f663b42e645187225ad
2020-06-23Merge "Import translations. DO NOT MERGE" into rvc-devTreeHugger Robot
2020-06-23Import translations. DO NOT MERGEBill Yi
Auto-generated-cl: translation import Change-Id: Id55f05d5114f9f76b53f9363c4578333dbbf26d4
2020-06-23Fix the mStopTimeNs not be reset in Stopwatch#Restart am: 0c423089f7 am: ↵Frank Li
7f626e3b43 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/11931260 Change-Id: I80ebe27bcbcdfc51fc7ec910e48705e2ce5d4f5b
2020-06-23Fix the mStopTimeNs not be reset in Stopwatch#Restart am: 0c423089f7Frank Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/11931260 Change-Id: I80f0e311be8b2199090b7e7cd17e8b4641babe8e
2020-06-23Fix the mStopTimeNs not be reset in Stopwatch#RestartFrank Li
Bug: 151796056 Test: atest NetworkStackIntegrationTests NetworkStackTests Test: atest FrameworksNetTests Test: Manual test with statsd_testdrive Original-Change: https://android-review.googlesource.com/1343438 Merged-In: Ib83ceb70af3491dacbb4a45f65ef38661ae75e32 Change-Id: Ib83ceb70af3491dacbb4a45f65ef38661ae75e32
2020-06-23Merge "Injecting network ip provision stats into statsd" into rvc-dev am: ↵Remi NGUYEN VAN
f61f0a785f am: 00c2dd8e26 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/11910086 Change-Id: I8bb69b8511ffb617684794a475716f0bde5240df
2020-06-23Merge "Injecting network ip provision stats into statsd" into rvc-dev am: ↵Remi NGUYEN VAN
f61f0a785f Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/11910086 Change-Id: I6f847068e8a544678b6cbea109436ebf9c5b7978
2020-06-23Merge "Injecting network ip provision stats into statsd" into rvc-devRemi NGUYEN VAN
2020-06-23Injecting network ip provision stats into statsdlifr
1. Fill in each field of the NetworkIpProvisioningReported 2. Write the NetworkIpProvisioningReported into statsd Bug: 151796056 Test: atest NetworkStackIntegrationTests NetworkStackTests Test: atest FrameworksNetTests Test: Manual test with statsd_testdrive Original-Change: https://android-review.googlesource.com/1313574 Merged-In: If4bc6af1b794a8620a08858d6cfd85e661865bd7 Change-Id: If4bc6af1b794a8620a08858d6cfd85e661865bd7
2020-06-22Merge "Test DataStallStatsUtils.write" into rvc-dev am: 59e4621953 am: ↵Chiachang Wang
40bbbc2661 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/11902478 Change-Id: I3bcb7d8f1feeb9f43e8f0346441fca5ca33d400b
2020-06-22Merge "Test DataStallStatsUtils.write" into rvc-dev am: 59e4621953Chiachang Wang
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/11902478 Change-Id: I1245701b2b1d841afe3d90cefada60963ce06ee5
2020-06-22Merge "Test DataStallStatsUtils.write" into rvc-devChiachang Wang
2020-06-19Retry networkAddInterface on EBUSY errorCode am: 9163b2a5ce am: 201b9e7396Treehugger Robot
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/11910087 Change-Id: Icab43aa7f9852371a2b39d309421bc5d36505718
2020-06-19Retry networkAddInterface on EBUSY errorCode am: 9163b2a5ceTreehugger Robot
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/11910087 Change-Id: If45954c86175de659d76a861daff77d3ead51020
2020-06-19Retry networkAddInterface on EBUSY errorCodeTreehugger Robot
If wifi and softAp shared with same interface and switching from wifi to sotAp, there is race that tethering fail to set LCAL_NETID to softAp interface because ConnectivityService do not release wifi netid from that interface yet. Bug: 158269544 Test: atest TetheringCoverageTests atest NetworkStackTests Merged-In: I1dcf0a64190106820a93854b2eb53040341a97e6 Change-Id: I1dcf0a64190106820a93854b2eb53040341a97e6
2020-06-19Merge "Move Inet[4]AddressUtils to libs/net" into rvc-dev am: f071714309 am: ↵Remi NGUYEN VAN
4b97bd9c11 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/11849339 Change-Id: I3dae34fc5897ecc8c460957439eadc90342095c2
2020-06-19Merge "Move Inet[4]AddressUtils to libs/net" into rvc-dev am: f071714309Remi NGUYEN VAN
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/11849339 Change-Id: Ia4b1bf5764bf157e6181ef1481856219a9cfcb2f
2020-06-19Merge "Move Inet[4]AddressUtils to libs/net" into rvc-devRemi NGUYEN VAN
2020-06-18Merge "Jarjar frameworks/libs/net in NetworkStack module" into rvc-dev am: ↵Lorenzo Colitti
def2536afa am: 83a1744ce7 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/11867583 Change-Id: I363cef09ba32fc4cdd737b2e17ee1723a30a0031
2020-06-18Merge "Jarjar frameworks/libs/net in NetworkStack module" into rvc-dev am: ↵Lorenzo Colitti
def2536afa Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/11867583 Change-Id: I8ac2c9dc6b392e9f5bad0fb5bb8cbc93fd5cdd11
2020-06-18Merge "Jarjar frameworks/libs/net in NetworkStack module" into rvc-devLorenzo Colitti
2020-06-18Merge "Transition to appropriate state after all left addresses have been ↵Lorenzo Colitti
cleared." into rvc-dev am: fdbc41a222 am: cb04ddcfdc Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/11902482 Change-Id: I484c9996a4c683db193fba7785f2e62e5192ae64
2020-06-18Merge "Fix the potential NPE when calling IPMS API and ExecutionException is ↵TreeHugger Robot
thrown." into rvc-dev am: f6d4760cd5 am: 95f08e0ff9 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/11882394 Change-Id: Id1c0f16e33f0d512a71358478d9f40ee872c4569
2020-06-18Merge "Transition to appropriate state after all left addresses have been ↵Lorenzo Colitti
cleared." into rvc-dev am: fdbc41a222 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/11902482 Change-Id: I74a8cd23cd7c6ac6c95f31eb5dde82801ecfe8ae
2020-06-18Merge "Transition to appropriate state after all left addresses have been ↵Lorenzo Colitti
cleared." into rvc-dev
2020-06-18Merge "Fix the potential NPE when calling IPMS API and ExecutionException is ↵TreeHugger Robot
thrown." into rvc-dev am: f6d4760cd5 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/11882394 Change-Id: Iec1fe71cac97cdac3ac30e1bdb54e78a39dc6db5
2020-06-18Merge "Fix the potential NPE when calling IPMS API and ExecutionException is ↵TreeHugger Robot
thrown." into rvc-dev
2020-06-18Transition to appropriate state after all left addresses have been cleared.Treehugger Robot
State machine will transit to RunningState directly after clearing all left addresses even if the preconnection flag is enabled, that seems incorrect to skip PreconnectingState. Rely on the preconnection flag to determine which correct state should transit to. Bug: 159109671 Test: atest NetworkStackIntegrationTests NetworkStackTests Merged-In: I3d520a50f26ba7fac804c85c968013b2cb7cab91 Change-Id: I3d520a50f26ba7fac804c85c968013b2cb7cab91
2020-06-18Fix cursor leaks into IPMS database am: e213e2236f am: bb65d68914Chalard Jean
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/11882388 Change-Id: Ib9cda6d91be8322d5855b57a3e1ba96dad214dfd
2020-06-18Fix cursor leaks into IPMS database am: e213e2236fChalard Jean
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/11882388 Change-Id: Ib3791a36f2b7ca50ff817a369ce17ef55d057443
2020-06-17Test DataStallStatsUtils.writeTreehugger Robot
Bug: 159103861 Test: atest NetworkStackTests NetworkStackNextTests Merged-In: Idee17aa4ab83a89dab6decb274c74cbf24240bc1 Change-Id: Idee17aa4ab83a89dab6decb274c74cbf24240bc1
2020-06-17Fix the potential NPE when calling IPMS API and ExecutionException is thrown.Xiao Ma
Listener callback argument is marked as @Nullable in some APIs, means client isn't interested in learning about return value, in these cases should check if it's null or not before using this callback. Bug: 147922038 Test: atest NetworkStackTests FrameworksNetTests Merged-In: Ib46624c76c2c1e50c73ccfbb295a0e90e6fa1c88 Change-Id: Ib46624c76c2c1e50c73ccfbb295a0e90e6fa1c88
2020-06-17Fix cursor leaks into IPMS databaseChalard Jean
It's depressing we missed so many of these Bug: 158629419 Test: IpMemoryStoreTest IpMemoryStoreServiceTest Original-Change: https://android-review.googlesource.com/1332173 Merged-In: Ic4e0d8b1c8483b4e254bca95d2bf30e5ed203b23 Change-Id: Ic4e0d8b1c8483b4e254bca95d2bf30e5ed203b23
2020-06-17Jarjar frameworks/libs/net in NetworkStack moduleLuke Huang
Classes in com.android.net.module.util need to be jarjared to the module's own package. These classes are imported by several modules and the framework from frameworks/libs/net. Test: m Bug: 149403767 Change-Id: Id49fdf17fcf48a21455b7fe768ba046b81c51303