Merge logging and types build targets

Both "types" and "logging" build targets included "logging.h"
Merging them together avoids circular dependencies.

PiperOrigin-RevId: 549247026

connections/BUILD

@@ -35,7 +35,6 @@ cc_library(
         "//internal/analytics:event_logger",
         "//internal/interop:device",
         "//internal/platform:base",
-        "//internal/platform:logging",
         "//internal/platform:types",
         "@com_google_absl//absl/strings",
         "@com_google_absl//absl/time",
@@ -102,7 +101,6 @@ cc_test(
         "//connections/implementation:internal_test",
         "//connections/v3:v3_types",
         "//internal/platform:base",
-        "//internal/platform:logging",
         "//internal/platform:types",
         "//internal/platform/implementation/g3",  # build_cleaner: keep
         "@com_github_protobuf_matchers//protobuf-matchers",

connections/c/BUILD

@@ -119,7 +119,7 @@ cc_test(
     ],
     deps = [
         "//connections:core",
-        "//internal/platform:logging",
+        "//internal/platform:types",
         "//internal/platform/implementation/windows",
         "@com_github_protobuf_matchers//protobuf-matchers",
         "@com_google_googletest//:gtest_main",

connections/implementation/BUILD

@@ -126,7 +126,6 @@ cc_library(
         "//internal/platform:comm",
         "//internal/platform:connection_info",
         "//internal/platform:error_code_recorder",
-        "//internal/platform:logging",
         "//internal/platform:types",
         "//internal/platform:util",
         "//internal/platform/implementation:comm",
@@ -236,7 +235,6 @@ cc_test(
         "//internal/interop:device",
         "//internal/platform:base",
         "//internal/platform:comm",
-        "//internal/platform:logging",
         "//internal/platform:test_util",
         "//internal/platform:types",
         "//internal/platform/implementation/g3",  # build_cleaner: keep

connections/implementation/analytics/BUILD

@@ -31,7 +31,6 @@ cc_library(
         "//connections:core_types",
         "//internal/analytics:event_logger",
         "//internal/platform:error_code_recorder",
-        "//internal/platform:logging",
         "//internal/platform:types",
         "//internal/platform/implementation:types",
         "//internal/proto/analytics:connections_log_cc_proto",
@@ -61,7 +60,6 @@ cc_test(
         "//internal/platform:base",
         "//internal/platform:comm",
         "//internal/platform:error_code_recorder",
-        "//internal/platform:logging",
         "//internal/platform:types",
         "//internal/platform/implementation/g3",  # build_cleaner: keep
         "//internal/proto/analytics:connections_log_cc_proto",

connections/implementation/client_proxy.cc

@@ -318,8 +318,11 @@ void ClientProxy::OnEndpointFound(
   MutexLock lock(&mutex_);
 
   NEARBY_LOGS(INFO) << "ClientProxy [Endpoint Found]: [enter] id="
-                    << endpoint_id << "; service=" << service_id << "; info="
-                    << absl::BytesToHexString(endpoint_info.data());
+                    << endpoint_id << "; service=" << service_id
+                    << "; info=" << absl::BytesToHexString(endpoint_info.data())
+                    << "; medium="
+                    << location::nearby::proto::connections::Medium_Name(
+                           medium);
   if (!IsDiscoveringServiceId(service_id)) {
     NEARBY_LOGS(INFO) << "ClientProxy [Endpoint Found]: Ignoring event for id="
                       << endpoint_id

connections/implementation/mediums/BUILD

@@ -55,7 +55,6 @@ cc_library(
         "//internal/platform:base",
         "//internal/platform:cancellation_flag",
         "//internal/platform:comm",
-        "//internal/platform:logging",
         "//internal/platform:types",
         "//internal/platform:uuid",
         "//proto/mediums:web_rtc_signaling_frames_cc_proto",

connections/implementation/mediums/ble_v2/BUILD

@@ -45,7 +45,6 @@ cc_library(
         "//internal/flags:nearby_flags",
         "//internal/platform:base",
         "//internal/platform:comm",
-        "//internal/platform:logging",
         "//internal/platform:types",
         "//internal/platform:util",
         "//internal/platform:uuid",

connections/implementation/mediums/webrtc/BUILD

@@ -39,7 +39,6 @@ cc_library(
         "//connections/implementation/mediums:utils",
         "//internal/platform:base",
         "//internal/platform:comm",
-        "//internal/platform:logging",
         "//internal/platform:types",
         "//proto/mediums:web_rtc_signaling_frames_cc_proto",
         # TODO: Support WebRTC

connections/status.cc

@@ -53,6 +53,12 @@ std::string Status::ToString() const {
       return "kWifiLanError";
     case Status::kPayloadUnknown:
       return "kPayloadUnknown";
+    case Status::kReset:
+      return "kReset";
+    case Status::kTimeout:
+      return "kTimeout";
+    case Status::kUnknown:
+      // fall through
     default:
       return "Unknown";
   }

connections/status.h

@@ -22,7 +22,7 @@ namespace connections {
 
 // Protocol operation result: kSuccess, if operation was successful;
 // descriptive error code otherwise.
-// LINT.IfChange
+// LINT.IfChange(status_enum)
 struct Status {
   // Status is a struct, so it is possible to pass some context about failure,
   // by adding extra fields to it when necessary, and not change any of the
@@ -44,6 +44,9 @@ struct Status {
     kBleError,
     kWifiLanError,
     kPayloadUnknown,
+    kReset,
+    kTimeout,
+    kUnknown,
     kNextValue,
   };
   Value value{kError};
@@ -53,9 +56,9 @@ struct Status {
   std::string ToString() const;
 };
 // LINT.ThenChange(
-//   //depot/google3/location/nearby/cpp/sharing/implementation/nearby_connections_manager.cc:24
-//   //depot/google3/location/nearby/cpp/sharing/implementation/nearby_connections_types.h:46
-//   //depot/google3/location/nearby/cpp/sharing/implementation/nearby_connections_types_test.cc
+//     ../sharing/nearby_connections_manager.cc:status_enum,
+//     ../sharing/nearby_connections_types.h:status_enum,
+//     ../sharing/nearby_connections_types_test.cc:status_enum
 // )
 
 inline bool operator==(const Status& a, const Status& b) {

connections/swift/NearbyCoreAdapter/Sources/GNCCoreAdapter.mm

@@ -87,6 +87,12 @@ GNCStatus GNCStatusFromCppStatus(Status status) {
       return GNCStatusWifiLanError;
     case Status::kPayloadUnknown:
       return GNCStatusPayloadUnknown;
+    case Status::kReset:
+      return GNCStatusReset;
+    case Status::kTimeout:
+      return GNCStatusTimeout;
+    case Status::kUnknown:
+      return GNCStatusUnknown;
     case Status::kNextValue:
       return GNCStatusUnknown;
   }

connections/swift/NearbyCoreAdapter/Sources/GNCError.mm

@@ -65,6 +65,12 @@
       return [NSError errorWithDomain:GNCErrorDomain code:GNCErrorWifiLanError userInfo:nil];
     case Status::kPayloadUnknown:
       return [NSError errorWithDomain:GNCErrorDomain code:GNCErrorPayloadUnknown userInfo:nil];
+    case Status::kReset:
+      return [NSError errorWithDomain:GNCErrorDomain code:GNCErrorReset userInfo:nil];
+    case Status::kTimeout:
+      return [NSError errorWithDomain:GNCErrorDomain code:GNCErrorTimeout userInfo:nil];
+    case Status::kUnknown:
+      return [NSError errorWithDomain:GNCErrorDomain code:GNCErrorUnknown userInfo:nil];
     case Status::kNextValue:
       return [NSError errorWithDomain:GNCErrorDomain code:GNCErrorUnknown userInfo:nil];
   }

connections/swift/NearbyCoreAdapter/Sources/Public/NearbyCoreAdapter/GNCConnectionDelegate.h

@@ -35,6 +35,8 @@ typedef NS_CLOSED_ENUM(NSInteger, GNCStatus) {
   GNCStatusWifiLanError,
   GNCStatusPayloadUnknown,
   GNCStatusUnknown,
+  GNCStatusReset,
+  GNCStatusTimeout,
 };
 
 /**

connections/swift/NearbyCoreAdapter/Sources/Public/NearbyCoreAdapter/GNCError.h

@@ -38,4 +38,6 @@ typedef NS_ERROR_ENUM(GNCErrorDomain, GNCErrorCode){
     GNCErrorBleError,
     GNCErrorWifiLanError,
     GNCErrorPayloadUnknown,
+    GNCErrorReset,
+    GNCErrorTimeout,
 } NS_SWIFT_NAME(NearbyError);

fastpair/BUILD

@@ -134,7 +134,6 @@ cc_test(
         "//fastpair/plugins:fake_fast_pair_plugin",
         "//internal/account:test_support",
         "//internal/network:types",
-        "//internal/platform:logging",
         "//internal/platform:test_util",
         "//internal/platform:types",
         "//internal/platform/implementation/g3",  # build_cleaner: keep

fastpair/common/BUILD

@@ -33,7 +33,7 @@ cc_library(
     deps = [
         "//fastpair/proto:fastpair_cc_proto",
         "//internal/crypto_cros",
-        "//internal/platform:logging",
+        "//internal/platform:types",
         "//internal/preferences",
         "@com_google_absl//absl/base:core_headers",
         "@com_google_absl//absl/container:flat_hash_map",

fastpair/crypto/BUILD

@@ -21,7 +21,7 @@ cc_library(
         "//fastpair/common",
         "//internal/base:bluetooth_address",
         "//internal/platform:base",
-        "//internal/platform:logging",
+        "//internal/platform:types",
         "@boringssl//:crypto",
         "@com_google_absl//absl/log:check",
     ],

fastpair/dataparser/BUILD

@@ -17,7 +17,7 @@ cc_library(
         "//fastpair/crypto",
         "//internal/base:bluetooth_address",
         "//internal/platform:base",
-        "//internal/platform:logging",
+        "//internal/platform:types",
         "@com_google_absl//absl/functional:any_invocable",
         "@com_google_absl//absl/strings",
     ],

fastpair/handshake/BUILD

@@ -43,7 +43,6 @@ cc_library(
         "//fastpair/repository",
         "//internal/base:bluetooth_address",
         "//internal/platform:comm",
-        "//internal/platform:logging",
         "//internal/platform:types",
         "//internal/platform:uuid",
         "@boringssl//:crypto",
@@ -89,7 +88,6 @@ cc_test(
         "//fastpair/internal/mediums",
         "//fastpair/repository:test_support",
         "//fastpair/testing",
-        "//internal/platform:logging",
         "//internal/platform:types",
         "//internal/platform/implementation/g3",  # build_cleaner: keep
         "@com_github_protobuf_matchers//protobuf-matchers",
@@ -164,7 +162,6 @@ cc_test(
         ":handshake",
         "//fastpair/common",
         "//fastpair/internal/mediums",
-        "//internal/platform:logging",
         "//internal/platform:test_util",
         "//internal/platform:types",
         "//internal/platform/implementation/g3",  # build_cleaner: keep

fastpair/internal/BUILD

@@ -14,6 +14,7 @@ cc_library(
         "//fastpair:fast_pair_controller",
         "//fastpair:fast_pair_events",
         "//fastpair:fast_pair_seeker",
+        "//fastpair/common",
         "//fastpair/internal/mediums",
         "//fastpair/pairing",
         "//fastpair/repository",
@@ -39,14 +40,18 @@ cc_test(
         "//fastpair/common",
         "//fastpair/message_stream:fake_gatt_callbacks",
         "//fastpair/message_stream:fake_provider",
+        "//fastpair/proto:fastpair_cc_proto",
+        "//fastpair/repository",
+        "//fastpair/repository:device_repository",
         "//fastpair/repository:test_support",
         "//internal/account:test_support",
         "//internal/platform:test_util",
         "//internal/platform:types",
         "//internal/platform/implementation/g3",  # build_cleaner: keep
         "//internal/test/google3_only:test",
         "@com_github_protobuf_matchers//protobuf-matchers",
-        "@com_google_absl//absl/time",
+        "@com_google_absl//absl/status",
+        "@com_google_absl//absl/strings",
         "@com_google_googletest//:gtest_main",
     ],
 )

fastpair/internal/fast_pair_seeker_impl.cc

@@ -21,11 +21,13 @@
 
 #include "absl/status/status.h"
 #include "absl/strings/str_format.h"
+#include "fastpair/common/account_key.h"
 #include "fastpair/fast_pair_controller.h"
 #include "fastpair/fast_pair_events.h"
 #include "fastpair/pairing/pairer_broker_impl.h"
 #include "fastpair/scanning/scanner_broker_impl.h"
 #include "internal/platform/count_down_latch.h"
+#include "internal/platform/logging.h"
 #include "internal/platform/pending_job_registry.h"
 #include "internal/platform/single_thread_executor.h"
 
@@ -303,5 +305,23 @@ void FastPairSeekerImpl::OnRetroactivePairFound(FastPairDevice& device) {
   callbacks_.on_pair_event(device, PairEvent{.is_paired = true});
 }
 
+void FastPairSeekerImpl::ForgetDeviceByAccountKey(
+    const AccountKey& account_key) {
+  NEARBY_LOGS(VERBOSE) << __func__;
+  auto opt_device = devices_->FindDevice(account_key);
+  if (!opt_device.has_value()) {
+    NEARBY_LOGS(INFO) << __func__ << "No FP device matching the account key.";
+  } else {
+    devices_->RemoveDevice(opt_device.value());
+  }
+
+  repository_->DeleteAssociatedDeviceByAccountKey(
+      account_key, [&](absl::Status success) {
+        if (!success.ok()) return;
+        NEARBY_LOGS(VERBOSE) << "Deleted associated devcie by account key";
+        // Temporary solution to refresh the saved_devices_sheet.
+        repository_->GetUserSavedDevices();
+      });
+}
 }  // namespace fastpair
 }  // namespace nearby

fastpair/internal/fast_pair_seeker_impl.h

@@ -43,6 +43,7 @@ class FastPairSeekerExt : public FastPairSeeker {
 
   // Handle the state changes of screen lock.
   virtual void SetIsScreenLocked(bool is_locked) = 0;
+  virtual void ForgetDeviceByAccountKey(const AccountKey& account_key) = 0;
 };
 
 class FastPairSeekerImpl : public FastPairSeekerExt,
@@ -91,6 +92,7 @@ class FastPairSeekerImpl : public FastPairSeekerExt,
   absl::Status StartFastPairScan() override;
   absl::Status StopFastPairScan() override;
   void SetIsScreenLocked(bool is_locked) override;
+  void ForgetDeviceByAccountKey(const AccountKey& account_key) override;
 
   // From BluetoothClassicMedium::Observer.
   void DeviceAdded(BluetoothDevice& device) override;