Unhide Bluetooth batch APIs. Deprecate BluetoothAdpater scan APIs. (1/2)

Change-Id: Ib0c4ea6c8372a15473269660355fb5ccf4284457

2 files changed, 7 insertions, 7 deletions

diff --git a/core/tests/bluetoothtests/src/android/bluetooth/le/ScanFilterTest.java b/core/tests/bluetoothtests/src/android/bluetooth/le/ScanFilterTest.java
index bf34f1d..e0a3a03 100644
--- a/core/tests/bluetoothtests/src/android/bluetooth/le/ScanFilterTest.java
+++ b/core/tests/bluetoothtests/src/android/bluetooth/le/ScanFilterTest.java
@@ -56,20 +56,20 @@ public class ScanFilterTest extends TestCase {
 
     @SmallTest
     public void testsetNameFilter() {
-        ScanFilter filter = mFilterBuilder.setName("Ped").build();
+        ScanFilter filter = mFilterBuilder.setDeviceName("Ped").build();
         assertTrue("setName filter fails", filter.matches(mScanResult));
 
-        filter = mFilterBuilder.setName("Pem").build();
+        filter = mFilterBuilder.setDeviceName("Pem").build();
         assertFalse("setName filter fails", filter.matches(mScanResult));
 
     }
 
     @SmallTest
     public void testDeviceFilter() {
-        ScanFilter filter = mFilterBuilder.setMacAddress(DEVICE_MAC).build();
+        ScanFilter filter = mFilterBuilder.setDeviceAddress(DEVICE_MAC).build();
         assertTrue("device filter fails", filter.matches(mScanResult));
 
-        filter = mFilterBuilder.setMacAddress("11:22:33:44:55:66").build();
+        filter = mFilterBuilder.setDeviceAddress("11:22:33:44:55:66").build();
         assertFalse("device filter fails", filter.matches(mScanResult));
     }
 
@@ -134,10 +134,10 @@ public class ScanFilterTest extends TestCase {
         ScanFilter filter = mFilterBuilder.build();
         testReadWriteParcelForFilter(filter);
 
-        filter = mFilterBuilder.setName("Ped").build();
+        filter = mFilterBuilder.setDeviceName("Ped").build();
         testReadWriteParcelForFilter(filter);
 
-        filter = mFilterBuilder.setMacAddress("11:22:33:44:55:66").build();
+        filter = mFilterBuilder.setDeviceAddress("11:22:33:44:55:66").build();
         testReadWriteParcelForFilter(filter);
 
         filter = mFilterBuilder.setServiceUuid(
diff --git a/core/tests/bluetoothtests/src/android/bluetooth/le/ScanRecordTest.java b/core/tests/bluetoothtests/src/android/bluetooth/le/ScanRecordTest.java
index cece96b..e259bcc 100644
--- a/core/tests/bluetoothtests/src/android/bluetooth/le/ScanRecordTest.java
+++ b/core/tests/bluetoothtests/src/android/bluetooth/le/ScanRecordTest.java
@@ -51,7 +51,7 @@ public class ScanRecordTest extends TestCase {
         assertTrue(data.getServiceUuids().contains(uuid1));
         assertTrue(data.getServiceUuids().contains(uuid2));
 
-        assertEquals("Ped", data.getLocalName());
+        assertEquals("Ped", data.getDeviceName());
         assertEquals(-20, data.getTxPowerLevel());
 
         assertEquals(224, data.getManufacturerId());