Address API review comments.

1. Moved le stuff to it's subpackage. Remove BluetoothLe for all classes
except *Scanner, *ScanSetting, *Advertiser and *AdvertiseSettings.
2. Make all callbacks abstract classes instead of interfaces.
3. Moved AdvertisementData and ScanRecord out and removed
AdvertiseBaseData
4. Removed newBuild and use new Builder for all builders.
5. Using setxxx in builders.
6. Misc other changes.

Fixes b/15140940

Change-Id: I32ae3d24a9491baf96048040b5ac78f6f731e468
NO_SQ: multi-project submit

3 files changed, 62 insertions, 59 deletions

diff --git a/core/tests/bluetoothtests/src/android/bluetooth/BluetoothLeScanFilterTest.java b/core/tests/bluetoothtests/src/android/bluetooth/le/ScanFilterTest.java
index ec35d85..bf34f1d 100644
--- a/core/tests/bluetoothtests/src/android/bluetooth/BluetoothLeScanFilterTest.java
+++ b/core/tests/bluetoothtests/src/android/bluetooth/le/ScanFilterTest.java
@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
-package android.bluetooth;
+package android.bluetooth.le;
 
-import android.bluetooth.BluetoothLeScanner.ScanResult;
+import android.bluetooth.BluetoothAdapter;
+import android.bluetooth.BluetoothDevice;
 import android.os.Parcel;
 import android.os.ParcelUuid;
 import android.test.suitebuilder.annotation.SmallTest;
@@ -26,22 +27,21 @@ import junit.framework.TestCase;
 /**
  * Unit test cases for Bluetooth LE scan filters.
  * <p>
- * To run this test, use adb shell am instrument -e class
- * 'android.bluetooth.BluetoothLeScanFilterTest' -w
+ * To run this test, use adb shell am instrument -e class 'android.bluetooth.ScanFilterTest' -w
  * 'com.android.bluetooth.tests/android.bluetooth.BluetoothTestRunner'
  */
