Merge "Support dynamically update IMSI" am: 2d74c2e267 am: e981a87c00
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1418348
Change-Id: Ic369f77eb09979e8ed36e4207fe42f293548ba90
Junyu Lai
authored and
Automerger Merge Worker
commited 2020-10-13 03:49:06 +00:00
36b8c1d919
Merge "Merge ab/6749736 in stage." into stage-aosp-master
TreeHugger Robot
authored and
Android (Google) Code Review
commited 2020-10-13 03:31:35 +00:00
009ac78c7b
Merge "Support dynamically update IMSI" am: 2d74c2e267
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1418348
Change-Id: Id06d5d37ad5f12e689643c916548e9a59089eb3b
Junyu Lai
authored and
Automerger Merge Worker
commited 2020-10-13 03:22:09 +00:00
e981a87c00
Merge "Support dynamically update IMSI"
Junyu Lai
authored and
Gerrit Code Review
commited 2020-10-13 02:41:47 +00:00
2d74c2e267
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
junyulai
commited 2020-10-12 15:31:02 +08:00
c822fe5e07
Merge "Speculatively fix L2TP keepalive issues by reducing mtu" am: f67e00b803 am: d3bf9a15a0 am: 23a036cd42
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1399646
Change-Id: I5b11411b87069687d32dede7194f9cd8a232c963
Lorenzo Colitti
authored and
Automerger Merge Worker
commited 2020-10-12 01:34:41 +00:00
e9e92b80ac
Merge "Speculatively fix L2TP keepalive issues by reducing mtu" am: f67e00b803 am: d3bf9a15a0
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1399646
Change-Id: Ie6a7fdb8e1ce035ce145b90645290e7e4777f7e6
Lorenzo Colitti
authored and
Automerger Merge Worker
commited 2020-10-12 01:20:47 +00:00
23a036cd42
Merge "Speculatively fix L2TP keepalive issues by reducing mtu" am: f67e00b803
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1399646
Change-Id: Iac7fc24c531db663469df1b1161d9f85a4c6f3ee
Lorenzo Colitti
authored and
Automerger Merge Worker
commited 2020-10-12 01:06:47 +00:00
d3bf9a15a0
Merge "Speculatively fix L2TP keepalive issues by reducing mtu"
Lorenzo Colitti
authored and
Gerrit Code Review
commited 2020-10-12 00:40:44 +00:00
f67e00b803
Merge ab/6749736 in stage.
...
Bug: 167233921
Merged-In: Iecef31f7bf10ad97b7e0075cf302ae94e248474a
Change-Id: I9e9c873bc2e05a0cfe3af0bf74725500f3f108db
Xin Li
commited 2020-10-10 20:38:57 -07:00
7d27412dad
Merge "Don't let NAW.mNetworkInfo escape" am: 6e8c64b349 am: 497eab9a18 am: a6fa1d584b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1455976
Change-Id: I5811b1c40540123b0d6446f8af7638ce2eac6d99
Treehugger Robot
authored and
Automerger Merge Worker
commited 2020-10-09 11:51:01 +00:00
04f8105750
Merge "Don't let NAW.mNetworkInfo escape" am: 6e8c64b349 am: 497eab9a18
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1455976
Change-Id: I8a9899d9a5d7eba8423cbba99f085174ae383e6a
Treehugger Robot
authored and
Automerger Merge Worker
commited 2020-10-09 11:05:01 +00:00
a6fa1d584b
Merge "Don't let NAW.mNetworkInfo escape" am: 6e8c64b349
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1455976
Change-Id: I01ef40f341c653a524ee4565c3d9bf2564e0f98f
Treehugger Robot
authored and
Automerger Merge Worker
commited 2020-10-09 10:48:42 +00:00
497eab9a18
Merge "Don't let NAW.mNetworkInfo escape"
Treehugger Robot
authored and
Gerrit Code Review
commited 2020-10-09 10:33:47 +00:00
6e8c64b349
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
Chalard Jean
commited 2020-10-09 17:06:30 +09:00
c8c06be939
Merge "Move IpUtils to frameworks/libs/net" am: 1ea097fcb2 am: 5d47632002 am: ff1cfa230d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1440234
Change-Id: Ia364eb033d4ed9ae8db4f27fcfd065065581ae73
Remi NGUYEN VAN
authored and
Automerger Merge Worker
commited 2020-10-09 01:26:33 +00:00
96c5807a35
Merge "Move IpUtils to frameworks/libs/net" am: 1ea097fcb2 am: 5d47632002
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1440234
Change-Id: I03872655d1ef3a7bb436666196ed67bd61601f65
Remi NGUYEN VAN
authored and
Automerger Merge Worker
commited 2020-10-09 00:52:31 +00:00
ff1cfa230d
Merge "Move IpUtils to frameworks/libs/net" am: 1ea097fcb2
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1440234
Change-Id: Ibd41a02a9a185667a7fe332213ef692c4d8bf515
Remi NGUYEN VAN
authored and
Automerger Merge Worker
commited 2020-10-09 00:30:36 +00:00
5d47632002
Merge "Move IpUtils to frameworks/libs/net"
Remi NGUYEN VAN
authored and
Gerrit Code Review
commited 2020-10-09 00:13:40 +00:00
1ea097fcb2
Merge "Remove unused ACTION_PACKAGE_ADDED intent." am: eba570a209 am: cc74ac7b8e am: ecf81b9f6f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1450335
Change-Id: I30b53b8ef22233bf1dec8cb899c217eddbf53fa1
Paul Hu
authored and
Automerger Merge Worker
commited 2020-10-08 03:03:09 +00:00
076300f4d8
Merge "Remove unused ACTION_PACKAGE_ADDED intent." am: eba570a209 am: cc74ac7b8e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1450335
Change-Id: I3330b90cc1bb56b4c0964f47826d607c2f1e907c
Paul Hu
authored and
Automerger Merge Worker
commited 2020-10-08 02:49:43 +00:00
ecf81b9f6f
Merge "Remove unused ACTION_PACKAGE_ADDED intent." am: eba570a209
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1450335
Change-Id: I53a20a48053889357e62f29799e091d22a3ffc59
Paul Hu
authored and
Automerger Merge Worker
commited 2020-10-08 02:19:12 +00:00
cc74ac7b8e
Merge "Remove unused ACTION_PACKAGE_ADDED intent."
Paul Hu
authored and
Gerrit Code Review
commited 2020-10-08 02:05:17 +00:00
eba570a209
Merge "Update to positive logic to better match the method naming" am: 1c7bc039ea am: 37fc16ad0a am: 656901d024
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1450336
Change-Id: I2e1203c0864e04c1e0229ef4a8727a0719a3d139
Chiachang Wang
authored and
Automerger Merge Worker
commited 2020-10-07 10:02:54 +00:00
40bf5f95e9
Merge "Update to positive logic to better match the method naming" am: 1c7bc039ea am: 37fc16ad0a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1450336
Change-Id: I6e823ac8769864d9a1bfd6d675331d4b683da331
Chiachang Wang
authored and
Automerger Merge Worker
commited 2020-10-07 09:50:45 +00:00
656901d024
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
Chiachang Wang
authored and
Automerger Merge Worker
commited 2020-10-07 09:22:49 +00:00
37fc16ad0a
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
Chiachang Wang
commited 2020-10-07 06:48:15 +00:00
8cdc2856b7
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
paulhu
commited 2020-10-06 14:48:29 +08:00
4b81e2399f
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
Remi NGUYEN VAN
commited 2020-10-05 14:38:19 +09:00
7e3efdb49c
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
Benedict Wong
commited 2020-09-28 20:55:55 -07:00
b29fb3654a
[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 fdebd3d644 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12701448
Change-Id: Iff4190dde59508f35ae1b5b7d0ac982bc6e137e2
TreeHugger Robot
authored and
Automerger Merge Worker
commited 2020-09-26 05:50:40 +00:00
5f93ab2807
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 a8f5cba0d5 )
Benedict Wong
commited 2020-09-25 19:38:39 +00:00
05e9b7d98e
Merge "Provide more feedback to Settings when sessions fail" am: d8957b5481 am: abed0e275d am: 38c5012bfa am: 707f9b2d1e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1399645
Change-Id: I3c39f3ad1394ffab3cb37c4c73a1e3914e957a47
Benedict Wong
authored and
Automerger Merge Worker
commited 2020-09-25 19:19:15 +00:00
a8f5cba0d5
Merge "Provide more feedback to Settings when sessions fail" am: d8957b5481 am: abed0e275d am: 38c5012bfa
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1399645
Change-Id: Ibe4fcec14650e38f40bf916f46960585a5af548c
Benedict Wong
authored and
Automerger Merge Worker
commited 2020-09-25 19:09:27 +00:00
707f9b2d1e
Merge "Provide more feedback to Settings when sessions fail" am: d8957b5481 am: abed0e275d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1399645
Change-Id: Ifd27daeac7a9852fe1f00fbbdcf3c60faf385ce4
Benedict Wong
authored and
Automerger Merge Worker
commited 2020-09-25 18:51:19 +00:00
38c5012bfa
Merge "Provide more feedback to Settings when sessions fail" am: d8957b5481
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1399645
Change-Id: Ide2b6fc5954b703df96e954062dcde58d8551dbf
Benedict Wong
authored and
Automerger Merge Worker
commited 2020-09-25 18:30:28 +00:00
abed0e275d
Merge "Provide more feedback to Settings when sessions fail"
Benedict Wong
authored and
Gerrit Code Review
commited 2020-09-25 17:25:02 +00:00
d8957b5481
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
Benedict Wong
commited 2020-09-24 23:32:09 -07:00
fdebd3d644
Merge "Skip stop if keepalive is already in stopping state" am: 57b79f463d am: e1d31ea908 am: 4a3701853a am: 58caa343cb
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1424190
Change-Id: I9c7dc3cd59394d0d7bab8efeec08fa066f468927
Junyu Lai
authored and
Automerger Merge Worker
commited 2020-09-24 04:34:49 +00:00
01851b58ea
Merge "Skip stop if keepalive is already in stopping state" am: 57b79f463d am: e1d31ea908 am: 4a3701853a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1424190
Change-Id: I0d55c6f7e876a786cbe7f301d0caecbe6456af36
Junyu Lai
authored and
Automerger Merge Worker
commited 2020-09-24 04:19:43 +00:00
58caa343cb
Merge "Skip stop if keepalive is already in stopping state" am: 57b79f463d am: e1d31ea908
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1424190
Change-Id: I31a6290db41be9f003646067e76c7ed901ade7ae
Junyu Lai
authored and
Automerger Merge Worker
commited 2020-09-24 04:03:12 +00:00
4a3701853a
Merge "Skip stop if keepalive is already in stopping state" am: 57b79f463d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1424190
Change-Id: I44f945f1804938819506dab56063d2706b27fcfd
Junyu Lai
authored and
Automerger Merge Worker
commited 2020-09-24 03:04:20 +00:00
e1d31ea908
Merge "Skip stop if keepalive is already in stopping state"
Junyu Lai
authored and
Gerrit Code Review
commited 2020-09-24 02:45:09 +00:00
57b79f463d
[automerger skipped] Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: 71ff1397a9 am: 547ad6e26b -s ours am: 656cfa4b0e -s ours am: a3d9761208 -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
Bill Yi
authored and
Automerger Merge Worker
commited 2020-09-19 08:02:00 +00:00
93159dd099
[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: d1631c4bda am: 3eb5580591 -s ours am: add0444867 -s ours am: 70b18ac7e7 -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
Bill Yi
authored and
Automerger Merge Worker
commited 2020-09-19 08:01:04 +00:00
448394b278
[automerger skipped] Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: 71ff1397a9 am: 547ad6e26b -s ours am: 656cfa4b0e -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
Bill Yi
authored and
Automerger Merge Worker
commited 2020-09-19 07:01:25 +00:00
a3d9761208
[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: d1631c4bda am: 3eb5580591 -s ours am: add0444867 -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
Bill Yi
authored and
Automerger Merge Worker
commited 2020-09-19 07:00:58 +00:00
70b18ac7e7
[automerger skipped] Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: 71ff1397a9 am: 547ad6e26b -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
Bill Yi
authored and
Automerger Merge Worker
commited 2020-09-19 05:51:33 +00:00
656cfa4b0e
[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: d1631c4bda am: 3eb5580591 -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
Bill Yi
authored and
Automerger Merge Worker
commited 2020-09-19 05:50:36 +00:00
add0444867
Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: 71ff1397a9
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1431515
Change-Id: Iaa631aaca21a51d786f59801d317f27ee635c70f
Bill Yi
authored and
Automerger Merge Worker
commited 2020-09-19 05:25:29 +00:00
547ad6e26b