summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Devin Moore <devinmoore@google.com> 2022-04-20 22:55:34 +0000
committer Devin Moore <devinmoore@google.com> 2022-04-20 22:55:34 +0000
commitca9ace307a9a562bb2d044e759deb30a05becbc3 (patch)
tree82e7d2ad3c6c8cb7c772b4035bf2534e3ab8f67d
parentf92fa673daa1153649d5bf4edb71170d413e2767 (diff)
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
-rw-r--r--services/core/java/com/android/server/audio/AudioService.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/audio/AudioService.java b/services/core/java/com/android/server/audio/AudioService.java
index dadf2a4dbc0a..1cc044387553 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>();
}
}