Projects >> android_packages_apps_Bluetooth >>58a733190a0004177fee1c73dd829c2a602514a8

Chunk
Conflicting content 
            service.startScanWithUuids(appIf, isServer, uuids);
        }

<<<<<<< HEAD
        @Override
        public void startScanWithFilters(int appIf, boolean isServer, ScanSettings settings,
                List filters) {
            GattService service = getService();
            if (service == null) return;
            service.startScanWithFilters(appIf, isServer, settings, filters);
=======
        public void startScanWithUuidsScanParam(int appIf, boolean isServer,
                ParcelUuid[] ids, int scanWindow, int scanInterval) {
            GattService service = getService();
            if (service == null) return;
            UUID[] uuids = new UUID[ids.length];
            for(int i = 0; i < ids.length; ++i) {
                uuids[i] = ids[i].getUuid();
            }
            service.startScanWithUuidsScanParam(appIf, isServer, uuids,
                    scanWindow, scanInterval);
>>>>>>> 63ee04788c7384779eadb10f0c2cd10779ebfb43
        }

        public void stopScan(int appIf, boolean isServer) {
Solution content 
            service.startScanWithUuids(appIf, isServer, uuids);
        }

        @Override
        public void startScanWithFilters(int appIf, boolean isServer, ScanSettings settings,
                List filters) {
            GattService service = getService();
            if (service == null) return;
            service.startScanWithFilters(appIf, isServer, settings, filters);
        }

        public void stopScan(int appIf, boolean isServer) {
File
GattService.java
Developer's decision
Version 1
Kind of conflict
Annotation
For statement
If statement
Method invocation
Method signature
Variable
Chunk
Conflicting content 
        configureScanParams();
    }

<<<<<<< HEAD
    void startScanWithFilters(int appIf, boolean isServer, ScanSettings settings,
            List filters) {
        if (DBG) Log.d(TAG, "start scan with filters " + filters.size());
        enforceAdminPermission();
        // TODO: use settings to configure scan params.
        // TODO: move logic to state machine to avoid locking.
        synchronized(mScanQueue) {
            boolean isScaning = (!mScanQueue.isEmpty());
            if (getScanClient(appIf, isServer) == null) {
                if (DBG) Log.d(TAG, "startScan() - adding client=" + appIf);
                mScanQueue.add(new ScanClient(appIf, isServer, settings, filters));
            }
            Set newFilters = configureScanFiltersLocked();
            if (isScaning) {
                // Reset scan filters if BLE scan was started and scan filters changed.
                if (!Objects.deepEquals(newFilters, mScanFilters)) {
                    mScanFilters = newFilters;
                    // Restart scan using new filters.
                    sendStopScanMessage();
                    sendStartScanMessage(mScanFilters);
                }
            } else {
                // Always start scanning with new filters if scan not started yet.
                mScanFilters = newFilters;
                sendStartScanMessage(mScanFilters);
            }
=======
    void startScanWithUuidsScanParam(int appIf, boolean isServer, UUID[] uuids,
                int scanWindow, int scanInterval) {
        enforceCallingOrSelfPermission(BLUETOOTH_ADMIN_PERM, "Need BLUETOOTH_ADMIN permission");

        if (DBG) Log.d(TAG, "startScanWithUuidsScanParam() - queue=" + mScanQueue.size());

        if (getScanClient(appIf, isServer) == null) {
            if (DBG) Log.d(TAG, "startScanWithUuidsScanParam() - adding client=" + appIf
                            + " scanWindow=" + scanWindow + " scanInterval=" + scanInterval);
            mScanQueue.add(new ScanClient(appIf, isServer, uuids, scanWindow, scanInterval));
>>>>>>> 63ee04788c7384779eadb10f0c2cd10779ebfb43
        }
    }
Solution content 
        configureScanParams();
    }

    void startScanWithFilters(int appIf, boolean isServer, ScanSettings settings,
            List filters) {
        if (DBG) Log.d(TAG, "start scan with filters " + filters.size());
        enforceAdminPermission();
        // TODO: use settings to configure scan params.
        // TODO: move logic to state machine to avoid locking.
        synchronized(mScanQueue) {
            boolean isScaning = (!mScanQueue.isEmpty());
            if (getScanClient(appIf, isServer) == null) {
                if (DBG) Log.d(TAG, "startScan() - adding client=" + appIf);
                mScanQueue.add(new ScanClient(appIf, isServer, settings, filters));
            }
            Set newFilters = configureScanFiltersLocked();
            if (isScaning) {
                // Reset scan filters if BLE scan was started and scan filters changed.
                if (!Objects.deepEquals(newFilters, mScanFilters)) {
                    mScanFilters = newFilters;
                    // Restart scan using new filters.
                    sendStopScanMessage();
                    sendStartScanMessage(mScanFilters);
                }
            } else {
                // Always start scanning with new filters if scan not started yet.
                mScanFilters = newFilters;
                sendStartScanMessage(mScanFilters);
            }
        }
    }
File
GattService.java
Developer's decision
Version 1
Kind of conflict
Comment
If statement
Method invocation
Method signature
Synchronized statement