-public class BluetoothLeScanFilterTest extends TestCase {
+public class ScanFilterTest extends TestCase {
 
     private static final String DEVICE_MAC = "01:02:03:04:05:AB";
     private ScanResult mScanResult;
-    private BluetoothLeScanFilter.Builder mFilterBuilder;
+    private ScanFilter.Builder mFilterBuilder;
 
     @Override
     protected void setUp() throws Exception {
         byte[] scanRecord = new byte[] {
                 0x02, 0x01, 0x1a, // advertising flags
                 0x05, 0x02, 0x0b, 0x11, 0x0a, 0x11, // 16 bit service uuids
-                0x04, 0x09, 0x50, 0x65, 0x64, // name
+                0x04, 0x09, 0x50, 0x65, 0x64, // setName
                 0x02, 0x0A, (byte) 0xec, // tx power level
                 0x05, 0x16, 0x0b, 0x11, 0x50, 0x64, // service data
                 0x05, (byte) 0xff, (byte) 0xe0, 0x00, 0x02, 0x15, // manufacturer specific data
@@ -51,134 +51,135 @@ public class BluetoothLeScanFilterTest extends TestCase {
         BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();
         BluetoothDevice device = adapter.getRemoteDevice(DEVICE_MAC);
         mScanResult = new ScanResult(device, scanRecord, -10, 1397545200000000L);
-        mFilterBuilder = BluetoothLeScanFilter.newBuilder();
+        mFilterBuilder = new ScanFilter.Builder();
     }
 
     @SmallTest
-    public void testNameFilter() {
-        BluetoothLeScanFilter filter = mFilterBuilder.name("Ped").build();
-        assertTrue("name filter fails", filter.matches(mScanResult));
+    public void testsetNameFilter() {
+        ScanFilter filter = mFilterBuilder.setName("Ped").build();
+        assertTrue("setName filter fails", filter.matches(mScanResult));
 
-        filter = mFilterBuilder.name("Pem").build();
-        assertFalse("name filter fails", filter.matches(mScanResult));
+        filter = mFilterBuilder.setName("Pem").build();
+        assertFalse("setName filter fails", filter.matches(mScanResult));
 
     }
 
     @SmallTest
     public void testDeviceFilter() {
-        BluetoothLeScanFilter filter = mFilterBuilder.macAddress(DEVICE_MAC).build();
+        ScanFilter filter = mFilterBuilder.setMacAddress(DEVICE_MAC).build();
         assertTrue("device filter fails", filter.matches(mScanResult));
 
-        filter = mFilterBuilder.macAddress("11:22:33:44:55:66").build();
+        filter = mFilterBuilder.setMacAddress("11:22:33:44:55:66").build();
         assertFalse("device filter fails", filter.matches(mScanResult));
     }
 
     @SmallTest
-    public void testServiceUuidFilter() {
-        BluetoothLeScanFilter filter = mFilterBuilder.serviceUuid(
+    public void testsetServiceUuidFilter() {
+        ScanFilter filter = mFilterBuilder.setServiceUuid(
                 ParcelUuid.fromString("0000110A-0000-1000-8000-00805F9B34FB")).build();
         assertTrue("uuid filter fails", filter.matches(mScanResult));
 
-        filter = mFilterBuilder.serviceUuid(
+        filter = mFilterBuilder.setServiceUuid(
                 ParcelUuid.fromString("0000110C-0000-1000-8000-00805F9B34FB")).build();
         assertFalse("uuid filter fails", filter.matches(mScanResult));
 
         filter = mFilterBuilder
-                .serviceUuid(ParcelUuid.fromString("0000110C-0000-1000-8000-00805F9B34FB"))
-                .serviceUuidMask(ParcelUuid.fromString("FFFFFFF0-FFFF-FFFF-FFFF-FFFFFFFFFFFF"))
+                .setServiceUuid(ParcelUuid.fromString("0000110C-0000-1000-8000-00805F9B34FB"),
+                        ParcelUuid.fromString("FFFFFFF0-FFFF-FFFF-FFFF-FFFFFFFFFFFF"))
                 .build();
         assertTrue("uuid filter fails", filter.matches(mScanResult));
     }
 
     @SmallTest
-    public void testServiceDataFilter() {
-        byte[] serviceData = new byte[] {
+    public void testsetServiceDataFilter() {
+        byte[] setServiceData = new byte[] {
                 0x0b, 0x11, 0x50, 0x64 };
-        BluetoothLeScanFilter filter = mFilterBuilder.serviceData(serviceData).build();
+        ScanFilter filter = mFilterBuilder.setServiceData(setServiceData).build();
         assertTrue("service data filter fails", filter.matches(mScanResult));
 
         byte[] nonMatchData = new byte[] {
                 0x0b, 0x01, 0x50, 0x64 };
-        filter = mFilterBuilder.serviceData(nonMatchData).build();
+        filter = mFilterBuilder.setServiceData(nonMatchData).build();
         assertFalse("service data filter fails", filter.matches(mScanResult));
 
         byte[] mask = new byte[] {
                 (byte) 0xFF, (byte) 0x00, (byte) 0xFF, (byte) 0xFF };
-        filter = mFilterBuilder.serviceData(nonMatchData).serviceDataMask(mask).build();
+        filter = mFilterBuilder.setServiceData(nonMatchData, mask).build();
         assertTrue("partial service data filter fails", filter.matches(mScanResult));
     }
 
     @SmallTest
     public void testManufacturerSpecificData() {
-        byte[] manufacturerData = new byte[] {
+        byte[] setManufacturerData = new byte[] {
                 (byte) 0xE0, 0x00, 0x02, 0x15 };
         int manufacturerId = 224;
-        BluetoothLeScanFilter filter =
-                mFilterBuilder.manufacturerData(manufacturerId, manufacturerData).build();
-        assertTrue("manufacturerData filter fails", filter.matches(mScanResult));
+        ScanFilter filter =
+                mFilterBuilder.setManufacturerData(manufacturerId, setManufacturerData).build();
+        assertTrue("setManufacturerData filter fails", filter.matches(mScanResult));
 
         byte[] nonMatchData = new byte[] {
                 (byte) 0xF0, 0x00, 0x02, 0x15 };
-        filter = mFilterBuilder.manufacturerData(manufacturerId, nonMatchData).build();
-        assertFalse("manufacturerData filter fails", filter.matches(mScanResult));
+        filter = mFilterBuilder.setManufacturerData(manufacturerId, nonMatchData).build();
+        assertFalse("setManufacturerData filter fails", filter.matches(mScanResult));
 
         byte[] mask = new byte[] {
                 (byte) 0x00, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF
         };
-        filter = mFilterBuilder.manufacturerData(manufacturerId, nonMatchData)
-                .manufacturerDataMask(mask).build();
-        assertTrue("partial manufacturerData filter fails", filter.matches(mScanResult));
+        filter = mFilterBuilder.setManufacturerData(manufacturerId, nonMatchData, mask).build();
+        assertTrue("partial setManufacturerData filter fails", filter.matches(mScanResult));
     }
 
     @SmallTest
     public void testReadWriteParcel() {
-        BluetoothLeScanFilter filter = mFilterBuilder.build();
+        ScanFilter filter = mFilterBuilder.build();
         testReadWriteParcelForFilter(filter);
 
-        filter = mFilterBuilder.name("Ped").build();
+        filter = mFilterBuilder.setName("Ped").build();
         testReadWriteParcelForFilter(filter);
 
-        filter = mFilterBuilder.macAddress("11:22:33:44:55:66").build();
+        filter = mFilterBuilder.setMacAddress("11:22:33:44:55:66").build();
         testReadWriteParcelForFilter(filter);
 
-        filter = mFilterBuilder.serviceUuid(
+        filter = mFilterBuilder.setServiceUuid(
                 ParcelUuid.fromString("0000110C-0000-1000-8000-00805F9B34FB")).build();
         testReadWriteParcelForFilter(filter);
 
-        filter = mFilterBuilder.serviceUuidMask(
+        filter = mFilterBuilder.setServiceUuid(
+                ParcelUuid.fromString("0000110C-0000-1000-8000-00805F9B34FB"),
                 ParcelUuid.fromString("FFFFFFF0-FFFF-FFFF-FFFF-FFFFFFFFFFFF")).build();
         testReadWriteParcelForFilter(filter);
 
-        byte[] serviceData = new byte[] {
+        byte[] setServiceData = new byte[] {
                 0x0b, 0x11, 0x50, 0x64 };
 
-        filter = mFilterBuilder.serviceData(serviceData).build();
+        filter = mFilterBuilder.setServiceData(setServiceData).build();
         testReadWriteParcelForFilter(filter);
 
         byte[] serviceDataMask = new byte[] {
                 (byte) 0xFF, (byte) 0x00, (byte) 0xFF, (byte) 0xFF };
-        filter = mFilterBuilder.serviceDataMask(serviceDataMask).build();
+        filter = mFilterBuilder.setServiceData(setServiceData, serviceDataMask).build();
         testReadWriteParcelForFilter(filter);
 
         byte[] manufacturerData = new byte[] {
                 (byte) 0xE0, 0x00, 0x02, 0x15 };
         int manufacturerId = 224;
-        filter = mFilterBuilder.manufacturerData(manufacturerId, manufacturerData).build();
+        filter = mFilterBuilder.setManufacturerData(manufacturerId, manufacturerData).build();
         testReadWriteParcelForFilter(filter);
 
         byte[] manufacturerDataMask = new byte[] {
                 (byte) 0x00, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF
         };
-        filter = mFilterBuilder.manufacturerDataMask(manufacturerDataMask).build();
+        filter = mFilterBuilder.setManufacturerData(manufacturerId, manufacturerData,
+                manufacturerDataMask).build();
         testReadWriteParcelForFilter(filter);
     }
 
-    private void testReadWriteParcelForFilter(BluetoothLeScanFilter filter) {
+    private void testReadWriteParcelForFilter(ScanFilter filter) {
         Parcel parcel = Parcel.obtain();
         filter.writeToParcel(parcel, 0);
         parcel.setDataPosition(0);
-        BluetoothLeScanFilter filterFromParcel =
-                BluetoothLeScanFilter.CREATOR.createFromParcel(parcel);
+        ScanFilter filterFromParcel =
+                ScanFilter.CREATOR.createFromParcel(parcel);
         System.out.println(filterFromParcel);
         assertEquals(filter, filterFromParcel);
     }
diff --git a/core/tests/bluetoothtests/src/android/bluetooth/BluetoothLeAdvertiseScanDataTest.java b/core/tests/bluetoothtests/src/android/bluetooth/le/ScanRecordTest.java
index eb6c419..cece96b 100644
--- a/core/tests/bluetoothtests/src/android/bluetooth/BluetoothLeAdvertiseScanDataTest.java
+++ b/core/tests/bluetoothtests/src/android/bluetooth/le/ScanRecordTest.java
@@ -14,8 +14,9 @@
  * limitations under the License.
  */
 
-package android.bluetooth;
+package android.bluetooth.le;
 
+import android.bluetooth.le.ScanRecord;
 import android.os.ParcelUuid;
 import android.test.suitebuilder.annotation.SmallTest;
 
@@ -24,13 +25,13 @@ import junit.framework.TestCase;
 import java.util.Arrays;
 
 /**
- * Unit test cases for {@link BluetoothLeAdvertiseScanData}.
+ * Unit test cases for {@link ScanRecord}.
  * <p>
  * To run this test, use adb shell am instrument -e class
- * 'android.bluetooth.BluetoothLeAdvertiseScanDataTest' -w
+ * 'android.bluetooth.ScanRecordTest' -w
  * 'com.android.bluetooth.tests/android.bluetooth.BluetoothTestRunner'
  */
-public class BluetoothLeAdvertiseScanDataTest extends TestCase {
+public class ScanRecordTest extends TestCase {
 
     @SmallTest
     public void testParser() {
@@ -43,8 +44,7 @@ public class BluetoothLeAdvertiseScanDataTest extends TestCase {
                 0x05, (byte) 0xff, (byte) 0xe0, 0x00, 0x02, 0x15, // manufacturer specific data
                 0x03, 0x50, 0x01, 0x02, // an unknown data type won't cause trouble
         };
-        BluetoothLeAdvertiseScanData.ScanRecord data = BluetoothLeAdvertiseScanData.ScanRecord
-                .getParser().parseFromScanRecord(scanRecord);
+        ScanRecord data = ScanRecord.parseFromBytes(scanRecord);
         assertEquals(0x1a, data.getAdvertiseFlags());
         ParcelUuid uuid1 = ParcelUuid.fromString("0000110A-0000-1000-8000-00805F9B34FB");
         ParcelUuid uuid2 = ParcelUuid.fromString("0000110B-0000-1000-8000-00805F9B34FB");
diff --git a/core/tests/bluetoothtests/src/android/bluetooth/BluetoothLeScannerTest.java b/core/tests/bluetoothtests/src/android/bluetooth/le/ScanResultTest.java
index 8064ba8..241e88f 100644
--- a/core/tests/bluetoothtests/src/android/bluetooth/BluetoothLeScannerTest.java
+++ b/core/tests/bluetoothtests/src/android/bluetooth/le/ScanResultTest.java
@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
-package android.bluetooth;
+package android.bluetooth.le;
 
-import android.bluetooth.BluetoothLeScanner.ScanResult;
+import android.bluetooth.BluetoothAdapter;
+import android.bluetooth.BluetoothDevice;
 import android.os.Parcel;
 import android.test.suitebuilder.annotation.SmallTest;
 
@@ -25,17 +26,18 @@ import junit.framework.TestCase;
 /**
  * Unit test cases for Bluetooth LE scans.
  * <p>
- * To run this test, use adb shell am instrument -e class 'android.bluetooth.BluetoothLeScannerTest'
- * -w 'com.android.bluetooth.tests/android.bluetooth.BluetoothTestRunner'
+ * To run this test, use adb shell am instrument -e class 'android.bluetooth.ScanResultTest' -w
+ * 'com.android.bluetooth.tests/android.bluetooth.BluetoothTestRunner'
  */
-public class BluetoothLeScannerTest extends TestCase {
+public class ScanResultTest extends TestCase {
 
     /**
      * Test read and write parcel of ScanResult
      */
     @SmallTest
     public void testScanResultParceling() {
-        BluetoothDevice device = new BluetoothDevice("01:02:03:04:05:06");
+        BluetoothDevice device = BluetoothAdapter.getDefaultAdapter().getRemoteDevice(
+                "01:02:03:04:05:06");
         byte[] scanRecord = new byte[] {
                 1, 2, 3 };
         int rssi = -10;