LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,509 Commits 2 Branches 0 Tags
ff1c289d6ce38a5fd76bf5ba1fda99a55a2fe2c8
Commit Graph

11509 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jeff Sharkey
d9f660006e Merge changes from topic "sep11" am: 9cf5f56268 am: e684d1e089 am: 2b4b4814ae 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1426195

Change-Id: I9b79dbf3e9983523db11599d8ae289b05aabf80c
 2020-09-14 23:42:34 +00:00
Jeff Sharkey
2b4b4814ae Merge changes from topic "sep11" am: 9cf5f56268 am: e684d1e089 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1426195

Change-Id: I7da537200efe31e803234bd1a0236843064186c8
 2020-09-14 23:10:42 +00:00
Jeff Sharkey
e684d1e089 Merge changes from topic "sep11" am: 9cf5f56268 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1426195

Change-Id: I4fd71573b4301e5473d44517a72d73858b3928c8
 2020-09-14 22:36:51 +00:00
Bill Yi
85080c242a [automerger skipped] Merge "Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master am: c09a299d85 -s ours am: 976aab00c0 -s ours am: c2ccd90ab0 -s ours 
am skip reason: Change-Id I8f9b41ca6388fdeeda287e7919ef05e56f9da1a6 with SHA-1 f72a5498af is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12577741

Change-Id: I36d5555b5fa23140e4916f568353af25b579c653
 2020-09-14 22:20:16 +00:00
Jeff Sharkey
9cf5f56268 Merge changes from topic "sep11" 
* changes:
  Update language to comply with Android's inclusive language guidance
  Update language to comply with Android's inclusive language guidance
  Update language to comply with Android's inclusive language guidance
  Update language to comply with Android's inclusive language guidance
  Update language to comply with Android's inclusive language guidance
  Update language to comply with Android's inclusive language guidance
  Update language to comply with Android's inclusive language guidance
  Update language to comply with Android's inclusive language guidance
 2020-09-14 21:52:13 +00:00
Bill Yi
c2ccd90ab0 [automerger skipped] Merge "Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master am: c09a299d85 -s ours am: 976aab00c0 -s ours 
am skip reason: Change-Id I8f9b41ca6388fdeeda287e7919ef05e56f9da1a6 with SHA-1 f72a5498af is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12577741

Change-Id: I0fe501d77d176eb43d9e308e7fe3e01c579f22bb
 2020-09-14 21:50:56 +00:00
Bill Yi
976aab00c0 [automerger skipped] Merge "Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master am: c09a299d85 -s ours 
am skip reason: Change-Id I8f9b41ca6388fdeeda287e7919ef05e56f9da1a6 with SHA-1 f72a5498af is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12577741

Change-Id: I9b5e1a916081cb266eaca328b86506481e938c7f
 2020-09-14 21:18:54 +00:00
Jeff Sharkey
39f8e97c7a Update language to comply with Android's inclusive language guidance 
See https://source.android.com/setup/contribute/respectful-code for reference

Test: none
Bug: 168334533
Exempt-From-Owner-Approval: docs updates
Change-Id: If75259aab72329f9f8b0e1972a96370ca5134e2c
 2020-09-14 10:00:10 -06:00
Jeff Sharkey
4610b32762 Update language to comply with Android's inclusive language guidance 
See https://source.android.com/setup/contribute/respectful-code for reference

Test: none
Bug: 168334533
Exempt-From-Owner-Approval: docs updates
Change-Id: I53003332717baf57dc088b2f6b969cdb1863f65e
 2020-09-14 09:59:01 -06:00
Bill Yi
c09a299d85 Merge "Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master 2020-09-14 05:33:38 +00:00
Junyu Lai
de97f2238c Merge "Handle lockdown VPN reset intent in ConnectivityService" am: 68bbf71c37 am: 8ea944d77a am: baedafcc46 am: 83189041e9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1413614

Change-Id: I7c535b32844f00eef3ad2f4454557f92c3d1befc
 2020-09-14 05:24:27 +00:00
Junyu Lai
83189041e9 Merge "Handle lockdown VPN reset intent in ConnectivityService" am: 68bbf71c37 am: 8ea944d77a am: baedafcc46 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1413614

Change-Id: I907b35a02c0957ae57f55ae960df1ff5fce0be8e
 2020-09-14 05:02:21 +00:00
Junyu Lai
baedafcc46 Merge "Handle lockdown VPN reset intent in ConnectivityService" am: 68bbf71c37 am: 8ea944d77a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1413614

Change-Id: I4eb9d53d1136ba6e4b9e1fdb884e0920567db2f7
 2020-09-14 04:26:15 +00:00
Junyu Lai
68bbf71c37 Merge "Handle lockdown VPN reset intent in ConnectivityService" 2020-09-14 03:14:51 +00:00
Bill Yi
f4d3e6c8ba Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE 
Merged-In: I8f9b41ca6388fdeeda287e7919ef05e56f9da1a6
Change-Id: If78e130888b8d4653ef128d747e18cc46844d732
 2020-09-13 07:58:42 -07:00
