Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 16ccc110 authored by Bailey Forrest's avatar Bailey Forrest Committed by android-build-merger
Browse files

Merge "Misc native service changes" 

am: ea1a1ad9

Change-Id: Iccf1fc5a6acd1c8b4a543658764ba12917bad8b8
parents 48e8a883 ea1a1ad9

system/service/common/bluetooth/scan_filter.h

+2 −2
Original line number Diff line number Diff line
@@ -49,8 +49,8 @@ class ScanFilter { 
  // 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);

system/service/common/bluetooth/util/atomic_string.h

+2 −0
Original line number Diff line number Diff line
@@ -14,6 +14,8 @@ 
//  limitations under the License.

//



#pragma once



#include <mutex>

#include <string>