From e49454db98e6188ca74947b8c97e6f3143f535c6 Mon Sep 17 00:00:00 2001
From: Hansen Kurli <hkurli@google.com>
Date: Wed, 15 Nov 2023 16:19:11 +0800
Subject: [PATCH] Create a new string to alert unsupported vpn start.

Test: Manual test
Change-Id: Ic32db48671335a59c3bf8b43065cfef7c39c2936
---
 res/values/strings.xml                                  | 5 +++++
 src/com/android/settings/vpn2/ConfigDialogFragment.java | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index d62512274ad..c812ed40816 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -6213,6 +6213,11 @@
 
     <!-- Dialog subtitle warning for a VPN app that has an insecure type. [CHAR LIMIT=100]  -->
     <string name="vpn_insecure_dialog_subtitle">Not secure. Update to an IKEv2 VPN</string>
+    <!-- Dialog message when user attempted to start a VPN type that is no longer supported. It is
+         very unlikely, but not impossible, that a user has a very old VPN configuration that the
+         newer device no longer supports. This message is displayed when the user tries to start
+         this unsupported VPN. [CHAR LIMIT=NONE]  -->
+    <string name="vpn_start_unsupported">Failed to start unsupported VPN.</string>
 
     <!-- Summary describing the always-on VPN feature. [CHAR LIMIT=NONE] -->
     <string name="vpn_lockdown_summary">Select a VPN profile to always remain connected to. Network traffic will only be allowed when connected to this VPN.</string>
diff --git a/src/com/android/settings/vpn2/ConfigDialogFragment.java b/src/com/android/settings/vpn2/ConfigDialogFragment.java
index 860fc4e4567..559003aa4c0 100644
--- a/src/com/android/settings/vpn2/ConfigDialogFragment.java
+++ b/src/com/android/settings/vpn2/ConfigDialogFragment.java
@@ -209,8 +209,8 @@ public class ConfigDialogFragment extends InstrumentedDialogFragment implements
                 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.");
-                final AlertDialog dialog = new AlertDialog.Builder(mContext)
-                        .setMessage(R.string.vpn_insecure_dialog_subtitle)
+                final AlertDialog unusedDialog = new AlertDialog.Builder(mContext)
+                        .setMessage(R.string.vpn_start_unsupported)
                         .setPositiveButton(android.R.string.ok, null)
                         .show();
             }