Merge "Pass all scans to battery stats" into oc-dr1-dev (d2ea9dd3) · Commits · e / os / android_packages_modules_Bluetooth

android/app/src/com/android/bluetooth/gatt/AppScanStats.java

+20 −20

Original line number	Diff line number	Diff line
		@@ -157,15 +157,13 @@ import com.android.bluetooth.btservice.BluetoothProto;
		scanEvent.setInitiator(truncateAppName(appName));
		gattService.addScanEvent(scanEvent);

		if (!isScanning()) {
		if (!isScanning()) mScanStartTime = startTime;
		try {
		boolean isUnoptimized = !(scan.filtered \|\| scan.background \|\| scan.opportunistic);
		mScanStartTime = startTime;
		batteryStats.noteBleScanStarted(workSource, isUnoptimized);
		} catch (RemoteException e) {
		/* ignore */
		}
		}

		ongoingScans.put(scannerId, scan);
		}
		@@ -193,20 +191,22 @@ import com.android.bluetooth.btservice.BluetoothProto;
		gattService.addScanEvent(scanEvent);

		if (!isScanning()) {
		try {
		long totalDuration = stopTime - mScanStartTime;
		mTotalScanTime += totalDuration;
		minScanTime = Math.min(totalDuration, minScanTime);
		maxScanTime = Math.max(totalDuration, maxScanTime);
		}

		try {
		// Inform battery stats of any results it might be missing on
		// scan stop
		boolean isUnoptimized = !(scan.filtered \|\| scan.background \|\| scan.opportunistic);
		batteryStats.noteBleScanResults(workSource, scan.results % 100);
		batteryStats.noteBleScanStopped(workSource);
		batteryStats.noteBleScanStopped(workSource, isUnoptimized);
		} catch (RemoteException e) {
		/* ignore */
		}
		}
		}

		synchronized void setScanTimeout(int scannerId) {
		if (!isScanning()) return;