Commit Graph

499290 Commits

Author SHA1 Message Date
Adrian Roos
a89cdcefab Merge "Restrict getInputMethodWindowVisibleHeight" into rvc-dev am: 31e8959439
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18492305

Change-Id: I24bd536937c9794cc17ec42eeeb047940adbb884
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-08 07:39:21 +00:00
Adrian Roos
31e8959439 Merge "Restrict getInputMethodWindowVisibleHeight" into rvc-dev 2022-06-08 07:20:12 +00:00
Chiachang Wang
96f4ca0fbf Merge "Stop using invalid URL to prevent unexpected crash" into qt-dev am: 3ac8d1dc2f am: dadbab8ae8 am: 14f1bec4c2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18715266

Change-Id: I9910ae29bb623c60b2b8d3794a2f25f673ac4904
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-08 02:41:55 +00:00
Chiachang Wang
14f1bec4c2 Merge "Stop using invalid URL to prevent unexpected crash" into qt-dev am: 3ac8d1dc2f am: dadbab8ae8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18715266

Change-Id: I24a2ceeab11b6b9b9582bb846524ef46eaf8d6ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-08 02:15:59 +00:00
Chiachang Wang
dadbab8ae8 Merge "Stop using invalid URL to prevent unexpected crash" into qt-dev am: 3ac8d1dc2f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18715266

Change-Id: Ia7d1ef07c32c791d71c7bd4561641620aaa66de1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-08 01:58:13 +00:00
Chiachang Wang
3ac8d1dc2f Merge "Stop using invalid URL to prevent unexpected crash" into qt-dev 2022-06-08 01:30:34 +00:00
TreeHugger Robot
ba83a11456 Merge "[RESTRICT AUTOMERGE]Prevent set intent on non-leaf tasks" into rvc-dev am: bf06070af0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18629266

Change-Id: I39db46ddace4cc9dd12a0f025b66bb7e1fe0a23c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 15:14:44 +00:00
Jeff Chang
9c19806351 [RESTRICT AUTOMERGE]Prevent set intent on non-leaf tasks am: c5aaf99df5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18629266

Change-Id: I2eb959c19e5c079c8a4d76501ec5f33d0f754bd2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 15:14:34 +00:00
TreeHugger Robot
bf06070af0 Merge "[RESTRICT AUTOMERGE]Prevent set intent on non-leaf tasks" into rvc-dev 2022-06-06 14:48:49 +00:00
chiachangwang
6d6f410694 Stop using invalid URL to prevent unexpected crash
Verify the input PAC Uri before performing follow-up actions.

Check if the URL is a valid URL to filter some invalid URLs since
these invalid URLs could not fall into any subclass of existing
URLConnections. When the PAC Uri is other invalid URL scheme, it
will cause an UnsupportedOperationException if there is no proper
subclass that implements the openConnection() method.
A malformed URL may crash the system.

Even it's a valid URL, some subclasses(e.g. JarURLConnection)
may not have openConnection() implemented. It will also hit the
problem, so convert the possbile exception from openConnection()
to re-throw it to IOException which is handled in the existing
code.

Bug: 219498290
Test: atest FrameworksNetTests CtsNetTestCases
Test: Test with malformed URL
Merged-In: I22903414380b62051f514e43b93af992f45740b4
Merged-In: I2abff75ec59a17628ef006aad348c53fadbed076
Change-Id: I4d6cec1da9cf3f70dec0dcf4223254d3da4f30a3
(cherry picked from commit 6390b37a3b)
2022-06-06 02:03:41 +00:00
Raphael Kim
b37d5d47da Remove package title from notification access confirmation intent am: 51d47ec7c8 am: c1b4cacc66 am: 963c9f8bc8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18670434

Change-Id: I7b76141852d2314dd8a37d4a4ceb50f169dd8640
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-05 02:50:26 +00:00
Raphael Kim
963c9f8bc8 Remove package title from notification access confirmation intent am: 51d47ec7c8 am: c1b4cacc66
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18670434

