Merge "EncryptionUtil: Handle provider exception"

1 files changed, 3 insertions, 0 deletions

diff --git a/service/java/com/android/server/wifi/util/WifiConfigStoreEncryptionUtil.java b/service/java/com/android/server/wifi/util/WifiConfigStoreEncryptionUtil.java
index ce5a686c4..ded3450c4 100644
--- a/service/java/com/android/server/wifi/util/WifiConfigStoreEncryptionUtil.java
+++ b/service/java/com/android/server/wifi/util/WifiConfigStoreEncryptionUtil.java
@@ -31,6 +31,7 @@ import java.security.KeyStore;
 import java.security.KeyStoreException;
 import java.security.NoSuchAlgorithmException;
 import java.security.NoSuchProviderException;
+import java.security.ProviderException;
 import java.security.UnrecoverableEntryException;
 
 import javax.crypto.BadPaddingException;
@@ -177,6 +178,8 @@ public class WifiConfigStoreEncryptionUtil {
             reportException(e, "getOrCreateSecretKey cannot find crypto provider");
         } catch (UnrecoverableEntryException e) {
             reportException(e, "getOrCreateSecretKey had an unrecoverable entry exception.");
+        } catch (ProviderException e) {
+            reportException(e, "getOrCreateSecretKey had a provider exception.");
         }
         return secretKey;
     }