Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 16fd8987 authored by Hansen Kurli's avatar Hansen Kurli Committed by Automerger Merge Worker
Browse files

Merge "Catch UnsupportedOperationException of startLegacyVpn" into main am: 485e8800 

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2822270



Change-Id: Iba8a2d2cdd2730cc0cdf4e5c851866badbbc06a6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 28eebde9 485e8800

src/com/android/settings/vpn2/ConfigDialogFragment.java

+4 −0
Original line number Diff line number Diff line
@@ -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();

            }

        }

    }