Change-Id: I3af28be0359c45814aacf66a6952292894fac72b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-05 02:32:27 +00:00
Raphael Kim
c1b4cacc66 Remove package title from notification access confirmation intent am: 51d47ec7c8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18670434

Change-Id: I4fb8082b1f94c628417c41fd6bd6d1fd4906a12e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-05 02:14:42 +00:00
Raphael Kim
51d47ec7c8 Remove package title from notification access confirmation intent
Bug: 228178437
Test: Manually confirmed on an application
Change-Id: Idad6dc0c71d7b39de0bd9e4ad922b5e6020a6184
Merged-In: Idad6dc0c71d7b39de0bd9e4ad922b5e6020a6184
2022-06-01 22:26:34 +00:00
Wenhao Wang
aa456df74e [automerger skipped] Revert "[conflict] Move service initialization am: 38fe45b539" am: 8bb5e98ecb -s ours am: c543f70e3d -s ours
am skip reason: Merged-In I2f9f9bdba37f4ebfaea56c1a6662f0474ae8a002 with SHA-1 38fe45b539 is already in history. Merged-In was found from reverted change.

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

Change-Id: Id295b15c1e6469ee9f50babb2f4c057d78d67e7f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-30 06:35:00 +00:00
Wenhao Wang
c543f70e3d [automerger skipped] Revert "[conflict] Move service initialization am: 38fe45b539" am: 8bb5e98ecb -s ours
am skip reason: Merged-In I2f9f9bdba37f4ebfaea56c1a6662f0474ae8a002 with SHA-1 38fe45b539 is already in history. Merged-In was found from reverted change.

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

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

Change-Id: I44b0bee5c0ba597407652dd2c1af868adcee724a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-30 06:11:04 +00:00
Wenhao Wang
8bb5e98ecb Revert "[conflict] Move service initialization am: 38fe45b539"
This reverts commit 012cace2ee.

Reason for revert: This CL depends on ag/17823648, which is not merged into qt-qpr1-dev.

Change-Id: I503bcc1e979dd4db941cb7754f63a0dc35ce9682
2022-05-30 05:30:08 +00:00
Julia Reynolds
b50f345f57 [automerger skipped] [conflict] Move service initialization am: 38fe45b539 am: 012cace2ee -s ours am: f3a82a3b59 -s ours
am skip reason: Merged-In I2f9f9bdba37f4ebfaea56c1a6662f0474ae8a002 with SHA-1 caa5a22ea0 is already in history

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

Change-Id: I1f15a3a4dd6fe04321ecda11bb16dc6f2aef175c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-30 04:53:17 +00:00
Julia Reynolds
f3a82a3b59 [automerger skipped] [conflict] Move service initialization am: 38fe45b539 am: 012cace2ee -s ours
am skip reason: Merged-In I2f9f9bdba37f4ebfaea56c1a6662f0474ae8a002 with SHA-1 caa5a22ea0 is already in history

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

Change-Id: I094361ea2d938bd3e7ff77e66f68cf23d8e25ee2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-30 04:05:13 +00:00
Julia Reynolds
012cace2ee [conflict] Move service initialization am: 38fe45b539
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18563202

Change-Id: If27ee7e26bcf2797a6a4a770f2a5064605cdeaa0
Merged-In: I2f9f9bdba37f4ebfaea56c1a6662f0474ae8a002
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27 15:24:30 +00:00
Jeff Chang
c5aaf99df5 [RESTRICT AUTOMERGE]Prevent set intent on non-leaf tasks
The root task was created with null intent, but the intent,
resize mode and other information were updated from child tasks,
which sets the split-screen-secondary root task to unresizable.

This CL is back porting from f666e494af to prevent setting the
split-screen-secondary root task to unresizable.

Bug: 230435065
Bug: 185810717
Test: atest IntentTests
      atest ActivityStarterTests
      atest TaskRecordTests
      atest testSplitscreenPortraitAppOrientationRequests
