TreeHugger Robot
e9320762f1
Merge "Merge ab/6749736 in stage." into stage-aosp-master
2020-10-13 03:31:35 +00:00
Junyu Lai
db624043d5
Merge "Support dynamically update IMSI" am: 59f6e81b10
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1418348
Change-Id: Id06d5d37ad5f12e689643c916548e9a59089eb3b
2020-10-13 03:22:09 +00:00
Junyu Lai
59f6e81b10
Merge "Support dynamically update IMSI"
2020-10-13 02:41:47 +00:00
junyulai
430e11a9f0
Support dynamically update IMSI
...
Currently, NetworkStatsSubscriptionsMonitor will skip the
listener registration until the IMSI is available to deal
with SIM PIN locked case. However, this solution can only
handle the case that IMSI changes from/to null. And it also
relies on the assumption that IMSI never changes for a subId.
Thus, support dynamically update IMSI to handle IMSI changes
more robustly.
This patch also address leftover comments at ag/12400327.
Test: enable SIM PIN and manually test
Test: atest NetworkStatsSubscriptionsMonitorTest#testSubscriberIdUnavailable
Test: atest NetworkStatsSubscriptionsMonitorTest#testSubscriberIdChanged
Test: ./out/host/linux-x86/bin/statsd_testdrive 10082
Bug: 160941101
Change-Id: I625a5b10ee4806f6fee99c2d9d6c5e7977ff785e
2020-10-12 15:31:02 +08:00
Lorenzo Colitti
37c995db19
Merge "Speculatively fix L2TP keepalive issues by reducing mtu" am: 7ade6140ea
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1399646
Change-Id: Iac7fc24c531db663469df1b1161d9f85a4c6f3ee
2020-10-12 01:06:47 +00:00
Lorenzo Colitti
7ade6140ea
Merge "Speculatively fix L2TP keepalive issues by reducing mtu"
2020-10-12 00:40:44 +00:00
Xin Li
896aec2ca3
Merge ab/6749736 in stage.
...
Bug: 167233921
Merged-In: Iecef31f7bf10ad97b7e0075cf302ae94e248474a
Change-Id: I9e9c873bc2e05a0cfe3af0bf74725500f3f108db
2020-10-10 20:38:57 -07:00
Treehugger Robot
f7db76b506
Merge "Don't let NAW.mNetworkInfo escape" am: 4fb14d85ce
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1455976
Change-Id: I01ef40f341c653a524ee4565c3d9bf2564e0f98f
2020-10-09 10:48:42 +00:00
Treehugger Robot
4fb14d85ce
Merge "Don't let NAW.mNetworkInfo escape"
2020-10-09 10:33:47 +00:00
Chalard Jean
ae98b5f35f
Don't let NAW.mNetworkInfo escape
...
Thankfully this has no users.
This agent needs to be migrated to the modern API for
NetworkAgent, which does not have NetworkInfo at all
so this would be a hindrance
Test: FrameworksNetTests NetworkStackTests
Change-Id: I091a6ca8cdf18860f23832ae1008fa02cf0472e8
2020-10-09 17:06:30 +09:00
Remi NGUYEN VAN
7abe3e15e8
Merge "Move IpUtils to frameworks/libs/net" am: 39b995b2e1
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1440234
Change-Id: Ibd41a02a9a185667a7fe332213ef692c4d8bf515
2020-10-09 00:30:36 +00:00
Remi NGUYEN VAN
39b995b2e1
Merge "Move IpUtils to frameworks/libs/net"
2020-10-09 00:13:40 +00:00
Paul Hu
9cb49e226b
Merge "Remove unused ACTION_PACKAGE_ADDED intent." am: 19ef22905d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1450335
Change-Id: I53a20a48053889357e62f29799e091d22a3ffc59
2020-10-08 02:19:12 +00:00
Paul Hu
19ef22905d
Merge "Remove unused ACTION_PACKAGE_ADDED intent."
2020-10-08 02:05:17 +00:00
Chiachang Wang
b110236ee5
Merge "Update to positive logic to better match the method naming" am: 1c7bc039ea
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1450336
Change-Id: Ib01ae19fb846fdd75cf792e85dc1776a4a6876ee
2020-10-07 09:22:49 +00:00
Chiachang Wang
974fc87852
Update to positive logic to better match the method naming
...
The method checkInterfacePresent seems that should return if the
interface is present or not, but it actually return an opposite
result. It may confuse the caller. E.g. The override method in
VpnTest assume it always returns true in the test. It will fail
the vpn start flow due to interface gone.
Bug: 169215213
Test: atest FrameworksNetTess
Change-Id: I3e9a64f0900336b8205674b94db68f090b4e9ff9
2020-10-07 06:48:15 +00:00
paulhu
00cd326271
Remove unused ACTION_PACKAGE_ADDED intent.
...
ConnectivityService doesn't handle ACTION_PACKAGE_ADDED intent
now. So remove the intent from filter to prevent wtf log
happened.
Bug: 169573829
Test: atest FrameworksNetTests
Change-Id: Ifb0ae0b2e811defdecb37d3489ab3208db397331
2020-10-06 14:48:29 +08:00
Remi NGUYEN VAN
7f3a7512b5
Move IpUtils to frameworks/libs/net
...
The utility classes are useful for mainline modules and their tests, for
example IpClientIntegrationTest.
Bug: 168868607
Test: m && atest NetworkStaticLibTests
Change-Id: If2b1613aa18a7990391e2d31cc2951ca93f1cf3c
2020-10-05 14:38:19 +09:00
Benedict Wong
7d5baee37f
Speculatively fix L2TP keepalive issues by reducing mtu
...
This change reduces MTU/MRU values for racoon/pppd from 1400 to 1388 in
an attempt to fix keepalive issues experienced in the field.
Bug: 119076193
Test: Speculative change, original issues were not reproducible.
Change-Id: I7731503260fdc8bcbc6c5fcda6991ead6fb7c52e
2020-09-28 20:55:55 -07:00
TreeHugger Robot
02b5f8eb32
[automerger skipped] Merge "Provide more feedback to Settings when sessions fail" into rvc-qpr-dev am: 9fbb751935 -s ours
...
am skip reason: Change-Id I2e8c6f421d2898f97b0ac422b2276edf9ef923f1 with SHA-1 20f3d02a1a is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12701448
Change-Id: Iff4190dde59508f35ae1b5b7d0ac982bc6e137e2
2020-09-26 05:50:40 +00:00
Benedict Wong
6cdf2a4ab6
Provide more feedback to Settings when sessions fail
...
This change updates the VPN state when IKEv2 sessions fail, and when
configuration errors occur.
Bug: 162289824
Test: Manual testing with IKEv2/PSK
Change-Id: I2e8c6f421d2898f97b0ac422b2276edf9ef923f1
Merged-In: I2e8c6f421d2898f97b0ac422b2276edf9ef923f1
(cherry picked from commit 0be82d4f4cb215e05ca62df80f6a9e652d1d1aa9)
2020-09-25 19:38:39 +00:00
Benedict Wong
bce4b65659
Merge "Provide more feedback to Settings when sessions fail" am: 6194869dfb am: 00a8a719cf am: 2be0c9dfc0 am: 346c22fece
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1399645
Change-Id: I3c39f3ad1394ffab3cb37c4c73a1e3914e957a47
2020-09-25 19:19:15 +00:00
Benedict Wong
346c22fece
Merge "Provide more feedback to Settings when sessions fail" am: 6194869dfb am: 00a8a719cf am: 2be0c9dfc0
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1399645
Change-Id: Ibe4fcec14650e38f40bf916f46960585a5af548c
2020-09-25 19:09:27 +00:00
Benedict Wong
2be0c9dfc0
Merge "Provide more feedback to Settings when sessions fail" am: 6194869dfb am: 00a8a719cf
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1399645
Change-Id: Ifd27daeac7a9852fe1f00fbbdcf3c60faf385ce4
2020-09-25 18:51:19 +00:00
Benedict Wong
00a8a719cf
Merge "Provide more feedback to Settings when sessions fail" am: 6194869dfb
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1399645
Change-Id: Ide2b6fc5954b703df96e954062dcde58d8551dbf
2020-09-25 18:30:28 +00:00
Benedict Wong
6194869dfb
Merge "Provide more feedback to Settings when sessions fail"
2020-09-25 17:25:02 +00:00
Benedict Wong
20f3d02a1a
Provide more feedback to Settings when sessions fail
...
This change updates the VPN state when IKEv2 sessions fail, and when
configuration errors occur.
Bug: 162289824
Test: Manual testing with IKEv2/PSK
Change-Id: I2e8c6f421d2898f97b0ac422b2276edf9ef923f1
2020-09-24 23:32:09 -07:00
Junyu Lai
11084f9d25
Merge "Skip stop if keepalive is already in stopping state" am: 719a65577d am: 077f2edd0d am: 709c386524 am: fd274ba713
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1424190
Change-Id: I9c7dc3cd59394d0d7bab8efeec08fa066f468927
2020-09-24 04:34:49 +00:00
Junyu Lai
fd274ba713
Merge "Skip stop if keepalive is already in stopping state" am: 719a65577d am: 077f2edd0d am: 709c386524
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1424190
Change-Id: I0d55c6f7e876a786cbe7f301d0caecbe6456af36
2020-09-24 04:19:43 +00:00
Junyu Lai
709c386524
Merge "Skip stop if keepalive is already in stopping state" am: 719a65577d am: 077f2edd0d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1424190
Change-Id: I31a6290db41be9f003646067e76c7ed901ade7ae
2020-09-24 04:03:12 +00:00
Junyu Lai
077f2edd0d
Merge "Skip stop if keepalive is already in stopping state" am: 719a65577d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1424190
Change-Id: I44f945f1804938819506dab56063d2706b27fcfd
2020-09-24 03:04:20 +00:00
Junyu Lai
719a65577d
Merge "Skip stop if keepalive is already in stopping state"
2020-09-24 02:45:09 +00:00
Bill Yi
6fd4703c21
[automerger skipped] Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: 5e81d0d348 am: 62b5cc5dd0 -s ours am: 98318fb25e -s ours am: 399b1982be -s ours
...
am skip reason: Change-Id Id04ea331831e8b26ba99478848392b40a92548d5 with SHA-1 c54ab73ef9 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1431515
Change-Id: I908bcb9330b0e2cf00374276e1d8e5fa3fc67fab
2020-09-19 08:02:00 +00:00
Bill Yi
1f9f75b75f
[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: 8469743b49 am: 987f8eb664 -s ours am: 02da648e8a -s ours am: 33956d2199 -s ours
...
am skip reason: Change-Id Id04ea331831e8b26ba99478848392b40a92548d5 with SHA-1 c54ab73ef9 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1431515
Change-Id: I53f6598e1a8f06322ee1ec7f5c5979d2ab01c05b
2020-09-19 08:01:04 +00:00
Bill Yi
399b1982be
[automerger skipped] Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: 5e81d0d348 am: 62b5cc5dd0 -s ours am: 98318fb25e -s ours
...
am skip reason: Change-Id Id04ea331831e8b26ba99478848392b40a92548d5 with SHA-1 c54ab73ef9 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1431515
Change-Id: I18f6dabacb6e272e2d3fdf63a9220afc5572f2d2
2020-09-19 07:01:25 +00:00
Bill Yi
33956d2199
[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: 8469743b49 am: 987f8eb664 -s ours am: 02da648e8a -s ours
...
am skip reason: Change-Id Id04ea331831e8b26ba99478848392b40a92548d5 with SHA-1 c54ab73ef9 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1431515
Change-Id: Ib3e8b5c0678513b5128aaf106c8f8044bed09702
2020-09-19 07:00:58 +00:00
Bill Yi
98318fb25e
[automerger skipped] Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: 5e81d0d348 am: 62b5cc5dd0 -s ours
...
am skip reason: Change-Id Id04ea331831e8b26ba99478848392b40a92548d5 with SHA-1 c54ab73ef9 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1431515
Change-Id: I2ad75dfe2a2109ea63eade0ed3edc40b92149a16
2020-09-19 05:51:33 +00:00
Bill Yi
02da648e8a
[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: 8469743b49 am: 987f8eb664 -s ours
...
am skip reason: Change-Id Id04ea331831e8b26ba99478848392b40a92548d5 with SHA-1 c54ab73ef9 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1431515
Change-Id: I4a14d0f2ef305f4f564e7e38134763a85fd09ad3
2020-09-19 05:50:36 +00:00
Bill Yi
62b5cc5dd0
Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: 5e81d0d348
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1431515
Change-Id: Iaa631aaca21a51d786f59801d317f27ee635c70f
2020-09-19 05:25:29 +00:00
Bill Yi
987f8eb664
Merge mainline-release 6664920 to master - DO NOT MERGE am: 8469743b49
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1431515
Change-Id: Id233d0d39ad2d63ae3e6d6128b631e149f68990e
2020-09-19 05:22:39 +00:00
Bill Yi
5e81d0d348
Merge "Merge mainline-release 6664920 to master - DO NOT MERGE"
2020-09-18 18:47:48 +00:00
Bill Yi
8469743b49
Merge mainline-release 6664920 to master - DO NOT MERGE
...
Merged-In: Id04ea331831e8b26ba99478848392b40a92548d5
Change-Id: I888da0c9475f2d00602d917d2f58169f8d7c93a4
2020-09-17 21:56:59 -07:00
junyulai
65f64a9731
Skip stop if keepalive is already in stopping state
...
In current design, crash has been generated when stop function
has been re-entered to catch unexpected behavior. However,
it is possible to re-enter stop function if the network
disconnection occurs after stopping.
Thus, skip stop if keepalive is already in stopping state.
Test: atest ConnectivityServiceTest#testNattSocketKeepalives \
--rerun-until-failure 60000
Bug: 167332570
Change-Id: Ic7068ad3dc990e957c37b8d87d48ebb6469b101f
2020-09-17 19:51:34 +08:00
Treehugger Robot
5505b28af8
Merge "Remove a useless method" am: 2a22f2d1d0 am: 077001edc1 am: 78d3a61273 am: 4a67ac6061
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1426655
Change-Id: Iead91ab812e0b5aee6ee1fe96c52ebf22fbe4a5e
2020-09-16 08:24:11 +00:00
Treehugger Robot
4a67ac6061
Merge "Remove a useless method" am: 2a22f2d1d0 am: 077001edc1 am: 78d3a61273
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1426655
Change-Id: I0d32f54bf0c10afa33d59292291806a482af159c
2020-09-16 07:46:30 +00:00
Treehugger Robot
78d3a61273
Merge "Remove a useless method" am: 2a22f2d1d0 am: 077001edc1
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1426655
Change-Id: Idbf3ffa12027bbfb3f68ad867f61eebbd54af9f5
2020-09-16 07:17:46 +00:00
Treehugger Robot
077001edc1
Merge "Remove a useless method" am: 2a22f2d1d0
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1426655
Change-Id: I371245204277fa58c986370b503b379e97a0706e
2020-09-16 06:36:15 +00:00
Treehugger Robot
2a22f2d1d0
Merge "Remove a useless method"
2020-09-16 05:58:01 +00:00
Chalard Jean
563aaaba91
Remove a useless method
...
No seriously ?
Test: builds
Change-Id: Ie1508ce50a39e4c69a4b238067bab1e83ddaf019
2020-09-15 16:18:56 +09:00
Jeff Sharkey
9dac25c845
Merge changes from topic "sep11" am: 9cf5f56268 am: e684d1e089 am: 2b4b4814ae am: d9f660006e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1426195
Change-Id: I79488866c538bf9e76d0a6429e30262978f6fdab
2020-09-15 00:13:08 +00:00