From ca9ace307a9a562bb2d044e759deb30a05becbc3 Mon Sep 17 00:00:00 2001
From: Devin Moore <devinmoore@google.com>
Date: Wed, 20 Apr 2022 22:55:34 +0000
Subject: [PATCH] AudioService: catch RuntimeException for
 IServiceManager.getService

IServiceManager.getService() can throw a RuntimeException and
AudioService can handle that the same way it currently handles the
RemoteException from the same method.

Bug: 218588089
Test: Boot cuttlefish with a fake local ServiceManager with no hwservicemanager
installed.

Change-Id: I5af8a17312a6321fa6b6c20d03392e553d091f8f
---
 services/core/java/com/android/server/audio/AudioService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/audio/AudioService.java b/services/core/java/com/android/server/audio/AudioService.java
index dadf2a4dbc0a8..1cc0443875539 100644
--- a/services/core/java/com/android/server/audio/AudioService.java
+++ b/services/core/java/com/android/server/audio/AudioService.java
@@ -10619,7 +10619,7 @@ public class AudioService extends IAudioService.Stub
                 }
             }
             return pids;
-        } catch (RemoteException e) {
+        } catch (RemoteException | RuntimeException e) {
             return new HashSet<Integer>();
         }
     }