Change-Id: I856d66371ac121f681958a7129527f18a5357d0f
2022-05-27 04:42:25 +00:00
Julia Reynolds
2ee5edda84 [automerger skipped] Move service initialization am: caa5a22ea0 -s ours
am skip reason: Merged-In I2f9f9bdba37f4ebfaea56c1a6662f0474ae8a002 with SHA-1 14d7f081c8 is already in history

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

Change-Id: I9b3572694f3424ba5da6b52fe06b3c71b23b3efa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-26 18:32:51 +00:00
Julia Reynolds
14d7f081c8 Move service initialization
Occasionally ILockSettings can fail to be initialized otherwise
Fixes: 232714129
Test: boot (and eventually bootstress/reboot-long)

Change-Id: I2f9f9bdba37f4ebfaea56c1a6662f0474ae8a002
Merged-In: I2f9f9bdba37f4ebfaea56c1a6662f0474ae8a002
(cherry picked from commit 8e278543bd)
2022-05-24 23:15:56 +00:00
Julia Reynolds
caa5a22ea0 Move service initialization
Occasionally ILockSettings can fail to be initialized otherwise
Fixes: 232714129
Test: boot (and eventually bootstress/reboot-long)

Change-Id: I2f9f9bdba37f4ebfaea56c1a6662f0474ae8a002
Merged-In: I2f9f9bdba37f4ebfaea56c1a6662f0474ae8a002
(cherry picked from commit 8e278543bd)
2022-05-24 16:14:17 -07:00
Julia Reynolds
38fe45b539 Move service initialization
Occasionally ILockSettings can fail to be initialized otherwise
Fixes: 232714129
Test: boot (and eventually bootstress/reboot-long)

Change-Id: I2f9f9bdba37f4ebfaea56c1a6662f0474ae8a002
Merged-In: I2f9f9bdba37f4ebfaea56c1a6662f0474ae8a002
(cherry picked from commit 8e278543bd)
2022-05-23 16:03:12 -07:00
Adrian Roos
fd7847b533 Restrict getInputMethodWindowVisibleHeight
Make sure only the app currently interacting with the IME can
query this, and restrict the API to apps targeting SDKs before T

Fixes: 204906124
Test: atest 'InputMethodManagerTest#getInputMethodWindowVisibleHeight_returnsZeroIfNotFocused'
Change-Id: If1da19a3dd8c29542afc970b4b201d87547c27a9
Merged-In: If1da19a3dd8c29542afc970b4b201d87547c27a9
2022-05-20 18:11:19 +02:00
Lucas Lin
1f68b323f3 Merge "Clear mInterface before calling resetIkeState()" into rvc-dev am: 7ba3a378c5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18279994

Change-Id: I302b84b9b7fd6bd62dbac6eec2eb37b389a431eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 00:10:36 +00:00
Lucas Lin
7ba3a378c5 Merge "Clear mInterface before calling resetIkeState()" into rvc-dev 2022-05-19 23:46:09 +00:00
TreeHugger Robot
a4bbe303ff [DO NOT MERGE] [conflict] Merge "Make sure callingPackage belongs to callingUid when checking BG-FGS restrictions." into rvc-dev am: a70add46f3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18356706

Change-Id: Ie110b8cfd17e441789f225ca8743d60a65365a92
Merged-In: Ic14fc331a9b5fbdbcfe6e54a31c8b765513bfd89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-18 00:33:45 +00:00
TreeHugger Robot
a70add46f3 Merge "Make sure callingPackage belongs to callingUid when checking BG-FGS restrictions." into rvc-dev 2022-05-17 23:37:35 +00:00
Hui Yu
023509e487 Make sure callingPackage belongs to callingUid when checking BG-FGS restrictions.
This is to stop spoofed packageName to pretend to be allowListed
packageName so it can bypass the BG-FGS restriction. This applies to
both BG-FGS while-in-use restriction and BG-FGS-start restriction
since these two restrictions are related.

