Merge "Add NearbyDeviceParcelable to PresenceDevice conversion in NearbyManager Add empty salt field in callers." into tm-dev
diff --git a/nearby/service/java/com/android/server/nearby/provider/BleBroadcastProvider.java b/nearby/service/java/com/android/server/nearby/provider/BleBroadcastProvider.java
index 3602787..67392ad 100644
--- a/nearby/service/java/com/android/server/nearby/provider/BleBroadcastProvider.java
+++ b/nearby/service/java/com/android/server/nearby/provider/BleBroadcastProvider.java
@@ -25,8 +25,8 @@
import android.os.ParcelUuid;
import com.android.server.nearby.injector.Injector;
-import com.android.server.nearby.presence.PresenceConstants;
+import java.util.UUID;
import java.util.concurrent.Executor;
/**
@@ -69,11 +69,13 @@
.setTxPowerLevel(AdvertiseSettings.ADVERTISE_TX_POWER_MEDIUM)
.setConnectable(true)
.build();
+
+ // TODO(b/230538655) Use empty data until Presence V1 protocol is implemented.
+ ParcelUuid emptyParcelUuid = new ParcelUuid(new UUID(0L, 0L));
+ byte[] emptyAdvertisementPackets = new byte[0];
AdvertiseData advertiseData =
new AdvertiseData.Builder()
- .addServiceData(new ParcelUuid(PresenceConstants.PRESENCE_UUID),
- advertisementPackets).build();
-
+ .addServiceData(emptyParcelUuid, emptyAdvertisementPackets).build();
try {
mBroadcastListener = listener;
bluetoothLeAdvertiser.startAdvertising(settings, advertiseData, this);
diff --git a/tests/cts/net/src/android/net/cts/DnsResolverTest.java b/tests/cts/net/src/android/net/cts/DnsResolverTest.java
index c6fc38f..0c53411 100644
--- a/tests/cts/net/src/android/net/cts/DnsResolverTest.java
+++ b/tests/cts/net/src/android/net/cts/DnsResolverTest.java
@@ -49,6 +49,7 @@
import android.os.Handler;
import android.os.Looper;
import android.platform.test.annotations.AppModeFull;
+import android.provider.Settings;
import android.system.ErrnoException;
import android.util.Log;
@@ -727,6 +728,18 @@
@Test
public void testPrivateDnsBypass() throws InterruptedException {
+ final String dataStallSetting = Settings.Global.getString(mCR,
+ Settings.Global.DATA_STALL_RECOVERY_ON_BAD_NETWORK);
+ Settings.Global.putInt(mCR, Settings.Global.DATA_STALL_RECOVERY_ON_BAD_NETWORK, 0);
+ try {
+ doTestPrivateDnsBypass();
+ } finally {
+ Settings.Global.putString(mCR, Settings.Global.DATA_STALL_RECOVERY_ON_BAD_NETWORK,
+ dataStallSetting);
+ }
+ }
+
+ private void doTestPrivateDnsBypass() throws InterruptedException {
final Network[] testNetworks = getTestableNetworks();
// Set an invalid private DNS server