From 1035e1c4fed0eba4456b0d3e0238a26dea028063 Mon Sep 17 00:00:00 2001
From: Ivan Dlugos <dlugos.ivan@gmail.com>
Date: Fri, 11 Nov 2022 18:55:52 +0100
Subject: [PATCH] fix: don't sent device name if DefaultPII is disabled

closes #2063
---
 CONTRIBUTING.md                                             | 2 +-
 .../sentry/android/core/DefaultAndroidEventProcessor.java   | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 1dff57ad251..8a21647bcce 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -5,7 +5,7 @@ We suggest opening an issue to discuss bigger changes before investing on a big
 
 # Requirements
 
-The project currently requires you run JDK 11.
+The project currently requires you run JDK 17.
 
 ## Android
 
diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/DefaultAndroidEventProcessor.java b/sentry-android-core/src/main/java/io/sentry/android/core/DefaultAndroidEventProcessor.java
index 0159f02ff17..ff3d8957e09 100644
--- a/sentry-android-core/src/main/java/io/sentry/android/core/DefaultAndroidEventProcessor.java
+++ b/sentry-android-core/src/main/java/io/sentry/android/core/DefaultAndroidEventProcessor.java
@@ -94,7 +94,7 @@ public DefaultAndroidEventProcessor(
 
     ExecutorService executorService = Executors.newSingleThreadExecutor();
     // dont ref. to method reference, theres a bug on it
-    contextData = executorService.submit(() -> loadContextData());
+    contextData = executorService.submit(this::loadContextData);
 
     executorService.shutdown();
   }
@@ -282,7 +282,9 @@ private void setArchitectures(final @NotNull Device device) {
     // TODO: missing usable memory
 
     Device device = new Device();
-    device.setName(getDeviceName());
+    if (!options.isSendDefaultPii()) {
+      device.setName(getDeviceName());
+    }
     device.setManufacturer(Build.MANUFACTURER);
     device.setBrand(Build.BRAND);
     device.setFamily(getFamily());