From 9feca638d4b194c0d7dc3806cd0e155c6e5e8bff Mon Sep 17 00:00:00 2001
From: Quang Luong <qal@google.com>
Date: Tue, 26 Feb 2019 17:28:58 -0800
Subject: [PATCH] Handled exeption in forget() for
 removePasspointConfiguration()

Added a catch for the call to removePasspointConfiguration().

Bug: 70393078
Test: atest WifiSettingsTest
Change-Id: If0213006f3fe42c50657bc2dde89a8dce4cff2b6
---
 src/com/android/settings/wifi/WifiSettings.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index 27c495ed3db..c00fe249308 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -1116,7 +1116,12 @@ public class WifiSettings extends RestrictedSettingsFragment
                 return;
             }
         } else if (mSelectedAccessPoint.getConfig().isPasspoint()) {
-            mWifiManager.removePasspointConfiguration(mSelectedAccessPoint.getConfig().FQDN);
+            try {
+                mWifiManager.removePasspointConfiguration(mSelectedAccessPoint.getConfig().FQDN);
+            } catch (IllegalArgumentException e) {
+                Log.e(TAG, "Failed to remove Passpoint configuration with error: " + e);
+                return;
+            }
         } else {
             mWifiManager.forget(mSelectedAccessPoint.getConfig().networkId, mForgetListener);
         }