Bug: 216695100
Bug: 215003903
Test: atest cts/tests/app/src/android/app/cts/ActivityManagerFgsBgStartTest.java#testSpoofPackageName
Change-Id: Ic14fc331a9b5fbdbcfe6e54a31c8b765513bfd89
Merged-In: Ic14fc331a9b5fbdbcfe6e54a31c8b765513bfd89
BYPASS_INCLUSIVE_LANGUAGE_REASON=Legacy API
2022-05-17 20:16:05 +00:00
Manjeet Rulhania
7aaba89b77 [automerger skipped] Merge "Fix duplicate permission privilege escalation" into qt-dev am: b22a6d7372 am: e545a5dbbf -s ours am: 94c1765004 -s ours
am skip reason: Merged-In I1910dca44104e35a57eba4acfa8188cd9b8626ac with SHA-1 f9a9dc720c is already in history

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

Change-Id: Icad731f56b018936687104b34dec1dc6cd2afda7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 21:14:01 +00:00
Manjeet Rulhania
94c1765004 [automerger skipped] Merge "Fix duplicate permission privilege escalation" into qt-dev am: b22a6d7372 am: e545a5dbbf -s ours
am skip reason: Merged-In I1910dca44104e35a57eba4acfa8188cd9b8626ac with SHA-1 f9a9dc720c is already in history

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

Change-Id: I1889b690d52231c896cdc65983be4febdb6eb984
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16 20:53:20 +00:00
Manjeet Rulhania
e545a5dbbf Merge "Fix duplicate permission privilege escalation" into qt-dev am: b22a6d7372
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18078651

Change-Id: I0e25a20970648244c2a72581478f5a09ac6c10b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Merged-In: I1910dca44104e35a57eba4acfa8188cd9b8626ac
Merged-In: I34120fff2ec2a158dfa55779d2afd4bbd49487ff
Merged-In: I9bc839836786a0876e67fd73c05f8944bb532249
2022-05-16 19:49:21 +00:00
Manjeet Rulhania
b22a6d7372 Merge "Fix duplicate permission privilege escalation" into qt-dev 2022-05-16 16:13:01 +00:00
Manjeet Rulhania
31bd425bb6 Fix duplicate permission privilege escalation
Duplicate permissions definition with different group allows
privilege permission escalation to a different permission group.

Android studio and gradle plugin does not allow duplicate
permissions with different attributes, these tools only allow
if duplicate permissions are exact copies.

Also platform stores permissions in map at multiple places with
permission name as key. This suggests that we can disallow
duplicate permissions during package install/update.

Bug: 213323615
Test: manual
Change-Id: I6f44e740897305e7a0553c1cf6c3af37faf02a2e
Merged-In: I1910dca44104e35a57eba4acfa8188cd9b8626ac
Merged-In: I34120fff2ec2a158dfa55779d2afd4bbd49487ff
Merged-In: I9bc839836786a0876e67fd73c05f8944bb532249
2022-05-16 02:06:24 +00:00
Manjeet Rulhania
f689ec94c6 Merge "Fix duplicate permission privilege escalation" into rvc-dev am: 3624b53d39
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18083515

Change-Id: I64289b97a4277cde614e132aa19a971fd065db97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-15 17:35:31 +00:00
Manjeet Rulhania
3624b53d39 Merge "Fix duplicate permission privilege escalation" into rvc-dev 2022-05-15 16:45:22 +00:00
Manjeet Rulhania
f9a9dc720c Fix duplicate permission privilege escalation
Duplicate permissions definition with different group allows
privilege permission escalation to a different permission group.

Android studio and gradle plugin does not allow duplicate
permissions with different attributes, these tools only allow
if duplicate permissions are exact copies.

Also platform stores permissions in map at multiple places with
permission name as key. This suggests that we can disallow
duplicate permissions during package install/update

