Don't log bulk deletes + Software quality fixes
Bug: 277059673
Change-Id: I32ecc892f6ba2f3a8e04eb6d7a4eba0b6e333a28
diff --git a/framework/java/android/health/connect/aidl/DeleteUsingFiltersRequestParcel.java b/framework/java/android/health/connect/aidl/DeleteUsingFiltersRequestParcel.java
index c767ec4..7e69e90 100644
--- a/framework/java/android/health/connect/aidl/DeleteUsingFiltersRequestParcel.java
+++ b/framework/java/android/health/connect/aidl/DeleteUsingFiltersRequestParcel.java
@@ -37,7 +37,7 @@
*/
public class DeleteUsingFiltersRequestParcel implements Parcelable {
public static final Creator<DeleteUsingFiltersRequestParcel> CREATOR =
- new Creator<DeleteUsingFiltersRequestParcel>() {
+ new Creator<>() {
@Override
public DeleteUsingFiltersRequestParcel createFromParcel(Parcel in) {
return new DeleteUsingFiltersRequestParcel(in);
@@ -129,6 +129,11 @@
return mEndTime;
}
+ public boolean usesIdFilters() {
+ return mRecordIdFiltersParcel.getRecordIdFilters() != null
+ && !mRecordIdFiltersParcel.getRecordIdFilters().isEmpty();
+ }
+
@Override
public int describeContents() {
return 0;
diff --git a/service/java/com/android/server/healthconnect/HealthConnectServiceImpl.java b/service/java/com/android/server/healthconnect/HealthConnectServiceImpl.java
index 57ad774..db6c8d8 100644
--- a/service/java/com/android/server/healthconnect/HealthConnectServiceImpl.java
+++ b/service/java/com/android/server/healthconnect/HealthConnectServiceImpl.java
@@ -372,8 +372,8 @@
recordsParcel.getRecords().stream()
.map(RecordInternal::getRecordType)
.collect(Collectors.toSet());
- // Update AppInfo table with the record types of records
- // inserted in the request for the current package.
+ // Update AppInfo table with the record types of records inserted in the request for the
+ // current package.
AppInfoHelper.getInstance()
.updateAppInfoRecordTypesUsedOnInsert(
recordsTypesInsertedSet, attributionSource.getPackageName());
@@ -1598,7 +1598,6 @@
try {
RateLimiter.tryAcquireApiCallQuota(uid, quotaCategory, isInForeground);
} catch (RateLimiterException rateLimiterException) {
- // Todo (b/271399704): Add logging for rate limiter.
builder.setRateLimit(
rateLimiterException.getRateLimiterQuotaBucket(),
rateLimiterException.getRateLimiterQuotaLimit());
@@ -1769,7 +1768,7 @@
private void enforceBinderUidIsSameAsAttributionSourceUid(
int binderUid, int attributionSourceUid) {
if (binderUid != attributionSourceUid) {
- throw new IllegalStateException(" Binder Uid must be equal to Attribution Source Uid.");
+ throw new SecurityException("Binder uid must be equal to attribution source uid.");
}
}
diff --git a/service/java/com/android/server/healthconnect/HealthConnectThreadScheduler.java b/service/java/com/android/server/healthconnect/HealthConnectThreadScheduler.java
index 1b294bb..0085891 100644
--- a/service/java/com/android/server/healthconnect/HealthConnectThreadScheduler.java
+++ b/service/java/com/android/server/healthconnect/HealthConnectThreadScheduler.java
@@ -127,58 +127,51 @@
/** Schedules the task on the executor dedicated for performing internal tasks */
public static void scheduleInternalTask(Runnable task) {
- sInternalBackgroundExecutor.execute(
- () -> {
- try {
- task.run();
- } catch (Exception e) {
- Slog.e(TAG, "Internal task schedule failed", e);
- }
- });
+ sInternalBackgroundExecutor.execute(getSafeRunnable(task));
}
/** Schedules the task on the executor dedicated for performing controller tasks */
static void scheduleControllerTask(Runnable task) {
- sControllerExecutor.execute(task);
+ sControllerExecutor.execute(getSafeRunnable(task));
}
/** Schedules the task on the best possible executor based on the parameters */
static void schedule(Context context, @NonNull Runnable task, int uid, boolean isController) {
if (isController) {
- sControllerExecutor.execute(task);
+ sControllerExecutor.execute(getSafeRunnable(task));
return;
}
if (isUidInForeground(context, uid)) {
sForegroundExecutor.execute(
- () -> {
- try {
- if (!isUidInForeground(context, uid)) {
- // The app is no longer in foreground so move the task to background
- // thread. This is because foreground thread should only be used by
- // the foreground app and since the request of this task is no
- // longer in foreground we don't want it to consume foreground
- // resource anymore.
- HEALTH_CONNECT_BACKGROUND_ROUND_ROBIN_SCHEDULER.addTask(uid, task);
- sBackgroundThreadExecutor.execute(
- () ->
- HEALTH_CONNECT_BACKGROUND_ROUND_ROBIN_SCHEDULER
- .getNextTask()
- .run());
- return;
- }
- } catch (Exception exception) {
- // This is very unlikely, nonetheless we were unable to push the task to
- // the background thread, ignore this and try to run it on foreground
- // thread
- }
+ getSafeRunnable(
+ () -> {
+ if (!isUidInForeground(context, uid)) {
+ // The app is no longer in foreground so move the task to
+ // background thread. This is because foreground thread should
+ // only be used by the foreground app and since the request of
+ // this task is no longer in foreground we don't want it to
+ // consume foreground resource anymore.
+ HEALTH_CONNECT_BACKGROUND_ROUND_ROBIN_SCHEDULER.addTask(
+ uid, task);
+ sBackgroundThreadExecutor.execute(
+ () ->
+ HEALTH_CONNECT_BACKGROUND_ROUND_ROBIN_SCHEDULER
+ .getNextTask()
+ .run());
+ return;
+ }
- task.run();
- });
+ task.run();
+ }));
} else {
HEALTH_CONNECT_BACKGROUND_ROUND_ROBIN_SCHEDULER.addTask(uid, task);
sBackgroundThreadExecutor.execute(
- () -> HEALTH_CONNECT_BACKGROUND_ROUND_ROBIN_SCHEDULER.getNextTask().run());
+ getSafeRunnable(
+ () ->
+ HEALTH_CONNECT_BACKGROUND_ROUND_ROBIN_SCHEDULER
+ .getNextTask()
+ .run()));
}
}
@@ -196,4 +189,15 @@
}
return false;
}
+
+ // Makes sure that any exceptions don't end up in system_server.
+ private static Runnable getSafeRunnable(Runnable task) {
+ return () -> {
+ try {
+ task.run();
+ } catch (Exception e) {
+ Slog.e(TAG, "Internal task schedule failed", e);
+ }
+ };
+ }
}
diff --git a/service/java/com/android/server/healthconnect/backuprestore/BackupRestore.java b/service/java/com/android/server/healthconnect/backuprestore/BackupRestore.java
index cb14919..a101d12 100644
--- a/service/java/com/android/server/healthconnect/backuprestore/BackupRestore.java
+++ b/service/java/com/android/server/healthconnect/backuprestore/BackupRestore.java
@@ -470,7 +470,6 @@
}
private void merge(int userId) {
- Log.e("TAG", "merge: " + userId);
if (getInternalRestoreState(userId) >= INTERNAL_RESTORE_STATE_MERGING_IN_PROGRESS) {
return;
}
@@ -482,7 +481,6 @@
private void mergeDatabase(int userId) {
synchronized (mMergingLock) {
- Log.e("TAG", "mergeDatabase: " + userId);
if (!mStagedDbContext.getDatabasePath(HealthConnectDatabase.getName()).exists()) {
// no db was staged
return;
@@ -519,12 +517,6 @@
long token = DEFAULT_LONG;
do {
var recordsToMergeAndToken = getRecordsToMerge(recordTypeClass, token, recordHelper);
- Log.e(
- "TAG",
- "mergeRecordsOfType: "
- + recordHelper.getClass().toString()
- + " "
- + recordsToMergeAndToken.first.size());
if (recordsToMergeAndToken.first.isEmpty()) {
break;
}
diff --git a/service/java/com/android/server/healthconnect/storage/TransactionManager.java b/service/java/com/android/server/healthconnect/storage/TransactionManager.java
index 99dbb44..191ef51 100644
--- a/service/java/com/android/server/healthconnect/storage/TransactionManager.java
+++ b/service/java/com/android/server/healthconnect/storage/TransactionManager.java
@@ -662,8 +662,7 @@
null,
request.getContentValues(),
SQLiteDatabase.CONFLICT_FAIL);
- request.getChildTableRequests()
- .forEach(childRequest -> insertRecord(db, childRequest.withParentKey(rowId)));
+ insertChildTableRequest(request, rowId, db);
return rowId;
} catch (SQLiteConstraintException e) {
try (Cursor cursor = db.rawQuery(request.getReadRequest().getReadCommand(), null)) {
@@ -672,31 +671,36 @@
ERROR_INTERNAL, "Conflict found, but couldn't read the entry.");
}
- if (!request.requiresUpdate(cursor, request)) {
- return -1;
- }
-
- db.update(
- request.getTable(),
- request.getContentValues(),
- request.getUpdateWhereClauses().get(/* withWhereKeyword */ false),
- /* WHERE args */ null);
- if (cursor.getColumnIndex(request.getRowIdColName()) == -1) {
- // The table is not explicitly using row_ids hence returning -1 here is ok, as
- // the rowid is of no use to this table.
- // NOTE: Such tables in HC don't support child tables either as child tables
- // inherently require row_ids to have support parent key.
- return -1;
- }
- final long rowId = StorageUtils.getCursorLong(cursor, request.getRowIdColName());
- deleteChildTableRequest(request, rowId, db);
- insertChildTableRequest(request, rowId, db);
-
- return rowId;
+ return updateEntriesIfRequired(db, request, cursor);
}
}
}
+ private long updateEntriesIfRequired(
+ SQLiteDatabase db, UpsertTableRequest request, Cursor cursor) {
+ if (!request.requiresUpdate(cursor, request)) {
+ return -1;
+ }
+
+ db.update(
+ request.getTable(),
+ request.getContentValues(),
+ request.getUpdateWhereClauses().get(/* withWhereKeyword */ false),
+ /* WHERE args */ null);
+ if (cursor.getColumnIndex(request.getRowIdColName()) == -1) {
+ // The table is not explicitly using row_ids hence returning -1 here is ok, as
+ // the rowid is of no use to this table.
+ // NOTE: Such tables in HC don't support child tables either as child tables
+ // inherently require row_ids to have support parent key.
+ return -1;
+ }
+ final long rowId = StorageUtils.getCursorLong(cursor, request.getRowIdColName());
+ deleteChildTableRequest(request, rowId, db);
+ insertChildTableRequest(request, rowId, db);
+
+ return rowId;
+ }
+
private void deleteChildTableRequest(
UpsertTableRequest request, long rowId, SQLiteDatabase db) {
for (String childTable : request.getAllChildTables()) {
diff --git a/service/java/com/android/server/healthconnect/storage/request/DeleteTransactionRequest.java b/service/java/com/android/server/healthconnect/storage/request/DeleteTransactionRequest.java
index f9bd451..2b4d4c2 100644
--- a/service/java/com/android/server/healthconnect/storage/request/DeleteTransactionRequest.java
+++ b/service/java/com/android/server/healthconnect/storage/request/DeleteTransactionRequest.java
@@ -36,6 +36,7 @@
import java.time.Instant;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Objects;
@@ -46,18 +47,19 @@
public final class DeleteTransactionRequest {
private static final String TAG = "HealthConnectDelete";
private final List<DeleteTableRequest> mDeleteTableRequests;
- private final ChangeLogsHelper.ChangeLogs mChangeLogs;
private final long mRequestingPackageNameId;
+ private ChangeLogsHelper.ChangeLogs mChangeLogs;
private boolean mHasHealthDataManagementPermission;
public DeleteTransactionRequest(String packageName, DeleteUsingFiltersRequestParcel request) {
Objects.requireNonNull(packageName);
mDeleteTableRequests = new ArrayList<>(request.getRecordTypeFilters().size());
- mChangeLogs =
- new ChangeLogsHelper.ChangeLogs(DELETE, packageName, Instant.now().toEpochMilli());
mRequestingPackageNameId = AppInfoHelper.getInstance().getAppInfoId(packageName);
- if (request.getRecordIdFiltersParcel().getRecordIdFilters() != null
- && !request.getRecordIdFiltersParcel().getRecordIdFilters().isEmpty()) {
+ if (request.usesIdFilters()) {
+ // We don't keep change logs for bulk deletes
+ mChangeLogs =
+ new ChangeLogsHelper.ChangeLogs(
+ DELETE, packageName, Instant.now().toEpochMilli());
List<RecordIdFilter> recordIds =
request.getRecordIdFiltersParcel().getRecordIdFilters();
Set<UUID> uuidSet = new ArraySet<>();
@@ -125,11 +127,18 @@
*/
public void onRecordFetched(
@RecordTypeIdentifier.RecordType int recordType, long appId, UUID uuid) {
+ if (mChangeLogs == null) {
+ return;
+ }
mChangeLogs.addUUID(recordType, appId, uuid);
}
@NonNull
public List<UpsertTableRequest> getChangeLogUpsertRequests() {
+ if (mChangeLogs == null) {
+ return Collections.emptyList();
+ }
+
return mChangeLogs.getUpsertTableRequests();
}
diff --git a/tests/cts/hostsidetests/healthconnect/host/src/android/healthconnect/cts/logging/HealthConnectServiceStatsTests.java b/tests/cts/hostsidetests/healthconnect/host/src/android/healthconnect/cts/logging/HealthConnectServiceStatsTests.java
index a12c3a0..f324ae5 100644
--- a/tests/cts/hostsidetests/healthconnect/host/src/android/healthconnect/cts/logging/HealthConnectServiceStatsTests.java
+++ b/tests/cts/hostsidetests/healthconnect/host/src/android/healthconnect/cts/logging/HealthConnectServiceStatsTests.java
@@ -38,8 +38,8 @@
public class HealthConnectServiceStatsTests extends DeviceTestCase implements IBuildReceiver {
- private IBuildInfo mCtsBuild;
public static final String TEST_APP_PKG_NAME = "android.healthconnect.cts.testhelper";
+ private IBuildInfo mCtsBuild;
@Override
protected void setUp() throws Exception {
@@ -213,7 +213,7 @@
assertThat(atom.getApiStatus()).isEqualTo(ApiStatus.SUCCESS);
assertThat(atom.getErrorCode()).isEqualTo(0);
assertThat(atom.getDurationMillis()).isAtLeast(0);
- assertThat(atom.getNumberOfRecords()).isEqualTo(2);
+ assertThat(atom.getNumberOfRecords()).isEqualTo(1);
assertThat(atom.getRateLimit()).isEqualTo(RateLimit.NOT_USED);
}
diff --git a/tests/cts/src/android/healthconnect/cts/ActiveCaloriesBurnedRecordTest.java b/tests/cts/src/android/healthconnect/cts/ActiveCaloriesBurnedRecordTest.java
index 033635e..27c831b 100644
--- a/tests/cts/src/android/healthconnect/cts/ActiveCaloriesBurnedRecordTest.java
+++ b/tests/cts/src/android/healthconnect/cts/ActiveCaloriesBurnedRecordTest.java
@@ -553,13 +553,7 @@
.addRecordType(ActiveCaloriesBurnedRecord.class)
.build());
response = TestUtils.getChangeLogs(changeLogsRequest);
- assertThat(response.getDeletedLogs().size()).isEqualTo(testRecord.size());
- assertThat(
- response.getDeletedLogs().stream()
- .map(ChangeLogsResponse.DeletedLog::getDeletedRecordId)
- .toList())
- .containsExactlyElementsIn(
- testRecord.stream().map(Record::getMetadata).map(Metadata::getId).toList());
+ assertThat(response.getDeletedLogs()).isEmpty();
}
private void readActiveCaloriesBurnedRecordUsingClientId(List<Record> insertedRecords)
diff --git a/tests/cts/src/android/healthconnect/cts/BasalBodyTemperatureRecordTest.java b/tests/cts/src/android/healthconnect/cts/BasalBodyTemperatureRecordTest.java
index 2754a7c..7837dc3 100644
--- a/tests/cts/src/android/healthconnect/cts/BasalBodyTemperatureRecordTest.java
+++ b/tests/cts/src/android/healthconnect/cts/BasalBodyTemperatureRecordTest.java
@@ -526,13 +526,7 @@
.addRecordType(BasalBodyTemperatureRecord.class)
.build());
response = TestUtils.getChangeLogs(changeLogsRequest);
- assertThat(response.getDeletedLogs().size()).isEqualTo(testRecord.size());
- assertThat(
- response.getDeletedLogs().stream()
- .map(ChangeLogsResponse.DeletedLog::getDeletedRecordId)
- .toList())
- .containsExactlyElementsIn(
- testRecord.stream().map(Record::getMetadata).map(Metadata::getId).toList());
+ assertThat(response.getDeletedLogs()).isEmpty();
}
BasalBodyTemperatureRecord getBasalBodyTemperatureRecord_update(
diff --git a/tests/cts/src/android/healthconnect/cts/BasalMetabolicRateRecordTest.java b/tests/cts/src/android/healthconnect/cts/BasalMetabolicRateRecordTest.java
index fa040ff..3334c6b 100644
--- a/tests/cts/src/android/healthconnect/cts/BasalMetabolicRateRecordTest.java
+++ b/tests/cts/src/android/healthconnect/cts/BasalMetabolicRateRecordTest.java
@@ -520,13 +520,7 @@
.addRecordType(BasalMetabolicRateRecord.class)
.build());
response = TestUtils.getChangeLogs(changeLogsRequest);
- assertThat(response.getDeletedLogs().size()).isEqualTo(testRecord.size());
- assertThat(
- response.getDeletedLogs().stream()
- .map(ChangeLogsResponse.DeletedLog::getDeletedRecordId)
- .toList())
- .containsExactlyElementsIn(
- testRecord.stream().map(Record::getMetadata).map(Metadata::getId).toList());
+ assertThat(response.getDeletedLogs()).isEmpty();
}
private void readBasalMetabolicRateRecordUsingClientId(List<Record> insertedRecord)
diff --git a/tests/cts/src/android/healthconnect/cts/BloodGlucoseRecordTest.java b/tests/cts/src/android/healthconnect/cts/BloodGlucoseRecordTest.java
index 023cfb7..3f68381 100644
--- a/tests/cts/src/android/healthconnect/cts/BloodGlucoseRecordTest.java
+++ b/tests/cts/src/android/healthconnect/cts/BloodGlucoseRecordTest.java
@@ -503,13 +503,7 @@
.addRecordType(BloodGlucoseRecord.class)
.build());
response = TestUtils.getChangeLogs(changeLogsRequest);
- assertThat(response.getDeletedLogs().size()).isEqualTo(testRecord.size());
- assertThat(
- response.getDeletedLogs().stream()
- .map(ChangeLogsResponse.DeletedLog::getDeletedRecordId)
- .toList())
- .containsExactlyElementsIn(
- testRecord.stream().map(Record::getMetadata).map(Metadata::getId).toList());
+ assertThat(response.getDeletedLogs()).isEmpty();
}
BloodGlucoseRecord getBloodGlucoseRecord_update(
diff --git a/tests/cts/src/android/healthconnect/cts/BloodPressureRecordTest.java b/tests/cts/src/android/healthconnect/cts/BloodPressureRecordTest.java
index 732b666..be6e5be 100644
--- a/tests/cts/src/android/healthconnect/cts/BloodPressureRecordTest.java
+++ b/tests/cts/src/android/healthconnect/cts/BloodPressureRecordTest.java
@@ -513,13 +513,7 @@
.addRecordType(BloodPressureRecord.class)
.build());
response = TestUtils.getChangeLogs(changeLogsRequest);
- assertThat(response.getDeletedLogs().size()).isEqualTo(testRecord.size());
- assertThat(
- response.getDeletedLogs().stream()
- .map(ChangeLogsResponse.DeletedLog::getDeletedRecordId)
- .toList())
- .containsExactlyElementsIn(
- testRecord.stream().map(Record::getMetadata).map(Metadata::getId).toList());
+ assertThat(response.getDeletedLogs()).isEmpty();
}
BloodPressureRecord getBloodPressureRecord_update(
diff --git a/tests/cts/src/android/healthconnect/cts/BodyFatRecordTest.java b/tests/cts/src/android/healthconnect/cts/BodyFatRecordTest.java
index 21a0332..d615882 100644
--- a/tests/cts/src/android/healthconnect/cts/BodyFatRecordTest.java
+++ b/tests/cts/src/android/healthconnect/cts/BodyFatRecordTest.java
@@ -468,13 +468,7 @@
TestUtils.verifyDeleteRecords(
new DeleteUsingFiltersRequest.Builder().addRecordType(BodyFatRecord.class).build());
response = TestUtils.getChangeLogs(changeLogsRequest);
- assertThat(response.getDeletedLogs().size()).isEqualTo(testRecord.size());
- assertThat(
- response.getDeletedLogs().stream()
- .map(ChangeLogsResponse.DeletedLog::getDeletedRecordId)
- .toList())
- .containsExactlyElementsIn(
- testRecord.stream().map(Record::getMetadata).map(Metadata::getId).toList());
+ assertThat(response.getDeletedLogs()).isEmpty();
}
BodyFatRecord getBodyFatRecord_update(Record record, String id, String clientRecordId) {
diff --git a/tests/cts/src/android/healthconnect/cts/BodyTemperatureRecordTest.java b/tests/cts/src/android/healthconnect/cts/BodyTemperatureRecordTest.java
index 1403d1d..6ef5212 100644
--- a/tests/cts/src/android/healthconnect/cts/BodyTemperatureRecordTest.java
+++ b/tests/cts/src/android/healthconnect/cts/BodyTemperatureRecordTest.java
@@ -502,13 +502,7 @@
.addRecordType(BodyTemperatureRecord.class)
.build());
response = TestUtils.getChangeLogs(changeLogsRequest);
- assertThat(response.getDeletedLogs().size()).isEqualTo(testRecord.size());
- assertThat(
- response.getDeletedLogs().stream()
- .map(ChangeLogsResponse.DeletedLog::getDeletedRecordId)
- .toList())
- .containsExactlyElementsIn(
- testRecord.stream().map(Record::getMetadata).map(Metadata::getId).toList());
+ assertThat(response.getDeletedLogs()).isEmpty();
}
BodyTemperatureRecord getBodyTemperatureRecord_update(
diff --git a/tests/cts/src/android/healthconnect/cts/BodyWaterMassRecordTest.java b/tests/cts/src/android/healthconnect/cts/BodyWaterMassRecordTest.java
index 1c0088d..60d02d8 100644
--- a/tests/cts/src/android/healthconnect/cts/BodyWaterMassRecordTest.java
+++ b/tests/cts/src/android/healthconnect/cts/BodyWaterMassRecordTest.java
@@ -482,13 +482,7 @@
.addRecordType(BodyWaterMassRecord.class)
.build());
response = TestUtils.getChangeLogs(changeLogsRequest);
- assertThat(response.getDeletedLogs().size()).isEqualTo(testRecord.size());
- assertThat(
- response.getDeletedLogs().stream()
- .map(ChangeLogsResponse.DeletedLog::getDeletedRecordId)
- .toList())
- .containsExactlyElementsIn(
- testRecord.stream().map(Record::getMetadata).map(Metadata::getId).toList());
+ assertThat(response.getDeletedLogs()).isEmpty();
}
private void readBodyWaterMassRecordUsingClientId(List<Record> insertedRecord)
diff --git a/tests/cts/src/android/healthconnect/cts/BoneMassRecordTest.java b/tests/cts/src/android/healthconnect/cts/BoneMassRecordTest.java
index 0fed10a..6fe76b1 100644
--- a/tests/cts/src/android/healthconnect/cts/BoneMassRecordTest.java
+++ b/tests/cts/src/android/healthconnect/cts/BoneMassRecordTest.java
@@ -467,13 +467,7 @@
.addRecordType(BoneMassRecord.class)
.build());
response = TestUtils.getChangeLogs(changeLogsRequest);
- assertThat(response.getDeletedLogs().size()).isEqualTo(testRecord.size());
- assertThat(
- response.getDeletedLogs().stream()
- .map(ChangeLogsResponse.DeletedLog::getDeletedRecordId)
- .toList())
- .containsExactlyElementsIn(
- testRecord.stream().map(Record::getMetadata).map(Metadata::getId).toList());
+ assertThat(response.getDeletedLogs()).isEmpty();
}
BoneMassRecord getBoneMassRecord_update(Record record, String id, String clientRecordId) {
diff --git a/tests/cts/src/android/healthconnect/cts/CervicalMucusRecordTest.java b/tests/cts/src/android/healthconnect/cts/CervicalMucusRecordTest.java
index d2caa06..bdcd933 100644
--- a/tests/cts/src/android/healthconnect/cts/CervicalMucusRecordTest.java
+++ b/tests/cts/src/android/healthconnect/cts/CervicalMucusRecordTest.java
@@ -480,13 +480,7 @@
.addRecordType(CervicalMucusRecord.class)
.build());
response = TestUtils.getChangeLogs(changeLogsRequest);
- assertThat(response.getDeletedLogs().size()).isEqualTo(testRecord.size());
- assertThat(
- response.getDeletedLogs().stream()
- .map(ChangeLogsResponse.DeletedLog::getDeletedRecordId)
- .toList())
- .containsExactlyElementsIn(
- testRecord.stream().map(Record::getMetadata).map(Metadata::getId).toList());
+ assertThat(response.getDeletedLogs()).isEmpty();
}
CervicalMucusRecord getCervicalMucusRecord_update(
diff --git a/tests/cts/src/android/healthconnect/cts/CyclingPedalingCadenceRecordTest.java b/tests/cts/src/android/healthconnect/cts/CyclingPedalingCadenceRecordTest.java
index a805485..f87c9f1 100644
--- a/tests/cts/src/android/healthconnect/cts/CyclingPedalingCadenceRecordTest.java
+++ b/tests/cts/src/android/healthconnect/cts/CyclingPedalingCadenceRecordTest.java
@@ -507,13 +507,7 @@
.addRecordType(CyclingPedalingCadenceRecord.class)
.build());
response = TestUtils.getChangeLogs(changeLogsRequest);
- assertThat(response.getDeletedLogs().size()).isEqualTo(testRecord.size());
- assertThat(
- response.getDeletedLogs().stream()
- .map(ChangeLogsResponse.DeletedLog::getDeletedRecordId)
- .toList())
- .containsExactlyElementsIn(
- testRecord.stream().map(Record::getMetadata).map(Metadata::getId).toList());
+ assertThat(response.getDeletedLogs()).isEmpty();
}
private void testReadCyclingPedalingCadenceRecordIds() throws InterruptedException {
diff --git a/tests/cts/src/android/healthconnect/cts/DistanceRecordTest.java b/tests/cts/src/android/healthconnect/cts/DistanceRecordTest.java
index 0e4e67a..9fed7d9 100644
--- a/tests/cts/src/android/healthconnect/cts/DistanceRecordTest.java
+++ b/tests/cts/src/android/healthconnect/cts/DistanceRecordTest.java
@@ -518,13 +518,7 @@
.addRecordType(DistanceRecord.class)
.build());
response = TestUtils.getChangeLogs(changeLogsRequest);
- assertThat(response.getDeletedLogs().size()).isEqualTo(testRecord.size());
- assertThat(
- response.getDeletedLogs().stream()
- .map(ChangeLogsResponse.DeletedLog::getDeletedRecordId)
- .toList())
- .containsExactlyElementsIn(
- testRecord.stream().map(Record::getMetadata).map(Metadata::getId).toList());
+ assertThat(response.getDeletedLogs()).isEmpty();
}
@Test(expected = IllegalArgumentException.class)
diff --git a/tests/cts/src/android/healthconnect/cts/ElevationGainedRecordTest.java b/tests/cts/src/android/healthconnect/cts/ElevationGainedRecordTest.java
index f8dea42..f5ac2fc 100644
--- a/tests/cts/src/android/healthconnect/cts/ElevationGainedRecordTest.java
+++ b/tests/cts/src/android/healthconnect/cts/ElevationGainedRecordTest.java
@@ -556,13 +556,7 @@
.addRecordType(ElevationGainedRecord.class)
.build());
response = TestUtils.getChangeLogs(changeLogsRequest);
- assertThat(response.getDeletedLogs().size()).isEqualTo(testRecord.size());
- assertThat(
- response.getDeletedLogs().stream()
- .map(ChangeLogsResponse.DeletedLog::getDeletedRecordId)
- .toList())
- .containsExactlyElementsIn(
- testRecord.stream().map(Record::getMetadata).map(Metadata::getId).toList());
+ assertThat(response.getDeletedLogs()).isEmpty();
}
ElevationGainedRecord getElevationGainedRecord_update(
diff --git a/tests/cts/src/android/healthconnect/cts/ExerciseSessionRecordTest.java b/tests/cts/src/android/healthconnect/cts/ExerciseSessionRecordTest.java
index 0774431..eb36372 100644
--- a/tests/cts/src/android/healthconnect/cts/ExerciseSessionRecordTest.java
+++ b/tests/cts/src/android/healthconnect/cts/ExerciseSessionRecordTest.java
@@ -551,13 +551,7 @@
.addRecordType(ExerciseSessionRecord.class)
.build());
response = TestUtils.getChangeLogs(changeLogsRequest);
- assertThat(response.getDeletedLogs().size()).isEqualTo(testRecord.size());
- assertThat(
- response.getDeletedLogs().stream()
- .map(ChangeLogsResponse.DeletedLog::getDeletedRecordId)
- .toList())
- .containsExactlyElementsIn(
- testRecord.stream().map(Record::getMetadata).map(Metadata::getId).toList());
+ assertThat(response.getDeletedLogs()).isEmpty();
}
private ExerciseSessionRecord buildRecordWithOneSegment(int sessionType, int segmentType) {
diff --git a/tests/cts/src/android/healthconnect/cts/FloorsClimbedRecordTest.java b/tests/cts/src/android/healthconnect/cts/FloorsClimbedRecordTest.java
index 04be89b..0981027 100644
--- a/tests/cts/src/android/healthconnect/cts/FloorsClimbedRecordTest.java
+++ b/tests/cts/src/android/healthconnect/cts/FloorsClimbedRecordTest.java
@@ -436,13 +436,7 @@
.addRecordType(FloorsClimbedRecord.class)
.build());
response = TestUtils.getChangeLogs(changeLogsRequest);
- assertThat(response.getDeletedLogs().size()).isEqualTo(testRecord.size());
- assertThat(
- response.getDeletedLogs().stream()
- .map(ChangeLogsResponse.DeletedLog::getDeletedRecordId)
- .toList())
- .containsExactlyElementsIn(
- testRecord.stream().map(Record::getMetadata).map(Metadata::getId).toList());
+ assertThat(response.getDeletedLogs()).isEmpty();
}
private void readFloorsClimbedRecordUsingIds(List<Record> recordList)
diff --git a/tests/cts/src/android/healthconnect/cts/HeartRateRecordTest.java b/tests/cts/src/android/healthconnect/cts/HeartRateRecordTest.java
index 1e37b84..bd56509 100644
--- a/tests/cts/src/android/healthconnect/cts/HeartRateRecordTest.java
+++ b/tests/cts/src/android/healthconnect/cts/HeartRateRecordTest.java
@@ -754,13 +754,7 @@
.addRecordType(HeartRateRecord.class)
.build());
response = TestUtils.getChangeLogs(changeLogsRequest);
- assertThat(response.getDeletedLogs().size()).isEqualTo(testRecord.size());
- assertThat(
- response.getDeletedLogs().stream()
- .map(ChangeLogsResponse.DeletedLog::getDeletedRecordId)
- .toList())
- .containsExactlyElementsIn(
- testRecord.stream().map(Record::getMetadata).map(Metadata::getId).toList());
+ assertThat(response.getDeletedLogs()).isEmpty();
}
@Test
diff --git a/tests/cts/src/android/healthconnect/cts/HeartRateVariabilityRmssdRecordTest.java b/tests/cts/src/android/healthconnect/cts/HeartRateVariabilityRmssdRecordTest.java
index 3b57451..60361c6 100644
--- a/tests/cts/src/android/healthconnect/cts/HeartRateVariabilityRmssdRecordTest.java
+++ b/tests/cts/src/android/healthconnect/cts/HeartRateVariabilityRmssdRecordTest.java
@@ -522,13 +522,7 @@
.addRecordType(HeartRateVariabilityRmssdRecord.class)
.build());
response = TestUtils.getChangeLogs(changeLogsRequest);
- assertThat(response.getDeletedLogs().size()).isEqualTo(testRecord.size());
- assertThat(
- response.getDeletedLogs().stream()
- .map(ChangeLogsResponse.DeletedLog::getDeletedRecordId)
- .toList())
- .containsExactlyElementsIn(
- testRecord.stream().map(Record::getMetadata).map(Metadata::getId).toList());
+ assertThat(response.getDeletedLogs()).isEmpty();
}
private void readHeartRateVariabilityRmssdRecordUsingClientId(List<Record> insertedRecord)
diff --git a/tests/cts/src/android/healthconnect/cts/HeightRecordTest.java b/tests/cts/src/android/healthconnect/cts/HeightRecordTest.java
index a849033..98c1395 100644
--- a/tests/cts/src/android/healthconnect/cts/HeightRecordTest.java
+++ b/tests/cts/src/android/healthconnect/cts/HeightRecordTest.java
@@ -502,13 +502,7 @@
TestUtils.verifyDeleteRecords(
new DeleteUsingFiltersRequest.Builder().addRecordType(HeightRecord.class).build());
response = TestUtils.getChangeLogs(changeLogsRequest);
- assertThat(response.getDeletedLogs().size()).isEqualTo(testRecord.size());
- assertThat(
- response.getDeletedLogs().stream()
- .map(ChangeLogsResponse.DeletedLog::getDeletedRecordId)
- .toList())
- .containsExactlyElementsIn(
- testRecord.stream().map(Record::getMetadata).map(Metadata::getId).toList());
+ assertThat(response.getDeletedLogs()).isEmpty();
}
@Test(expected = IllegalArgumentException.class)
diff --git a/tests/cts/src/android/healthconnect/cts/HydrationRecordTest.java b/tests/cts/src/android/healthconnect/cts/HydrationRecordTest.java
index 82d8e56..83e6a9e 100644
--- a/tests/cts/src/android/healthconnect/cts/HydrationRecordTest.java
+++ b/tests/cts/src/android/healthconnect/cts/HydrationRecordTest.java
@@ -492,13 +492,7 @@
.addRecordType(HydrationRecord.class)
.build());
response = TestUtils.getChangeLogs(changeLogsRequest);
- assertThat(response.getDeletedLogs().size()).isEqualTo(testRecord.size());
- assertThat(
- response.getDeletedLogs().stream()
- .map(ChangeLogsResponse.DeletedLog::getDeletedRecordId)
- .toList())
- .containsExactlyElementsIn(
- testRecord.stream().map(Record::getMetadata).map(Metadata::getId).toList());
+ assertThat(response.getDeletedLogs()).isEmpty();
}
private void readHydrationRecordUsingClientId(List<Record> insertedRecord)
diff --git a/tests/cts/src/android/healthconnect/cts/IntermenstrualBleedingRecordTest.java b/tests/cts/src/android/healthconnect/cts/IntermenstrualBleedingRecordTest.java
index bc8eca7..241177f 100644
--- a/tests/cts/src/android/healthconnect/cts/IntermenstrualBleedingRecordTest.java
+++ b/tests/cts/src/android/healthconnect/cts/IntermenstrualBleedingRecordTest.java
@@ -401,13 +401,7 @@
.addRecordType(IntermenstrualBleedingRecord.class)
.build());
response = TestUtils.getChangeLogs(changeLogsRequest);
- assertThat(response.getDeletedLogs().size()).isEqualTo(testRecord.size());
- assertThat(
- response.getDeletedLogs().stream()
- .map(ChangeLogsResponse.DeletedLog::getDeletedRecordId)
- .toList())
- .containsExactlyElementsIn(
- testRecord.stream().map(Record::getMetadata).map(Metadata::getId).toList());
+ assertThat(response.getDeletedLogs()).isEmpty();
}
@Test
diff --git a/tests/cts/src/android/healthconnect/cts/LeanBodyMassRecordTest.java b/tests/cts/src/android/healthconnect/cts/LeanBodyMassRecordTest.java
index 29a7124..64a6960 100644
--- a/tests/cts/src/android/healthconnect/cts/LeanBodyMassRecordTest.java
+++ b/tests/cts/src/android/healthconnect/cts/LeanBodyMassRecordTest.java
@@ -478,13 +478,7 @@
.addRecordType(LeanBodyMassRecord.class)
.build());
response = TestUtils.getChangeLogs(changeLogsRequest);
- assertThat(response.getDeletedLogs().size()).isEqualTo(testRecord.size());
- assertThat(
- response.getDeletedLogs().stream()
- .map(ChangeLogsResponse.DeletedLog::getDeletedRecordId)
- .toList())
- .containsExactlyElementsIn(
- testRecord.stream().map(Record::getMetadata).map(Metadata::getId).toList());
+ assertThat(response.getDeletedLogs()).isEmpty();
}
LeanBodyMassRecord getLeanBodyMassRecord_update(
diff --git a/tests/cts/src/android/healthconnect/cts/MenstruationFlowRecordTest.java b/tests/cts/src/android/healthconnect/cts/MenstruationFlowRecordTest.java
index bb88acb..af48e57 100644
--- a/tests/cts/src/android/healthconnect/cts/MenstruationFlowRecordTest.java
+++ b/tests/cts/src/android/healthconnect/cts/MenstruationFlowRecordTest.java
@@ -488,13 +488,7 @@
.addRecordType(MenstruationFlowRecord.class)
.build());
response = TestUtils.getChangeLogs(changeLogsRequest);
- assertThat(response.getDeletedLogs().size()).isEqualTo(testRecord.size());
- assertThat(
- response.getDeletedLogs().stream()
- .map(ChangeLogsResponse.DeletedLog::getDeletedRecordId)
- .toList())
- .containsExactlyElementsIn(
- testRecord.stream().map(Record::getMetadata).map(Metadata::getId).toList());
+ assertThat(response.getDeletedLogs()).isEmpty();
}
MenstruationFlowRecord getMenstruationFlowRecord_update(
diff --git a/tests/cts/src/android/healthconnect/cts/MenstruationPeriodRecordTest.java b/tests/cts/src/android/healthconnect/cts/MenstruationPeriodRecordTest.java
index 557fb6f..a0aa236 100644
--- a/tests/cts/src/android/healthconnect/cts/MenstruationPeriodRecordTest.java
+++ b/tests/cts/src/android/healthconnect/cts/MenstruationPeriodRecordTest.java
@@ -509,13 +509,7 @@
.addRecordType(MenstruationPeriodRecord.class)
.build());
response = TestUtils.getChangeLogs(changeLogsRequest);
- assertThat(response.getDeletedLogs().size()).isEqualTo(testRecord.size());
- assertThat(
- response.getDeletedLogs().stream()
- .map(ChangeLogsResponse.DeletedLog::getDeletedRecordId)
- .toList())
- .containsExactlyElementsIn(
- testRecord.stream().map(Record::getMetadata).map(Metadata::getId).toList());
+ assertThat(response.getDeletedLogs()).isEmpty();
}
private void readMenstruationPeriodRecordUsingClientId(List<Record> insertedRecord)
diff --git a/tests/cts/src/android/healthconnect/cts/NutritionRecordTest.java b/tests/cts/src/android/healthconnect/cts/NutritionRecordTest.java
index 5812d96..b86d5fb 100644
--- a/tests/cts/src/android/healthconnect/cts/NutritionRecordTest.java
+++ b/tests/cts/src/android/healthconnect/cts/NutritionRecordTest.java
@@ -734,13 +734,7 @@
.addRecordType(NutritionRecord.class)
.build());
response = TestUtils.getChangeLogs(changeLogsRequest);
- assertThat(response.getDeletedLogs().size()).isEqualTo(testRecord.size());
- assertThat(
- response.getDeletedLogs().stream()
- .map(ChangeLogsResponse.DeletedLog::getDeletedRecordId)
- .toList())
- .containsExactlyElementsIn(
- testRecord.stream().map(Record::getMetadata).map(Metadata::getId).toList());
+ assertThat(response.getDeletedLogs()).isEmpty();
}
private void readNutritionRecordUsingClientId(List<Record> insertedRecord)
diff --git a/tests/cts/src/android/healthconnect/cts/OvulationTestRecordTest.java b/tests/cts/src/android/healthconnect/cts/OvulationTestRecordTest.java
index 7c1e8ca..c897b19 100644
--- a/tests/cts/src/android/healthconnect/cts/OvulationTestRecordTest.java
+++ b/tests/cts/src/android/healthconnect/cts/OvulationTestRecordTest.java
@@ -478,13 +478,7 @@
.addRecordType(OvulationTestRecord.class)
.build());
response = TestUtils.getChangeLogs(changeLogsRequest);
- assertThat(response.getDeletedLogs().size()).isEqualTo(testRecord.size());
- assertThat(
- response.getDeletedLogs().stream()
- .map(ChangeLogsResponse.DeletedLog::getDeletedRecordId)
- .toList())
- .containsExactlyElementsIn(
- testRecord.stream().map(Record::getMetadata).map(Metadata::getId).toList());
+ assertThat(response.getDeletedLogs()).isEmpty();
}
OvulationTestRecord getOvulationTestRecord_update(
diff --git a/tests/cts/src/android/healthconnect/cts/OxygenSaturationRecordTest.java b/tests/cts/src/android/healthconnect/cts/OxygenSaturationRecordTest.java
index ed1624c..f978789 100644
--- a/tests/cts/src/android/healthconnect/cts/OxygenSaturationRecordTest.java
+++ b/tests/cts/src/android/healthconnect/cts/OxygenSaturationRecordTest.java
@@ -496,13 +496,7 @@
.addRecordType(OxygenSaturationRecord.class)
.build());
response = TestUtils.getChangeLogs(changeLogsRequest);
- assertThat(response.getDeletedLogs().size()).isEqualTo(testRecord.size());
- assertThat(
- response.getDeletedLogs().stream()
- .map(ChangeLogsResponse.DeletedLog::getDeletedRecordId)
- .toList())
- .containsExactlyElementsIn(
- testRecord.stream().map(Record::getMetadata).map(Metadata::getId).toList());
+ assertThat(response.getDeletedLogs()).isEmpty();
}
OxygenSaturationRecord getOxygenSaturationRecord_update(
diff --git a/tests/cts/src/android/healthconnect/cts/PowerRecordTest.java b/tests/cts/src/android/healthconnect/cts/PowerRecordTest.java
index 9d70f22..0797735 100644
--- a/tests/cts/src/android/healthconnect/cts/PowerRecordTest.java
+++ b/tests/cts/src/android/healthconnect/cts/PowerRecordTest.java
@@ -482,13 +482,7 @@
TestUtils.verifyDeleteRecords(
new DeleteUsingFiltersRequest.Builder().addRecordType(PowerRecord.class).build());
response = TestUtils.getChangeLogs(changeLogsRequest);
- assertThat(response.getDeletedLogs().size()).isEqualTo(testRecord.size());
- assertThat(
- response.getDeletedLogs().stream()
- .map(ChangeLogsResponse.DeletedLog::getDeletedRecordId)
- .toList())
- .containsExactlyElementsIn(
- testRecord.stream().map(Record::getMetadata).map(Metadata::getId).toList());
+ assertThat(response.getDeletedLogs()).isEmpty();
}
private void testReadPowerRecordIds() throws InterruptedException {
diff --git a/tests/cts/src/android/healthconnect/cts/RespiratoryRateRecordTest.java b/tests/cts/src/android/healthconnect/cts/RespiratoryRateRecordTest.java
index f1a2cbd..d86c828 100644
--- a/tests/cts/src/android/healthconnect/cts/RespiratoryRateRecordTest.java
+++ b/tests/cts/src/android/healthconnect/cts/RespiratoryRateRecordTest.java
@@ -492,13 +492,7 @@
.addRecordType(RespiratoryRateRecord.class)
.build());
response = TestUtils.getChangeLogs(changeLogsRequest);
- assertThat(response.getDeletedLogs().size()).isEqualTo(testRecord.size());
- assertThat(
- response.getDeletedLogs().stream()
- .map(ChangeLogsResponse.DeletedLog::getDeletedRecordId)
- .toList())
- .containsExactlyElementsIn(
- testRecord.stream().map(Record::getMetadata).map(Metadata::getId).toList());
+ assertThat(response.getDeletedLogs()).isEmpty();
}
RespiratoryRateRecord getRespiratoryRateRecord_update(
diff --git a/tests/cts/src/android/healthconnect/cts/RestingHeartRateRecordTest.java b/tests/cts/src/android/healthconnect/cts/RestingHeartRateRecordTest.java
index d28640e..b537b52 100644
--- a/tests/cts/src/android/healthconnect/cts/RestingHeartRateRecordTest.java
+++ b/tests/cts/src/android/healthconnect/cts/RestingHeartRateRecordTest.java
@@ -542,13 +542,7 @@
.addRecordType(RestingHeartRateRecord.class)
.build());
response = TestUtils.getChangeLogs(changeLogsRequest);
- assertThat(response.getDeletedLogs().size()).isEqualTo(testRecord.size());
- assertThat(
- response.getDeletedLogs().stream()
- .map(ChangeLogsResponse.DeletedLog::getDeletedRecordId)
- .toList())
- .containsExactlyElementsIn(
- testRecord.stream().map(Record::getMetadata).map(Metadata::getId).toList());
+ assertThat(response.getDeletedLogs()).isEmpty();
}
RestingHeartRateRecord getRestingHeartRateRecord_update(
diff --git a/tests/cts/src/android/healthconnect/cts/SexualActivityRecordTest.java b/tests/cts/src/android/healthconnect/cts/SexualActivityRecordTest.java
index 44c6fd8..d63965e 100644
--- a/tests/cts/src/android/healthconnect/cts/SexualActivityRecordTest.java
+++ b/tests/cts/src/android/healthconnect/cts/SexualActivityRecordTest.java
@@ -478,13 +478,7 @@
.addRecordType(SexualActivityRecord.class)
.build());
response = TestUtils.getChangeLogs(changeLogsRequest);
- assertThat(response.getDeletedLogs().size()).isEqualTo(testRecord.size());
- assertThat(
- response.getDeletedLogs().stream()
- .map(ChangeLogsResponse.DeletedLog::getDeletedRecordId)
- .toList())
- .containsExactlyElementsIn(
- testRecord.stream().map(Record::getMetadata).map(Metadata::getId).toList());
+ assertThat(response.getDeletedLogs()).isEmpty();
}
SexualActivityRecord getSexualActivityRecord_update(
diff --git a/tests/cts/src/android/healthconnect/cts/SleepSessionRecordTest.java b/tests/cts/src/android/healthconnect/cts/SleepSessionRecordTest.java
index 156f388..d781438 100644
--- a/tests/cts/src/android/healthconnect/cts/SleepSessionRecordTest.java
+++ b/tests/cts/src/android/healthconnect/cts/SleepSessionRecordTest.java
@@ -441,13 +441,7 @@
.addRecordType(SleepSessionRecord.class)
.build());
response = TestUtils.getChangeLogs(changeLogsRequest);
- assertThat(response.getDeletedLogs().size()).isEqualTo(testRecord.size());
- assertThat(
- response.getDeletedLogs().stream()
- .map(ChangeLogsResponse.DeletedLog::getDeletedRecordId)
- .toList())
- .containsExactlyElementsIn(
- testRecord.stream().map(Record::getMetadata).map(Metadata::getId).toList());
+ assertThat(response.getDeletedLogs()).isEmpty();
}
private void assertRecordsAreEqual(List<Record> records, List<SleepSessionRecord> result) {
diff --git a/tests/cts/src/android/healthconnect/cts/SpeedRecordTest.java b/tests/cts/src/android/healthconnect/cts/SpeedRecordTest.java
index f3c3cfb..f66683d 100644
--- a/tests/cts/src/android/healthconnect/cts/SpeedRecordTest.java
+++ b/tests/cts/src/android/healthconnect/cts/SpeedRecordTest.java
@@ -329,13 +329,7 @@
TestUtils.verifyDeleteRecords(
new DeleteUsingFiltersRequest.Builder().addRecordType(SpeedRecord.class).build());
response = TestUtils.getChangeLogs(changeLogsRequest);
- assertThat(response.getDeletedLogs().size()).isEqualTo(testRecord.size());
- assertThat(
- response.getDeletedLogs().stream()
- .map(ChangeLogsResponse.DeletedLog::getDeletedRecordId)
- .toList())
- .containsExactlyElementsIn(
- testRecord.stream().map(Record::getMetadata).map(Metadata::getId).toList());
+ assertThat(response.getDeletedLogs()).isEmpty();
}
private void testReadSpeedRecordIds() throws InterruptedException {
diff --git a/tests/cts/src/android/healthconnect/cts/StepsCadenceRecordTest.java b/tests/cts/src/android/healthconnect/cts/StepsCadenceRecordTest.java
index 440ef20..b2b89e1 100644
--- a/tests/cts/src/android/healthconnect/cts/StepsCadenceRecordTest.java
+++ b/tests/cts/src/android/healthconnect/cts/StepsCadenceRecordTest.java
@@ -457,13 +457,7 @@
.addRecordType(StepsCadenceRecord.class)
.build());
response = TestUtils.getChangeLogs(changeLogsRequest);
- assertThat(response.getDeletedLogs().size()).isEqualTo(testRecord.size());
- assertThat(
- response.getDeletedLogs().stream()
- .map(ChangeLogsResponse.DeletedLog::getDeletedRecordId)
- .toList())
- .containsExactlyElementsIn(
- testRecord.stream().map(Record::getMetadata).map(Metadata::getId).toList());
+ assertThat(response.getDeletedLogs()).isEmpty();
}
private void testReadStepsCadenceRecordIds() throws InterruptedException {
diff --git a/tests/cts/src/android/healthconnect/cts/StepsRecordTest.java b/tests/cts/src/android/healthconnect/cts/StepsRecordTest.java
index aa4b2ca..b71df14 100644
--- a/tests/cts/src/android/healthconnect/cts/StepsRecordTest.java
+++ b/tests/cts/src/android/healthconnect/cts/StepsRecordTest.java
@@ -937,13 +937,7 @@
TestUtils.verifyDeleteRecords(
new DeleteUsingFiltersRequest.Builder().addRecordType(StepsRecord.class).build());
response = TestUtils.getChangeLogs(changeLogsRequest);
- assertThat(response.getDeletedLogs().size()).isEqualTo(testRecord.size());
- assertThat(
- response.getDeletedLogs().stream()
- .map(ChangeLogsResponse.DeletedLog::getDeletedRecordId)
- .toList())
- .containsExactlyElementsIn(
- testRecord.stream().map(Record::getMetadata).map(Metadata::getId).toList());
+ assertThat(response.getDeletedLogs()).isEmpty();
}
private void insertStepsRecordWithDelay(long delayInMillis, int times)
diff --git a/tests/cts/src/android/healthconnect/cts/TotalCaloriesBurnedRecordTest.java b/tests/cts/src/android/healthconnect/cts/TotalCaloriesBurnedRecordTest.java
index 0648244..666858e 100644
--- a/tests/cts/src/android/healthconnect/cts/TotalCaloriesBurnedRecordTest.java
+++ b/tests/cts/src/android/healthconnect/cts/TotalCaloriesBurnedRecordTest.java
@@ -452,13 +452,7 @@
.addRecordType(TotalCaloriesBurnedRecord.class)
.build());
response = TestUtils.getChangeLogs(changeLogsRequest);
- assertThat(response.getDeletedLogs().size()).isEqualTo(testRecord.size());
- assertThat(
- response.getDeletedLogs().stream()
- .map(ChangeLogsResponse.DeletedLog::getDeletedRecordId)
- .toList())
- .containsExactlyElementsIn(
- testRecord.stream().map(Record::getMetadata).map(Metadata::getId).toList());
+ assertThat(response.getDeletedLogs()).isEmpty();
}
private void readTotalCaloriesBurnedRecordUsingClientId(List<Record> insertedRecord)
diff --git a/tests/cts/src/android/healthconnect/cts/Vo2MaxRecordTest.java b/tests/cts/src/android/healthconnect/cts/Vo2MaxRecordTest.java
index 4ac6d9b..e83f2ea 100644
--- a/tests/cts/src/android/healthconnect/cts/Vo2MaxRecordTest.java
+++ b/tests/cts/src/android/healthconnect/cts/Vo2MaxRecordTest.java
@@ -460,13 +460,7 @@
TestUtils.verifyDeleteRecords(
new DeleteUsingFiltersRequest.Builder().addRecordType(Vo2MaxRecord.class).build());
response = TestUtils.getChangeLogs(changeLogsRequest);
- assertThat(response.getDeletedLogs().size()).isEqualTo(testRecord.size());
- assertThat(
- response.getDeletedLogs().stream()
- .map(ChangeLogsResponse.DeletedLog::getDeletedRecordId)
- .toList())
- .containsExactlyElementsIn(
- testRecord.stream().map(Record::getMetadata).map(Metadata::getId).toList());
+ assertThat(response.getDeletedLogs()).isEmpty();
}
Vo2MaxRecord getVo2MaxRecord_update(Record record, String id, String clientRecordId) {
diff --git a/tests/cts/src/android/healthconnect/cts/WeightRecordTest.java b/tests/cts/src/android/healthconnect/cts/WeightRecordTest.java
index a863346..da544a42 100644
--- a/tests/cts/src/android/healthconnect/cts/WeightRecordTest.java
+++ b/tests/cts/src/android/healthconnect/cts/WeightRecordTest.java
@@ -477,13 +477,7 @@
TestUtils.verifyDeleteRecords(
new DeleteUsingFiltersRequest.Builder().addRecordType(WeightRecord.class).build());
response = TestUtils.getChangeLogs(changeLogsRequest);
- assertThat(response.getDeletedLogs().size()).isEqualTo(testRecord.size());
- assertThat(
- response.getDeletedLogs().stream()
- .map(ChangeLogsResponse.DeletedLog::getDeletedRecordId)
- .toList())
- .containsExactlyElementsIn(
- testRecord.stream().map(Record::getMetadata).map(Metadata::getId).toList());
+ assertThat(response.getDeletedLogs()).isEmpty();
}
private void readWeightRecordUsingClientId(List<Record> insertedRecord)
diff --git a/tests/cts/src/android/healthconnect/cts/WheelchairPushesRecordTest.java b/tests/cts/src/android/healthconnect/cts/WheelchairPushesRecordTest.java
index 1cc5adc..ed49508 100644
--- a/tests/cts/src/android/healthconnect/cts/WheelchairPushesRecordTest.java
+++ b/tests/cts/src/android/healthconnect/cts/WheelchairPushesRecordTest.java
@@ -424,13 +424,7 @@
.addRecordType(WheelchairPushesRecord.class)
.build());
response = TestUtils.getChangeLogs(changeLogsRequest);
- assertThat(response.getDeletedLogs().size()).isEqualTo(testRecord.size());
- assertThat(
- response.getDeletedLogs().stream()
- .map(ChangeLogsResponse.DeletedLog::getDeletedRecordId)
- .toList())
- .containsExactlyElementsIn(
- testRecord.stream().map(Record::getMetadata).map(Metadata::getId).toList());
+ assertThat(response.getDeletedLogs()).isEmpty();
}
private void readWheelchairPushesRecordUsingClientId(List<Record> insertedRecord)
