Treehugger Robot
04f8105750
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
2020-10-09 11:51:01 +00:00
Treehugger Robot
a6fa1d584b
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
2020-10-09 11:05:01 +00:00
Treehugger Robot
497eab9a18
Merge "Don't let NAW.mNetworkInfo escape" am: 6e8c64b349
...
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
6e8c64b349
Merge "Don't let NAW.mNetworkInfo escape"
2020-10-09 10:33:47 +00:00
Chalard Jean
c8c06be939
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
96c5807a35
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
2020-10-09 01:26:33 +00:00
Remi NGUYEN VAN
ff1cfa230d
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
2020-10-09 00:52:31 +00:00
Remi NGUYEN VAN
5d47632002
Merge "Move IpUtils to frameworks/libs/net" am: 1ea097fcb2
...
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
1ea097fcb2
Merge "Move IpUtils to frameworks/libs/net"
2020-10-09 00:13:40 +00:00
Paul Hu
076300f4d8
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
2020-10-08 03:03:09 +00:00
Paul Hu
ecf81b9f6f
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
2020-10-08 02:49:43 +00:00
Paul Hu
cc74ac7b8e
Merge "Remove unused ACTION_PACKAGE_ADDED intent." am: eba570a209
...
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
eba570a209
Merge "Remove unused ACTION_PACKAGE_ADDED intent."
2020-10-08 02:05:17 +00:00
Chiachang Wang
40bf5f95e9
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
2020-10-07 10:02:54 +00:00
Chiachang Wang
656901d024
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
2020-10-07 09:50:45 +00:00
Chiachang Wang
37fc16ad0a
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
8cdc2856b7
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
4b81e2399f
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
7e3efdb49c
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
TreeHugger Robot
5f93ab2807
[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
2020-09-26 05:50:40 +00:00
Benedict Wong
05e9b7d98e
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 )
2020-09-25 19:38:39 +00:00
Benedict Wong
a8f5cba0d5
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
2020-09-25 19:19:15 +00:00
Benedict Wong
707f9b2d1e
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
2020-09-25 19:09:27 +00:00
Benedict Wong
38c5012bfa
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
2020-09-25 18:51:19 +00:00
Benedict Wong
abed0e275d
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
2020-09-25 18:30:28 +00:00
Benedict Wong
d8957b5481
Merge "Provide more feedback to Settings when sessions fail"
2020-09-25 17:25:02 +00:00
Benedict Wong
fdebd3d644
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
01851b58ea
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
2020-09-24 04:34:49 +00:00
Junyu Lai
58caa343cb
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
2020-09-24 04:19:43 +00:00
Junyu Lai
4a3701853a
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
2020-09-24 04:03:12 +00:00
Junyu Lai
e1d31ea908
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
2020-09-24 03:04:20 +00:00
Junyu Lai
57b79f463d
Merge "Skip stop if keepalive is already in stopping state"
2020-09-24 02:45:09 +00:00
Bill Yi
93159dd099
[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
2020-09-19 08:02:00 +00:00
Bill Yi
448394b278
[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
2020-09-19 08:01:04 +00:00
Bill Yi
a3d9761208
[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
2020-09-19 07:01:25 +00:00
Bill Yi
70b18ac7e7
[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
2020-09-19 07:00:58 +00:00
Bill Yi
656cfa4b0e
[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
2020-09-19 05:51:33 +00:00
Bill Yi
add0444867
[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
2020-09-19 05:50:36 +00:00
Bill Yi
547ad6e26b
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
2020-09-19 05:25:29 +00:00
Bill Yi
3eb5580591
Merge mainline-release 6664920 to master - DO NOT MERGE am: d1631c4bda
...
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
71ff1397a9
Merge "Merge mainline-release 6664920 to master - DO NOT MERGE"
2020-09-18 18:47:48 +00:00
Bill Yi
d1631c4bda
Merge mainline-release 6664920 to master - DO NOT MERGE
...
Merged-In: Id04ea331831e8b26ba99478848392b40a92548d5
Change-Id: I888da0c9475f2d00602d917d2f58169f8d7c93a4
2020-09-17 21:56:59 -07:00
junyulai
e30a5c2730
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
c6ec9fb2c2
Merge "Remove a useless method" am: 8523dd4e8b am: 4806612bef am: d4ce551094 am: e1615d27e4
...
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
e1615d27e4
Merge "Remove a useless method" am: 8523dd4e8b am: 4806612bef am: d4ce551094
...
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
d4ce551094
Merge "Remove a useless method" am: 8523dd4e8b am: 4806612bef
...
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
4806612bef
Merge "Remove a useless method" am: 8523dd4e8b
...
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
8523dd4e8b
Merge "Remove a useless method"
2020-09-16 05:58:01 +00:00
Chalard Jean
8eaf3a9a60
Remove a useless method
...
No seriously ?
Test: builds
Change-Id: Ie1508ce50a39e4c69a4b238067bab1e83ddaf019
2020-09-15 16:18:56 +09:00
Jeff Sharkey
cce3906d82
Merge changes from topic "sep11" am: 17b739a5f7 am: 94d8d5e4ce am: 4e9a12f773 am: 5d45f311b1
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1426195
Change-Id: I79488866c538bf9e76d0a6429e30262978f6fdab
2020-09-15 00:13:08 +00:00