am 11893001: am 2ee45d66: service: Fix crash in hal/ (ba242b24) · Commits · e / os / android_packages_modules_Bluetooth

system/service/hal/bluetooth_gatt_interface.cpp

+2 −2

Original line number	Diff line number	Diff line
		@@ -194,7 +194,7 @@ class BluetoothGattInterfaceImpl : public BluetoothGattInterface {
		}

		~BluetoothGattInterfaceImpl() override {
		CHECK(hal_iface_);
		if (hal_iface_)
		hal_iface_->cleanup();
		}

+4 −3

Original line number	Diff line number	Diff line
		@@ -150,8 +150,9 @@ class BluetoothInterfaceImpl : public BluetoothInterface {
		}

		~BluetoothInterfaceImpl() override {
		if (hal_iface_)
		hal_iface_->cleanup();
		};
		}

		// BluetoothInterface overrides.
		void AddObserver(Observer* observer) override {
		@@ -179,7 +180,7 @@ class BluetoothInterfaceImpl : public BluetoothInterface {
		const hw_module_t* module;
		int status = hal_util_load_bt_library(&module);
		if (status) {
		LOG(ERROR) << "Failed to load Bluetooth library";
		LOG(ERROR) << "Failed to load Bluetooth library: " << status;
		return false;
		}