Bug: 213323615
Test: AppSecurityTests
Change-Id: I1910dca44104e35a57eba4acfa8188cd9b8626ac
Merged-Id: I34120fff2ec2a158dfa55779d2afd4bbd49487ff
Merged-In: I9bc839836786a0876e67fd73c05f8944bb532249
2022-05-14 03:55:04 +00:00
TreeHugger Robot
dc535c71d1 [automerger skipped] Merge "DO NOT MERGE Crash invalid FGS notifications" into qt-dev am: e7da6dd26e am: 496cbf106c -s ours am: d5d87d85f3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8f5ca43565f031130ea9b50017ff97fcd5a76301
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 21:28:31 +00:00
Julia Reynolds
c822f7cd66 [automerger skipped] DO NOT MERGE Crash invalid FGS notifications am: b6b2906ea6 am: bf6983a9ea -s ours am: cec8c138ed -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0515b68504ea8211a27595c6f2e415df11e033d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 21:28:27 +00:00
TreeHugger Robot
d5d87d85f3 [automerger skipped] Merge "DO NOT MERGE Crash invalid FGS notifications" into qt-dev am: e7da6dd26e am: 496cbf106c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1574511d068f56b8f83f3fda26057ae810fa05fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 21:01:07 +00:00
Julia Reynolds
cec8c138ed [automerger skipped] DO NOT MERGE Crash invalid FGS notifications am: b6b2906ea6 am: bf6983a9ea -s ours
am skip reason: subject contains skip directive

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

Change-Id: Idb3ad174c4cf360df25d1ec78dc1d237acf07981
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 21:00:58 +00:00
TreeHugger Robot
496cbf106c Merge "DO NOT MERGE Crash invalid FGS notifications" into qt-dev am: e7da6dd26e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17864291

Change-Id: Ica995d8951592fa4361a2b5cc617b9ebec076d60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 20:23:49 +00:00
Julia Reynolds
bf6983a9ea DO NOT MERGE Crash invalid FGS notifications am: b6b2906ea6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17864291

Change-Id: I57b968cab49f7d3eef8028ea92d571d5b68489e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 20:23:46 +00:00
TreeHugger Robot
afc2de4708 Merge "Crash invalid FGS notifications" into rvc-dev am: 97fc7b179e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17864680

Change-Id: I6b1808d2494f9b37f60a7fd53af3e5a89af10939
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 20:14:09 +00:00
TreeHugger Robot
e7da6dd26e Merge "DO NOT MERGE Crash invalid FGS notifications" into qt-dev 2022-05-12 19:50:55 +00:00
TreeHugger Robot
e91ae52a85 Merge "Crash invalid FGS notifications" into rvc-qpr-dev 2022-05-12 19:48:54 +00:00
TreeHugger Robot
97fc7b179e Merge "Crash invalid FGS notifications" into rvc-dev 2022-05-12 19:47:14 +00:00
lucaslin
65d44b93bb Clear mInterface before calling resetIkeState()
Clear mInterface before calling resetIkeState() in
onDefaultNetworkChanged().
resetIkeState() will trigger interfaceRemoved() to be called.
If mInterface is set, interfaceRemoved() will clear
Ikev2VpnRunner which makes VPN disconnect.

This issue can be reproduced when device establishes VPN
connection with mobile data first then connects to wifi.
In this case, onLost() for mobile data will not be called
because there is a new network(wifi) can satisfy the request,
so only onAvailable() for wifi will be called.
Which means onSessionLost() will not be called and only
onDefaultNetworkChanged() will be called, which makes that
mInterface is not cleared before interfaceRemoved() is called.

Bug: 219546241
Test: Check if VPN is still there when establishing VPN with
      mobile data first, then connect to wifi and disconnect
      wifi.
Change-Id: I7f9a1d9afd2a40762e9fac68edf1fb8ae75df8bc
(cherry picked from commit 520cc2fde3)
Merged-In: I7f9a1d9afd2a40762e9fac68edf1fb8ae75df8bc
2022-05-10 10:18:56 +00:00