Loading android/app/src/com/android/bluetooth/gatt/GattService.java +5 −5 Original line number Original line Diff line number Diff line Loading @@ -306,7 +306,7 @@ public class GattService extends ProfileService { service.startScanWithUuids(appIf, isServer, uuids); service.startScanWithUuids(appIf, isServer, uuids); } } public void startScanWithUuidsAndScanWindowInterval(int appIf, boolean isServer, public void startScanWithUuidsScanParam(int appIf, boolean isServer, ParcelUuid[] ids, int scanWindow, int scanInterval) { ParcelUuid[] ids, int scanWindow, int scanInterval) { GattService service = getService(); GattService service = getService(); if (service == null) return; if (service == null) return; Loading @@ -314,7 +314,7 @@ public class GattService extends ProfileService { for(int i = 0; i < ids.length; ++i) { for(int i = 0; i < ids.length; ++i) { uuids[i] = ids[i].getUuid(); uuids[i] = ids[i].getUuid(); } } service.startScanWithUuidsAndScanWindowInterval(appIf, isServer, uuids, service.startScanWithUuidsScanParam(appIf, isServer, uuids, scanWindow, scanInterval); scanWindow, scanInterval); } } Loading Loading @@ -1072,14 +1072,14 @@ public class GattService extends ProfileService { configureScanParams(); configureScanParams(); } } void startScanWithUuidsAndScanWindowInterval(int appIf, boolean isServer, UUID[] uuids, void startScanWithUuidsScanParam(int appIf, boolean isServer, UUID[] uuids, int scanWindow, int scanInterval) { int scanWindow, int scanInterval) { enforceCallingOrSelfPermission(BLUETOOTH_ADMIN_PERM, "Need BLUETOOTH_ADMIN permission"); enforceCallingOrSelfPermission(BLUETOOTH_ADMIN_PERM, "Need BLUETOOTH_ADMIN permission"); if (DBG) Log.d(TAG, "startScanWithWindowAndInterval() - queue=" + mScanQueue.size()); if (DBG) Log.d(TAG, "startScanWithUuidsScanParam() - queue=" + mScanQueue.size()); if (getScanClient(appIf, isServer) == null) { if (getScanClient(appIf, isServer) == null) { if (DBG) Log.d(TAG, "startScanWithWindowAndInterval() - adding client=" + appIf if (DBG) Log.d(TAG, "startScanWithUuidsScanParam() - adding client=" + appIf + " scanWindow=" + scanWindow + " scanInterval=" + scanInterval); + " scanWindow=" + scanWindow + " scanInterval=" + scanInterval); mScanQueue.add(new ScanClient(appIf, isServer, uuids, scanWindow, scanInterval)); mScanQueue.add(new ScanClient(appIf, isServer, uuids, scanWindow, scanInterval)); } } Loading Loading
android/app/src/com/android/bluetooth/gatt/GattService.java +5 −5 Original line number Original line Diff line number Diff line Loading @@ -306,7 +306,7 @@ public class GattService extends ProfileService { service.startScanWithUuids(appIf, isServer, uuids); service.startScanWithUuids(appIf, isServer, uuids); } } public void startScanWithUuidsAndScanWindowInterval(int appIf, boolean isServer, public void startScanWithUuidsScanParam(int appIf, boolean isServer, ParcelUuid[] ids, int scanWindow, int scanInterval) { ParcelUuid[] ids, int scanWindow, int scanInterval) { GattService service = getService(); GattService service = getService(); if (service == null) return; if (service == null) return; Loading @@ -314,7 +314,7 @@ public class GattService extends ProfileService { for(int i = 0; i < ids.length; ++i) { for(int i = 0; i < ids.length; ++i) { uuids[i] = ids[i].getUuid(); uuids[i] = ids[i].getUuid(); } } service.startScanWithUuidsAndScanWindowInterval(appIf, isServer, uuids, service.startScanWithUuidsScanParam(appIf, isServer, uuids, scanWindow, scanInterval); scanWindow, scanInterval); } } Loading Loading @@ -1072,14 +1072,14 @@ public class GattService extends ProfileService { configureScanParams(); configureScanParams(); } } void startScanWithUuidsAndScanWindowInterval(int appIf, boolean isServer, UUID[] uuids, void startScanWithUuidsScanParam(int appIf, boolean isServer, UUID[] uuids, int scanWindow, int scanInterval) { int scanWindow, int scanInterval) { enforceCallingOrSelfPermission(BLUETOOTH_ADMIN_PERM, "Need BLUETOOTH_ADMIN permission"); enforceCallingOrSelfPermission(BLUETOOTH_ADMIN_PERM, "Need BLUETOOTH_ADMIN permission"); if (DBG) Log.d(TAG, "startScanWithWindowAndInterval() - queue=" + mScanQueue.size()); if (DBG) Log.d(TAG, "startScanWithUuidsScanParam() - queue=" + mScanQueue.size()); if (getScanClient(appIf, isServer) == null) { if (getScanClient(appIf, isServer) == null) { if (DBG) Log.d(TAG, "startScanWithWindowAndInterval() - adding client=" + appIf if (DBG) Log.d(TAG, "startScanWithUuidsScanParam() - adding client=" + appIf + " scanWindow=" + scanWindow + " scanInterval=" + scanInterval); + " scanWindow=" + scanWindow + " scanInterval=" + scanInterval); mScanQueue.add(new ScanClient(appIf, isServer, uuids, scanWindow, scanInterval)); mScanQueue.add(new ScanClient(appIf, isServer, uuids, scanWindow, scanInterval)); } } Loading