Xin Li
30c708b4e7 [automerger skipped] Merge "Merge Android R" am: 8ac6741e47 -s ours am: b9db5b54f6 -s ours am: 4d279942b4 -s ours am: 59b852af39 -s ours 
am skip reason: Change-Id Ice3e441cc9c0df8d0a6acc016bb74375e081bd67 with SHA-1 ec82033d3e is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1422395

Change-Id: I47087cabc2093c6de6116f11f660aa624dcb260e
 2020-09-11 03:58:59 +00:00
junyulai
d91e70589d Handle lockdown VPN reset intent in ConnectivityService 
Currently, LockdownVpnTracker handles lockdown VPN reset intent.
Which will grab VPN object as a lock, then calls into
ConnectivityService to grab mVpn lock when querying NetworkInfo.
However, the order of grabing locks differs from ConnectivityService
and will causes deadlock if ConnectivityService grabs locks in
the other order.

Thus, make ConnectivityService handles reset intent so the
order of grabing locks can be consistent.

Test: atest FrameworksNetTests
Bug: 147403549
Change-Id: Ia10a3ef6f1e20d092a17313935083a84860961aa
 2020-09-11 11:43:51 +08:00
Xin Li
59b852af39 [automerger skipped] Merge "Merge Android R" am: 8ac6741e47 -s ours am: b9db5b54f6 -s ours am: 4d279942b4 -s ours 
am skip reason: Change-Id Ice3e441cc9c0df8d0a6acc016bb74375e081bd67 with SHA-1 ec82033d3e is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1422395

Change-Id: Idcd3d30dddc7818975b50aee1b253e37608a3eae
 2020-09-11 03:33:28 +00:00
Xin Li
4d279942b4 [automerger skipped] Merge "Merge Android R" am: 8ac6741e47 -s ours am: b9db5b54f6 -s ours 
am skip reason: Change-Id Ice3e441cc9c0df8d0a6acc016bb74375e081bd67 with SHA-1 ec82033d3e is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1422395

Change-Id: Ie915db11679ce05f5d37815028015f61ffb1a4a6
 2020-09-11 02:02:37 +00:00
Xin Li
a3e6d6bb64 Merge Android R 
Bug: 168057903
Merged-In: Ice3e441cc9c0df8d0a6acc016bb74375e081bd67
Change-Id: I1d85742f594be2007c99841b290e502b6ede624e
 2020-09-09 20:21:10 -07:00
Automerger Merge Worker
e5dc57c221 Merge "[automerger skipped] Merge "[CS] Add an option to block sensitive network specifier" into pi-dev am: 9c70259e2b -s ours am: 7eb675f03d -s ours am: f39a6803e1 -s ours am: 7e3ce21887 -s ours am: 589e62d691 -s ours" into rvc-d1-dev-plus-aosp am: 7c49a8c13c -s ours 
am skip reason: Change-Id If08d312ff814bdde1147518f923199e6349503d5 with SHA-1 107ae95001 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12321778

Change-Id: Iad1bd8cd64ea6b3385f8bc09815d48ad45f9b0b6
 2020-09-10 02:15:24 +00:00
TreeHugger Robot
b3a7e0b716 [automerger skipped] Merge "[CS] Add an option to block sensitive network specifier" into pi-dev am: 9c70259e2b -s ours am: 7eb675f03d -s ours am: f39a6803e1 -s ours am: 7e3ce21887 -s ours am: 81ea02a2a5 -s ours am: a7d58822e9 -s ours 
am skip reason: Change-Id If08d312ff814bdde1147518f923199e6349503d5 with SHA-1 107ae95001 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12321778

Change-Id: I42ade8a77e5402fa362d5dc92c278de22776cfda
 2020-09-10 02:14:51 +00:00
Automerger Merge Worker
7c49a8c13c Merge "[automerger skipped] Merge "[CS] Add an option to block sensitive network specifier" into pi-dev am: 9c70259e2b -s ours am: 7eb675f03d -s ours am: f39a6803e1 -s ours am: 7e3ce21887 -s ours am: 589e62d691 -s ours" into rvc-d1-dev-plus-aosp 2020-09-10 01:59:35 +00:00
TreeHugger Robot
a7d58822e9 [automerger skipped] Merge "[CS] Add an option to block sensitive network specifier" into pi-dev am: 9c70259e2b -s ours am: 7eb675f03d -s ours am: f39a6803e1 -s ours am: 7e3ce21887 -s ours am: 81ea02a2a5 -s ours 
am skip reason: Change-Id If08d312ff814bdde1147518f923199e6349503d5 with SHA-1 107ae95001 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12321778

Change-Id: I235447b402e1c2d2706eeab87e1be4de5bb4db4f
 2020-09-10 01:59:24 +00:00
TreeHugger Robot
aea8e5b8e5 [automerger skipped] Merge "[CS] Add an option to block sensitive network specifier" into pi-dev am: 9c70259e2b -s ours am: 7eb675f03d -s ours am: f39a6803e1 -s ours am: 7e3ce21887 -s ours am: 589e62d691 -s ours 
am skip reason: Change-Id If08d312ff814bdde1147518f923199e6349503d5 with SHA-1 107ae95001 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12321778

Change-Id: Ice0925112fbe3503ca968dd0ae397a89f8c520f9
 2020-09-10 01:59:15 +00:00