Misc native service changes
Bug: None
Test: Build bluetoothtbd
Change-Id: Ie81e023735799a726a5fdd62c443795beaf3eeac
diff --git a/service/common/bluetooth/scan_filter.h b/service/common/bluetooth/scan_filter.h
index d4c87dd..a8c30ee 100644
--- a/service/common/bluetooth/scan_filter.h
+++ b/service/common/bluetooth/scan_filter.h
@@ -49,8 +49,8 @@
// SetServiceUuidWithMask for what this mask does. The raw pointer returned
// from these getters belongs to the ScanFilter object. nullptr will be
// returned if these fields have not been set on this filter.
- UUID* service_uuid() const { return service_uuid_.get(); }
- UUID* service_uuid_mask() const { return service_uuid_mask_.get(); }
+ const UUID* service_uuid() const { return service_uuid_.get(); }
+ const UUID* service_uuid_mask() const { return service_uuid_mask_.get(); }
// Sets the service UUID for this filter.
void SetServiceUuid(const UUID& service_uuid);
diff --git a/service/common/bluetooth/util/atomic_string.h b/service/common/bluetooth/util/atomic_string.h
index e1c2526..68d37ad 100644
--- a/service/common/bluetooth/util/atomic_string.h
+++ b/service/common/bluetooth/util/atomic_string.h
@@ -14,6 +14,8 @@
// limitations under the License.
//
+#pragma once
+
#include <mutex>
#include <string>