summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoy Babafemi <jbabs@google.com>2021-10-28 18:23:05 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2021-11-02 13:44:53 +0000
commite90f8647c591632be70ba87675924e4ae82009a1 (patch)
treef95cdd2bfc60a56c614ca2a2e1bce00444080654
parentaf1e71dc54d7a75ac061e57ff11b9cc52b00cf5a (diff)
downloadbase-e90f8647c591632be70ba87675924e4ae82009a1.tar.gz
[DO NOT MERGE] Handle IllegalStateException in APM event handling.
Test: Manual Bug: 204003158 Change-Id: I8cf2b091b9f323079f54a38dfc9ddfc8af512a43 (cherry picked from commit 7bde0926f7259ab96fd2a313101aa4901fb6b29a)
-rw-r--r--services/uwb/java/com/android/server/uwb/UwbServiceImpl.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/uwb/java/com/android/server/uwb/UwbServiceImpl.java b/services/uwb/java/com/android/server/uwb/UwbServiceImpl.java
index 70d6aab542a2..889e182af46b 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);
}
}