From abcdbac2c1bca5d069267ab2b1a0bf1da98bc41f Mon Sep 17 00:00:00 2001
From: Devin Moore <devinmoore@google.com>
Date: Tue, 31 Jan 2023 01:18:41 +0000
Subject: [PATCH] Catch ServiceSpecificException in weaver service

When getting the config, catch ServiceSpeficiException that the HAL may
throw. It's a similar error case to if the HAL simply didn't exist.

Test: na
Bug: 252760591
Change-Id: Idf3ca993b2cc49a56968be6c3f64aebd3cd8d58d
---
 .../android/server/locksettings/SyntheticPasswordManager.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/locksettings/SyntheticPasswordManager.java b/services/core/java/com/android/server/locksettings/SyntheticPasswordManager.java
index cd972dcd461cb..ea000a0b96078 100644
--- a/services/core/java/com/android/server/locksettings/SyntheticPasswordManager.java
+++ b/services/core/java/com/android/server/locksettings/SyntheticPasswordManager.java
@@ -513,7 +513,7 @@ class SyntheticPasswordManager {
         WeaverConfig weaverConfig = null;
         try {
             weaverConfig = weaver.getConfig();
-        } catch (RemoteException e) {
+        } catch (RemoteException | ServiceSpecificException e) {
             Slog.e(TAG, "Failed to get weaver config", e);
         }
         if (weaverConfig == null || weaverConfig.slots <= 0) {