Fix overflow that prevents matching (4e3c03cf) · Commits · e / os / GmsCore

play-services-nearby-core/src/main/kotlin/org/microg/gms/nearby/exposurenotification/ExposureDatabase.kt

+2 −2

Original line number	Diff line number	Diff line
		@@ -346,7 +346,7 @@ class ExposureDatabase private constructor(private val context: Context) : SQLit
		val keys = listSingleDiagnosisKeysPendingSearch(tid, database)
		val oldestRpi = oldestRpi
		for (key in keys) {
		if ((key.rollingStartIntervalNumber + key.rollingPeriod) * ROLLING_WINDOW_LENGTH_MS + ALLOWED_KEY_OFFSET_MS < oldestRpi) {
		if ((key.rollingStartIntervalNumber + key.rollingPeriod).toLong() * ROLLING_WINDOW_LENGTH_MS + ALLOWED_KEY_OFFSET_MS < oldestRpi) {
		// Early ignore because key is older than since we started scanning.
		applySingleDiagnosisKeySearchResult(key, false, database)
		} else {
		@@ -385,7 +385,7 @@ class ExposureDatabase private constructor(private val context: Context) : SQLit
		riskLogged = key.transmissionRiskLevel
		Log.d(TAG, "First key with risk ${key.transmissionRiskLevel}: ${ByteString.of(*key.keyData).hex()} starts ${key.rollingStartIntervalNumber}")
		}
		if ((key.rollingStartIntervalNumber + key.rollingPeriod) * ROLLING_WINDOW_LENGTH_MS + ALLOWED_KEY_OFFSET_MS < oldestRpi) {
		if ((key.rollingStartIntervalNumber + key.rollingPeriod).toLong() * ROLLING_WINDOW_LENGTH_MS + ALLOWED_KEY_OFFSET_MS < oldestRpi) {
		// Early ignore because key is older than since we started scanning.
		ignored++;
		} else {