commit a2b80663543ac839bce37e8bc3865edd6fb2a501
author Xinyi Zhou <zxy@google.com> Wed Dec 13 19:51:46 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Dec 13 19:51:46 2023 +0000
tree 301699170f583a14e2211c2ef9da4d749090b3d1
parent 07e425cd0b311d86c02e59785a74213f78a5da3f
parent f83d4df182c853b1718e22ba8ee3b8201f49d8e6

Merge changes from topic "cherrypicker-L22800030000756195:N75200030012855151" into main

* changes:
  [nearby] Add nearby_enable_ble_in_init flag
  Revert "[nearby] Add disable logic"
  [nearby] Add disable logic
  [nearby] Log changes
  [nearby] Sync discoveryTimestamp field name
  [nearby] Enable BLE when init
  [nearby] Add logs to broadcaster
  [nearby] Add discoveryTimestamp field
  [nearby] Fix flakeness in the unit test
  [nearby][clean up] Remove useless legacy code
  [nearby] Fix the user-debug only test
  [nearby] Catches NPE in ChreDiscoveryProvider
  [nearby] Update README to add build env script