commit | 73781f9c37a8a6e63596b05b41a1807b614f0863 | [log] [tgz] |
---|---|---|
author | Joseph Pirozzo <pirozzoj@google.com> | Thu Mar 19 22:10:30 2020 -0700 |
committer | Joseph Pirozzo <pirozzoj@google.com> | Thu Mar 19 22:12:00 2020 -0700 |
tree | 911425e2a0cf96a4ff440e2b199b8844eda73c78 | |
parent | 98684ecb8b93f25fdeed6a634a105d2f1b9bd31c [diff] |
Handle BluetoothAdapter Null Prevent CarBluetoothService from killing car service in the event that there is no default Bluetooth adapter. Bug: 141396155 Test: boot car emulator Change-Id: Idda6240710ae572bc3715825ded6e9bc3365ee0f Merged-In: Idda6240710ae572bc3715825ded6e9bc3365ee0f
diff --git a/service/src/com/android/car/CarBluetoothService.java b/service/src/com/android/car/CarBluetoothService.java index 54d15a1..92f79ed 100644 --- a/service/src/com/android/car/CarBluetoothService.java +++ b/service/src/com/android/car/CarBluetoothService.java
@@ -222,6 +222,8 @@ } catch (RemoteException e) { Log.e(TAG, "Remote Service Exception on ServiceConnection Callback: " + e.getMessage()); + } catch (java.lang.NullPointerException e) { + Log.e(TAG, "Initialization Failed: " + e.getMessage()); } } }