diff options
| author | Hansen Kurli <hkurli@google.com> | 2023-11-08 15:20:51 +0800 |
|---|---|---|
| committer | Hansen Kurli <hkurli@google.com> | 2023-11-08 20:39:00 +0800 |
| commit | eea7c3c8d522529d7c3ec663f21728e3862ca7db (patch) | |
| tree | 211a4155c9f55fdbcd5768577d494a669e7b852c | |
| parent | e8df63f148e9d4dd85f7879170f1487c1f7ffbac (diff) | |
| download | Settings-eea7c3c8d522529d7c3ec663f21728e3862ca7db.tar.gz | |
Catch UnsupportedOperationException of startLegacyVpn
startLegacyVpn may throw UnsupportedOperationException. Instead
of crashing Settings, catch the exception and show a Toast.
Bug: 161776767
Test: Manual test, connect legacy vpn profile and observe Toast.
Change-Id: I5947f2043aa68478f659b34531202f225eab4568
| -rw-r--r-- | src/com/android/settings/vpn2/ConfigDialogFragment.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/com/android/settings/vpn2/ConfigDialogFragment.java b/src/com/android/settings/vpn2/ConfigDialogFragment.java index b8825fed6b8..e38f92a28ce 100644 --- a/src/com/android/settings/vpn2/ConfigDialogFragment.java +++ b/src/com/android/settings/vpn2/ConfigDialogFragment.java @@ -207,6 +207,10 @@ public class ConfigDialogFragment extends InstrumentedDialogFragment implements mService.startLegacyVpn(profile); } catch (IllegalStateException e) { Toast.makeText(mContext, R.string.vpn_no_network, Toast.LENGTH_LONG).show(); + } catch (UnsupportedOperationException e) { + Log.e(TAG, "Attempted to start an unsupported VPN type."); + Toast.makeText(mContext, R.string.vpn_insecure_dialog_subtitle, Toast.LENGTH_LONG) + .show(); } } } |