From 60a456a0a6fd97696f312cf2b4b16d68b4b208c6 Mon Sep 17 00:00:00 2001
From: Joy Babafemi <jbabs@google.com>
Date: Thu, 28 Oct 2021 18:23:05 +0000
Subject: [PATCH] [DO NOT MERGE] Handle IllegalStateException in APM event
 handling.

(Cherry-picked from sc-qpr branch)

Test: Manual
Bug: 204003158
Bug: 212462949
Change-Id: I8cf2b091b9f323079f54a38dfc9ddfc8af512a43
---
 services/uwb/java/com/android/server/uwb/UwbServiceImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/uwb/java/com/android/server/uwb/UwbServiceImpl.java b/services/uwb/java/com/android/server/uwb/UwbServiceImpl.java
index 70d6aab542a2b..889e182af46b4 100644
--- a/services/uwb/java/com/android/server/uwb/UwbServiceImpl.java
+++ b/services/uwb/java/com/android/server/uwb/UwbServiceImpl.java
@@ -356,7 +356,7 @@ public class UwbServiceImpl extends IUwbAdapter.Stub implements IBinder.DeathRec
     private void handleAirplaneModeEvent() {
         try {
             getVendorUwbAdapter().setEnabled(isEnabled());
-        } catch (RemoteException e) {
+        } catch (RemoteException | IllegalStateException e) {
             Log.e(TAG, "Unable to set UWB Adapter state.", e);
         }
     }