Merge ab/AP4A.241205.013 into aosp-main-future
Bug: 370570306
Merged-In: I515e9162fb134a4de44f0503cd161575a8126f73
Change-Id: I5515b0e56708d5566a1cbd138db65d1886baf953
diff --git a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
index c1c73a1..7db7204 100644
--- a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
+++ b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
@@ -1,6 +1,6 @@
drops {
android_build_drop {
- build_id: "12373408"
+ build_id: "12509279"
target: "train_build"
source_file: "mainline-sdks/for-latest-build/current/com.google.android.healthfitness/sdk/healthfitness-module-sdk-current.zip"
}
diff --git a/current/hiddenapi/annotation-flags.csv b/current/hiddenapi/annotation-flags.csv
index 521638d..987bfef 100644
--- a/current/hiddenapi/annotation-flags.csv
+++ b/current/hiddenapi/annotation-flags.csv
@@ -1,15 +1,19 @@
+Lcom/android/healthfitness/flags/CustomFeatureFlags;->dependencyInjection()Z,unsupported
Lcom/android/healthfitness/flags/CustomFeatureFlags;->exportImport()Z,unsupported
Lcom/android/healthfitness/flags/CustomFeatureFlags;->mindfulness()Z,unsupported
Lcom/android/healthfitness/flags/CustomFeatureFlags;->personalHealthRecord()Z,unsupported
Lcom/android/healthfitness/flags/CustomFeatureFlags;->personalHealthRecordDatabase()Z,unsupported
+Lcom/android/healthfitness/flags/FeatureFlags;->dependencyInjection()Z,unsupported
Lcom/android/healthfitness/flags/FeatureFlags;->exportImport()Z,unsupported
Lcom/android/healthfitness/flags/FeatureFlags;->mindfulness()Z,unsupported
Lcom/android/healthfitness/flags/FeatureFlags;->personalHealthRecord()Z,unsupported
Lcom/android/healthfitness/flags/FeatureFlags;->personalHealthRecordDatabase()Z,unsupported
+Lcom/android/healthfitness/flags/FeatureFlagsImpl;->dependencyInjection()Z,unsupported
Lcom/android/healthfitness/flags/FeatureFlagsImpl;->exportImport()Z,unsupported
Lcom/android/healthfitness/flags/FeatureFlagsImpl;->mindfulness()Z,unsupported
Lcom/android/healthfitness/flags/FeatureFlagsImpl;->personalHealthRecord()Z,unsupported
Lcom/android/healthfitness/flags/FeatureFlagsImpl;->personalHealthRecordDatabase()Z,unsupported
+Lcom/android/healthfitness/flags/Flags;->dependencyInjection()Z,unsupported
Lcom/android/healthfitness/flags/Flags;->exportImport()Z,unsupported
Lcom/android/healthfitness/flags/Flags;->mindfulness()Z,unsupported
Lcom/android/healthfitness/flags/Flags;->personalHealthRecord()Z,unsupported
diff --git a/current/hiddenapi/filtered-flags.csv b/current/hiddenapi/filtered-flags.csv
index 9e17a41..1598014 100644
--- a/current/hiddenapi/filtered-flags.csv
+++ b/current/hiddenapi/filtered-flags.csv
@@ -30,6 +30,13 @@
Landroid/health/connect/CreateMedicalDataSourceRequest;->hashCode()I,core-platform-api,public-api,sdk,system-api,test-api
Landroid/health/connect/CreateMedicalDataSourceRequest;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
Landroid/health/connect/CreateMedicalDataSourceRequest;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
+Landroid/health/connect/DeleteMedicalResourcesRequest$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
+Landroid/health/connect/DeleteMedicalResourcesRequest$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
+Landroid/health/connect/DeleteMedicalResourcesRequest;->describeContents()I,public-api,sdk,system-api,test-api
+Landroid/health/connect/DeleteMedicalResourcesRequest;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/health/connect/DeleteMedicalResourcesRequest;->hashCode()I,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/health/connect/DeleteMedicalResourcesRequest;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/health/connect/DeleteMedicalResourcesRequest;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
Landroid/health/connect/DeleteUsingFiltersRequest$Builder;-><init>()V,sdk,system-api,test-api
Landroid/health/connect/DeleteUsingFiltersRequest$Builder;->addDataOrigin(Landroid/health/connect/datatypes/DataOrigin;)Landroid/health/connect/DeleteUsingFiltersRequest$Builder;,sdk,system-api,test-api
Landroid/health/connect/DeleteUsingFiltersRequest$Builder;->addRecordType(Ljava/lang/Class;)Landroid/health/connect/DeleteUsingFiltersRequest$Builder;,sdk,system-api,test-api
@@ -194,6 +201,7 @@
Landroid/health/connect/HealthPermissionCategory;->VO2_MAX:I,sdk,system-api,test-api
Landroid/health/connect/HealthPermissionCategory;->WEIGHT:I,sdk,system-api,test-api
Landroid/health/connect/HealthPermissionCategory;->WHEELCHAIR_PUSHES:I,sdk,system-api,test-api
+Landroid/health/connect/HealthPermissions$$ExternalSyntheticLambda0;->accept(Ljava/lang/Object;Ljava/lang/Object;)V,core-platform-api,public-api,sdk,system-api,test-api
Landroid/health/connect/HealthPermissions;->HEALTH_PERMISSION_GROUP:Ljava/lang/String;,sdk,system-api,test-api
Landroid/health/connect/HealthPermissions;->MANAGE_HEALTH_DATA_PERMISSION:Ljava/lang/String;,sdk,system-api,test-api
Landroid/health/connect/HealthPermissions;->MANAGE_HEALTH_PERMISSIONS:Ljava/lang/String;,sdk,system-api,test-api
@@ -468,6 +476,14 @@
Landroid/health/connect/aidl/IInsertRecordsResponseCallback$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
Landroid/health/connect/aidl/IInsertRecordsResponseCallback$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
Landroid/health/connect/aidl/IInsertRecordsResponseCallback$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,sdk,system-api,test-api
+Landroid/health/connect/aidl/IMedicalDataSourceResponseCallback$Default;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
+Landroid/health/connect/aidl/IMedicalDataSourceResponseCallback$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
+Landroid/health/connect/aidl/IMedicalDataSourceResponseCallback$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
+Landroid/health/connect/aidl/IMedicalDataSourceResponseCallback$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,sdk,system-api,test-api
+Landroid/health/connect/aidl/IMedicalResourcesResponseCallback$Default;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
+Landroid/health/connect/aidl/IMedicalResourcesResponseCallback$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
+Landroid/health/connect/aidl/IMedicalResourcesResponseCallback$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
+Landroid/health/connect/aidl/IMedicalResourcesResponseCallback$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,sdk,system-api,test-api
Landroid/health/connect/aidl/IMigrationCallback$Default;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
Landroid/health/connect/aidl/IMigrationCallback$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
Landroid/health/connect/aidl/IMigrationCallback$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
@@ -488,11 +504,6 @@
Landroid/health/connect/aidl/InsertRecordsResponseParcel$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
Landroid/health/connect/aidl/InsertRecordsResponseParcel;->describeContents()I,public-api,sdk,system-api,test-api
Landroid/health/connect/aidl/InsertRecordsResponseParcel;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
-Landroid/health/connect/aidl/MedicalIdFiltersParcel$$ExternalSyntheticLambda0;->accept(Ljava/lang/Object;)V,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/health/connect/aidl/MedicalIdFiltersParcel$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
-Landroid/health/connect/aidl/MedicalIdFiltersParcel$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
-Landroid/health/connect/aidl/MedicalIdFiltersParcel;->describeContents()I,public-api,sdk,system-api,test-api
-Landroid/health/connect/aidl/MedicalIdFiltersParcel;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
Landroid/health/connect/aidl/ReadRecordsRequestParcel$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
Landroid/health/connect/aidl/ReadRecordsRequestParcel$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
Landroid/health/connect/aidl/ReadRecordsRequestParcel;->describeContents()I,public-api,sdk,system-api,test-api
@@ -1024,6 +1035,20 @@
Landroid/health/connect/datatypes/ExerciseSessionType;->EXERCISE_SESSION_TYPE_WEIGHTLIFTING:I,public-api,sdk,system-api,test-api
Landroid/health/connect/datatypes/ExerciseSessionType;->EXERCISE_SESSION_TYPE_WHEELCHAIR:I,public-api,sdk,system-api,test-api
Landroid/health/connect/datatypes/ExerciseSessionType;->EXERCISE_SESSION_TYPE_YOGA:I,public-api,sdk,system-api,test-api
+Landroid/health/connect/datatypes/FhirResource$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
+Landroid/health/connect/datatypes/FhirResource$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
+Landroid/health/connect/datatypes/FhirResource;->describeContents()I,public-api,sdk,system-api,test-api
+Landroid/health/connect/datatypes/FhirResource;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/health/connect/datatypes/FhirResource;->hashCode()I,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/health/connect/datatypes/FhirResource;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/health/connect/datatypes/FhirResource;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
+Landroid/health/connect/datatypes/FhirVersion$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
+Landroid/health/connect/datatypes/FhirVersion$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
+Landroid/health/connect/datatypes/FhirVersion;->describeContents()I,public-api,sdk,system-api,test-api
+Landroid/health/connect/datatypes/FhirVersion;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/health/connect/datatypes/FhirVersion;->hashCode()I,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/health/connect/datatypes/FhirVersion;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/health/connect/datatypes/FhirVersion;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
Landroid/health/connect/datatypes/FloorsClimbedRecord$Builder;-><init>(Landroid/health/connect/datatypes/Metadata;Ljava/time/Instant;Ljava/time/Instant;D)V,public-api,sdk,system-api,test-api
Landroid/health/connect/datatypes/FloorsClimbedRecord$Builder;->build()Landroid/health/connect/datatypes/FloorsClimbedRecord;,public-api,sdk,system-api,test-api
Landroid/health/connect/datatypes/FloorsClimbedRecord$Builder;->clearEndZoneOffset()Landroid/health/connect/datatypes/FloorsClimbedRecord$Builder;,public-api,sdk,system-api,test-api
@@ -1748,8 +1773,6 @@
Landroid/health/connect/internal/datatypes/ExerciseSegmentInternal;->hashCode()I,core-platform-api,public-api,sdk,system-api,test-api
Landroid/health/connect/internal/datatypes/HeartRateRecordInternal$HeartRateSample;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
Landroid/health/connect/internal/datatypes/HeartRateRecordInternal$HeartRateSample;->hashCode()I,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/health/connect/internal/datatypes/MedicalResourceInternal;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/health/connect/internal/datatypes/MedicalResourceInternal;->hashCode()I,core-platform-api,public-api,sdk,system-api,test-api
Landroid/health/connect/internal/datatypes/PowerRecordInternal$PowerRecordSample;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
Landroid/health/connect/internal/datatypes/PowerRecordInternal$PowerRecordSample;->hashCode()I,core-platform-api,public-api,sdk,system-api,test-api
Landroid/health/connect/internal/datatypes/SkinTemperatureRecordInternal$SkinTemperatureDeltaSample;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
@@ -1877,18 +1900,23 @@
Lcom/android/healthfitness/flags/CustomFeatureFlags$$ExternalSyntheticLambda1;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
Lcom/android/healthfitness/flags/CustomFeatureFlags$$ExternalSyntheticLambda2;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
Lcom/android/healthfitness/flags/CustomFeatureFlags$$ExternalSyntheticLambda3;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
+Lcom/android/healthfitness/flags/CustomFeatureFlags$$ExternalSyntheticLambda4;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
+Lcom/android/healthfitness/flags/CustomFeatureFlags;->dependencyInjection()Z,unsupported
Lcom/android/healthfitness/flags/CustomFeatureFlags;->exportImport()Z,unsupported
Lcom/android/healthfitness/flags/CustomFeatureFlags;->mindfulness()Z,unsupported
Lcom/android/healthfitness/flags/CustomFeatureFlags;->personalHealthRecord()Z,unsupported
Lcom/android/healthfitness/flags/CustomFeatureFlags;->personalHealthRecordDatabase()Z,unsupported
+Lcom/android/healthfitness/flags/FeatureFlags;->dependencyInjection()Z,unsupported
Lcom/android/healthfitness/flags/FeatureFlags;->exportImport()Z,unsupported
Lcom/android/healthfitness/flags/FeatureFlags;->mindfulness()Z,unsupported
Lcom/android/healthfitness/flags/FeatureFlags;->personalHealthRecord()Z,unsupported
Lcom/android/healthfitness/flags/FeatureFlags;->personalHealthRecordDatabase()Z,unsupported
+Lcom/android/healthfitness/flags/FeatureFlagsImpl;->dependencyInjection()Z,unsupported
Lcom/android/healthfitness/flags/FeatureFlagsImpl;->exportImport()Z,unsupported
Lcom/android/healthfitness/flags/FeatureFlagsImpl;->mindfulness()Z,unsupported
Lcom/android/healthfitness/flags/FeatureFlagsImpl;->personalHealthRecord()Z,unsupported
Lcom/android/healthfitness/flags/FeatureFlagsImpl;->personalHealthRecordDatabase()Z,unsupported
+Lcom/android/healthfitness/flags/Flags;->dependencyInjection()Z,unsupported
Lcom/android/healthfitness/flags/Flags;->exportImport()Z,unsupported
Lcom/android/healthfitness/flags/Flags;->mindfulness()Z,unsupported
Lcom/android/healthfitness/flags/Flags;->personalHealthRecord()Z,unsupported
diff --git a/current/hiddenapi/filtered-stub-flags.csv b/current/hiddenapi/filtered-stub-flags.csv
index bb0113a..cbfd706 100644
--- a/current/hiddenapi/filtered-stub-flags.csv
+++ b/current/hiddenapi/filtered-stub-flags.csv
@@ -30,6 +30,13 @@
Landroid/health/connect/CreateMedicalDataSourceRequest;->hashCode()I,core-platform-api,public-api,system-api,test-api
Landroid/health/connect/CreateMedicalDataSourceRequest;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
Landroid/health/connect/CreateMedicalDataSourceRequest;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
+Landroid/health/connect/DeleteMedicalResourcesRequest$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
+Landroid/health/connect/DeleteMedicalResourcesRequest$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
+Landroid/health/connect/DeleteMedicalResourcesRequest;->describeContents()I,public-api,system-api,test-api
+Landroid/health/connect/DeleteMedicalResourcesRequest;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
+Landroid/health/connect/DeleteMedicalResourcesRequest;->hashCode()I,core-platform-api,public-api,system-api,test-api
+Landroid/health/connect/DeleteMedicalResourcesRequest;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
+Landroid/health/connect/DeleteMedicalResourcesRequest;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
Landroid/health/connect/DeleteUsingFiltersRequest$Builder;-><init>()V,system-api,test-api
Landroid/health/connect/DeleteUsingFiltersRequest$Builder;->addDataOrigin(Landroid/health/connect/datatypes/DataOrigin;)Landroid/health/connect/DeleteUsingFiltersRequest$Builder;,system-api,test-api
Landroid/health/connect/DeleteUsingFiltersRequest$Builder;->addRecordType(Ljava/lang/Class;)Landroid/health/connect/DeleteUsingFiltersRequest$Builder;,system-api,test-api
@@ -194,6 +201,7 @@
Landroid/health/connect/HealthPermissionCategory;->VO2_MAX:I,system-api,test-api
Landroid/health/connect/HealthPermissionCategory;->WEIGHT:I,system-api,test-api
Landroid/health/connect/HealthPermissionCategory;->WHEELCHAIR_PUSHES:I,system-api,test-api
+Landroid/health/connect/HealthPermissions$$ExternalSyntheticLambda0;->accept(Ljava/lang/Object;Ljava/lang/Object;)V,core-platform-api,public-api,system-api,test-api
Landroid/health/connect/HealthPermissions;->HEALTH_PERMISSION_GROUP:Ljava/lang/String;,system-api,test-api
Landroid/health/connect/HealthPermissions;->MANAGE_HEALTH_DATA_PERMISSION:Ljava/lang/String;,system-api,test-api
Landroid/health/connect/HealthPermissions;->MANAGE_HEALTH_PERMISSIONS:Ljava/lang/String;,system-api,test-api
@@ -468,6 +476,14 @@
Landroid/health/connect/aidl/IInsertRecordsResponseCallback$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
Landroid/health/connect/aidl/IInsertRecordsResponseCallback$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
Landroid/health/connect/aidl/IInsertRecordsResponseCallback$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
+Landroid/health/connect/aidl/IMedicalDataSourceResponseCallback$Default;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
+Landroid/health/connect/aidl/IMedicalDataSourceResponseCallback$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
+Landroid/health/connect/aidl/IMedicalDataSourceResponseCallback$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
+Landroid/health/connect/aidl/IMedicalDataSourceResponseCallback$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
+Landroid/health/connect/aidl/IMedicalResourcesResponseCallback$Default;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
+Landroid/health/connect/aidl/IMedicalResourcesResponseCallback$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
+Landroid/health/connect/aidl/IMedicalResourcesResponseCallback$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
+Landroid/health/connect/aidl/IMedicalResourcesResponseCallback$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
Landroid/health/connect/aidl/IMigrationCallback$Default;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
Landroid/health/connect/aidl/IMigrationCallback$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
Landroid/health/connect/aidl/IMigrationCallback$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
@@ -488,11 +504,6 @@
Landroid/health/connect/aidl/InsertRecordsResponseParcel$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
Landroid/health/connect/aidl/InsertRecordsResponseParcel;->describeContents()I,public-api,system-api,test-api
Landroid/health/connect/aidl/InsertRecordsResponseParcel;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
-Landroid/health/connect/aidl/MedicalIdFiltersParcel$$ExternalSyntheticLambda0;->accept(Ljava/lang/Object;)V,core-platform-api,public-api,system-api,test-api
-Landroid/health/connect/aidl/MedicalIdFiltersParcel$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
-Landroid/health/connect/aidl/MedicalIdFiltersParcel$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
-Landroid/health/connect/aidl/MedicalIdFiltersParcel;->describeContents()I,public-api,system-api,test-api
-Landroid/health/connect/aidl/MedicalIdFiltersParcel;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
Landroid/health/connect/aidl/ReadRecordsRequestParcel$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
Landroid/health/connect/aidl/ReadRecordsRequestParcel$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
Landroid/health/connect/aidl/ReadRecordsRequestParcel;->describeContents()I,public-api,system-api,test-api
@@ -1024,6 +1035,20 @@
Landroid/health/connect/datatypes/ExerciseSessionType;->EXERCISE_SESSION_TYPE_WEIGHTLIFTING:I,public-api,system-api,test-api
Landroid/health/connect/datatypes/ExerciseSessionType;->EXERCISE_SESSION_TYPE_WHEELCHAIR:I,public-api,system-api,test-api
Landroid/health/connect/datatypes/ExerciseSessionType;->EXERCISE_SESSION_TYPE_YOGA:I,public-api,system-api,test-api
+Landroid/health/connect/datatypes/FhirResource$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
+Landroid/health/connect/datatypes/FhirResource$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
+Landroid/health/connect/datatypes/FhirResource;->describeContents()I,public-api,system-api,test-api
+Landroid/health/connect/datatypes/FhirResource;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
+Landroid/health/connect/datatypes/FhirResource;->hashCode()I,core-platform-api,public-api,system-api,test-api
+Landroid/health/connect/datatypes/FhirResource;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
+Landroid/health/connect/datatypes/FhirResource;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
+Landroid/health/connect/datatypes/FhirVersion$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
+Landroid/health/connect/datatypes/FhirVersion$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
+Landroid/health/connect/datatypes/FhirVersion;->describeContents()I,public-api,system-api,test-api
+Landroid/health/connect/datatypes/FhirVersion;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
+Landroid/health/connect/datatypes/FhirVersion;->hashCode()I,core-platform-api,public-api,system-api,test-api
+Landroid/health/connect/datatypes/FhirVersion;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
+Landroid/health/connect/datatypes/FhirVersion;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
Landroid/health/connect/datatypes/FloorsClimbedRecord$Builder;-><init>(Landroid/health/connect/datatypes/Metadata;Ljava/time/Instant;Ljava/time/Instant;D)V,public-api,system-api,test-api
Landroid/health/connect/datatypes/FloorsClimbedRecord$Builder;->build()Landroid/health/connect/datatypes/FloorsClimbedRecord;,public-api,system-api,test-api
Landroid/health/connect/datatypes/FloorsClimbedRecord$Builder;->clearEndZoneOffset()Landroid/health/connect/datatypes/FloorsClimbedRecord$Builder;,public-api,system-api,test-api
@@ -1748,8 +1773,6 @@
Landroid/health/connect/internal/datatypes/ExerciseSegmentInternal;->hashCode()I,core-platform-api,public-api,system-api,test-api
Landroid/health/connect/internal/datatypes/HeartRateRecordInternal$HeartRateSample;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
Landroid/health/connect/internal/datatypes/HeartRateRecordInternal$HeartRateSample;->hashCode()I,core-platform-api,public-api,system-api,test-api
-Landroid/health/connect/internal/datatypes/MedicalResourceInternal;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
-Landroid/health/connect/internal/datatypes/MedicalResourceInternal;->hashCode()I,core-platform-api,public-api,system-api,test-api
Landroid/health/connect/internal/datatypes/PowerRecordInternal$PowerRecordSample;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
Landroid/health/connect/internal/datatypes/PowerRecordInternal$PowerRecordSample;->hashCode()I,core-platform-api,public-api,system-api,test-api
Landroid/health/connect/internal/datatypes/SkinTemperatureRecordInternal$SkinTemperatureDeltaSample;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
@@ -1877,3 +1900,4 @@
Lcom/android/healthfitness/flags/CustomFeatureFlags$$ExternalSyntheticLambda1;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
Lcom/android/healthfitness/flags/CustomFeatureFlags$$ExternalSyntheticLambda2;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
Lcom/android/healthfitness/flags/CustomFeatureFlags$$ExternalSyntheticLambda3;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
+Lcom/android/healthfitness/flags/CustomFeatureFlags$$ExternalSyntheticLambda4;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
diff --git a/current/hiddenapi/index.csv b/current/hiddenapi/index.csv
index dfe5b04..d5f7d6a 100644
--- a/current/hiddenapi/index.csv
+++ b/current/hiddenapi/index.csv
@@ -1,17 +1,21 @@
signature,file,startline,startcol,endline,endcol,properties
-Lcom/android/healthfitness/flags/CustomFeatureFlags;->exportImport()Z,out/soong/.intermediates/packages/modules/HealthFitness/flags/healthfitness-aconfig-flags-lib/android_common_apex34/javac/srcjars/com/android/healthfitness/flags/CustomFeatureFlags.java,21,5,21,25,
-Lcom/android/healthfitness/flags/CustomFeatureFlags;->mindfulness()Z,out/soong/.intermediates/packages/modules/HealthFitness/flags/healthfitness-aconfig-flags-lib/android_common_apex34/javac/srcjars/com/android/healthfitness/flags/CustomFeatureFlags.java,28,5,28,25,
-Lcom/android/healthfitness/flags/CustomFeatureFlags;->personalHealthRecord()Z,out/soong/.intermediates/packages/modules/HealthFitness/flags/healthfitness-aconfig-flags-lib/android_common_apex34/javac/srcjars/com/android/healthfitness/flags/CustomFeatureFlags.java,35,5,35,25,
-Lcom/android/healthfitness/flags/CustomFeatureFlags;->personalHealthRecordDatabase()Z,out/soong/.intermediates/packages/modules/HealthFitness/flags/healthfitness-aconfig-flags-lib/android_common_apex34/javac/srcjars/com/android/healthfitness/flags/CustomFeatureFlags.java,42,5,42,25,
-Lcom/android/healthfitness/flags/FeatureFlags;->exportImport()Z,out/soong/.intermediates/packages/modules/HealthFitness/flags/healthfitness-aconfig-flags-lib/android_common_apex34/javac/srcjars/com/android/healthfitness/flags/FeatureFlags.java,9,5,9,25,
-Lcom/android/healthfitness/flags/FeatureFlags;->mindfulness()Z,out/soong/.intermediates/packages/modules/HealthFitness/flags/healthfitness-aconfig-flags-lib/android_common_apex34/javac/srcjars/com/android/healthfitness/flags/FeatureFlags.java,13,5,13,25,
-Lcom/android/healthfitness/flags/FeatureFlags;->personalHealthRecord()Z,out/soong/.intermediates/packages/modules/HealthFitness/flags/healthfitness-aconfig-flags-lib/android_common_apex34/javac/srcjars/com/android/healthfitness/flags/FeatureFlags.java,17,5,17,25,
-Lcom/android/healthfitness/flags/FeatureFlags;->personalHealthRecordDatabase()Z,out/soong/.intermediates/packages/modules/HealthFitness/flags/healthfitness-aconfig-flags-lib/android_common_apex34/javac/srcjars/com/android/healthfitness/flags/FeatureFlags.java,21,5,21,25,
-Lcom/android/healthfitness/flags/FeatureFlagsImpl;->exportImport()Z,out/soong/.intermediates/packages/modules/HealthFitness/flags/healthfitness-aconfig-flags-lib/android_common_apex34/javac/srcjars/com/android/healthfitness/flags/FeatureFlagsImpl.java,8,5,8,25,
-Lcom/android/healthfitness/flags/FeatureFlagsImpl;->mindfulness()Z,out/soong/.intermediates/packages/modules/HealthFitness/flags/healthfitness-aconfig-flags-lib/android_common_apex34/javac/srcjars/com/android/healthfitness/flags/FeatureFlagsImpl.java,15,5,15,25,
-Lcom/android/healthfitness/flags/FeatureFlagsImpl;->personalHealthRecord()Z,out/soong/.intermediates/packages/modules/HealthFitness/flags/healthfitness-aconfig-flags-lib/android_common_apex34/javac/srcjars/com/android/healthfitness/flags/FeatureFlagsImpl.java,22,5,22,25,
-Lcom/android/healthfitness/flags/FeatureFlagsImpl;->personalHealthRecordDatabase()Z,out/soong/.intermediates/packages/modules/HealthFitness/flags/healthfitness-aconfig-flags-lib/android_common_apex34/javac/srcjars/com/android/healthfitness/flags/FeatureFlagsImpl.java,29,5,29,25,
-Lcom/android/healthfitness/flags/Flags;->exportImport()Z,out/soong/.intermediates/packages/modules/HealthFitness/flags/healthfitness-aconfig-flags-lib/android_common_apex34/javac/srcjars/com/android/healthfitness/flags/Flags.java,16,5,16,25,
-Lcom/android/healthfitness/flags/Flags;->mindfulness()Z,out/soong/.intermediates/packages/modules/HealthFitness/flags/healthfitness-aconfig-flags-lib/android_common_apex34/javac/srcjars/com/android/healthfitness/flags/Flags.java,22,5,22,25,
-Lcom/android/healthfitness/flags/Flags;->personalHealthRecord()Z,out/soong/.intermediates/packages/modules/HealthFitness/flags/healthfitness-aconfig-flags-lib/android_common_apex34/javac/srcjars/com/android/healthfitness/flags/Flags.java,28,5,28,25,
-Lcom/android/healthfitness/flags/Flags;->personalHealthRecordDatabase()Z,out/soong/.intermediates/packages/modules/HealthFitness/flags/healthfitness-aconfig-flags-lib/android_common_apex34/javac/srcjars/com/android/healthfitness/flags/Flags.java,34,5,34,25,
+Lcom/android/healthfitness/flags/CustomFeatureFlags;->dependencyInjection()Z,out/soong/.intermediates/packages/modules/HealthFitness/flags/healthfitness-aconfig-flags-lib/android_common_apex34/javac/srcjars/com/android/healthfitness/flags/CustomFeatureFlags.java,21,5,21,25,
+Lcom/android/healthfitness/flags/CustomFeatureFlags;->exportImport()Z,out/soong/.intermediates/packages/modules/HealthFitness/flags/healthfitness-aconfig-flags-lib/android_common_apex34/javac/srcjars/com/android/healthfitness/flags/CustomFeatureFlags.java,28,5,28,25,
+Lcom/android/healthfitness/flags/CustomFeatureFlags;->mindfulness()Z,out/soong/.intermediates/packages/modules/HealthFitness/flags/healthfitness-aconfig-flags-lib/android_common_apex34/javac/srcjars/com/android/healthfitness/flags/CustomFeatureFlags.java,35,5,35,25,
+Lcom/android/healthfitness/flags/CustomFeatureFlags;->personalHealthRecord()Z,out/soong/.intermediates/packages/modules/HealthFitness/flags/healthfitness-aconfig-flags-lib/android_common_apex34/javac/srcjars/com/android/healthfitness/flags/CustomFeatureFlags.java,42,5,42,25,
+Lcom/android/healthfitness/flags/CustomFeatureFlags;->personalHealthRecordDatabase()Z,out/soong/.intermediates/packages/modules/HealthFitness/flags/healthfitness-aconfig-flags-lib/android_common_apex34/javac/srcjars/com/android/healthfitness/flags/CustomFeatureFlags.java,49,5,49,25,
+Lcom/android/healthfitness/flags/FeatureFlags;->dependencyInjection()Z,out/soong/.intermediates/packages/modules/HealthFitness/flags/healthfitness-aconfig-flags-lib/android_common_apex34/javac/srcjars/com/android/healthfitness/flags/FeatureFlags.java,9,5,9,25,
+Lcom/android/healthfitness/flags/FeatureFlags;->exportImport()Z,out/soong/.intermediates/packages/modules/HealthFitness/flags/healthfitness-aconfig-flags-lib/android_common_apex34/javac/srcjars/com/android/healthfitness/flags/FeatureFlags.java,13,5,13,25,
+Lcom/android/healthfitness/flags/FeatureFlags;->mindfulness()Z,out/soong/.intermediates/packages/modules/HealthFitness/flags/healthfitness-aconfig-flags-lib/android_common_apex34/javac/srcjars/com/android/healthfitness/flags/FeatureFlags.java,17,5,17,25,
+Lcom/android/healthfitness/flags/FeatureFlags;->personalHealthRecord()Z,out/soong/.intermediates/packages/modules/HealthFitness/flags/healthfitness-aconfig-flags-lib/android_common_apex34/javac/srcjars/com/android/healthfitness/flags/FeatureFlags.java,21,5,21,25,
+Lcom/android/healthfitness/flags/FeatureFlags;->personalHealthRecordDatabase()Z,out/soong/.intermediates/packages/modules/HealthFitness/flags/healthfitness-aconfig-flags-lib/android_common_apex34/javac/srcjars/com/android/healthfitness/flags/FeatureFlags.java,25,5,25,25,
+Lcom/android/healthfitness/flags/FeatureFlagsImpl;->dependencyInjection()Z,out/soong/.intermediates/packages/modules/HealthFitness/flags/healthfitness-aconfig-flags-lib/android_common_apex34/javac/srcjars/com/android/healthfitness/flags/FeatureFlagsImpl.java,8,5,8,25,
+Lcom/android/healthfitness/flags/FeatureFlagsImpl;->exportImport()Z,out/soong/.intermediates/packages/modules/HealthFitness/flags/healthfitness-aconfig-flags-lib/android_common_apex34/javac/srcjars/com/android/healthfitness/flags/FeatureFlagsImpl.java,15,5,15,25,
+Lcom/android/healthfitness/flags/FeatureFlagsImpl;->mindfulness()Z,out/soong/.intermediates/packages/modules/HealthFitness/flags/healthfitness-aconfig-flags-lib/android_common_apex34/javac/srcjars/com/android/healthfitness/flags/FeatureFlagsImpl.java,22,5,22,25,
+Lcom/android/healthfitness/flags/FeatureFlagsImpl;->personalHealthRecord()Z,out/soong/.intermediates/packages/modules/HealthFitness/flags/healthfitness-aconfig-flags-lib/android_common_apex34/javac/srcjars/com/android/healthfitness/flags/FeatureFlagsImpl.java,29,5,29,25,
+Lcom/android/healthfitness/flags/FeatureFlagsImpl;->personalHealthRecordDatabase()Z,out/soong/.intermediates/packages/modules/HealthFitness/flags/healthfitness-aconfig-flags-lib/android_common_apex34/javac/srcjars/com/android/healthfitness/flags/FeatureFlagsImpl.java,36,5,36,25,
+Lcom/android/healthfitness/flags/Flags;->dependencyInjection()Z,out/soong/.intermediates/packages/modules/HealthFitness/flags/healthfitness-aconfig-flags-lib/android_common_apex34/javac/srcjars/com/android/healthfitness/flags/Flags.java,18,5,18,25,
+Lcom/android/healthfitness/flags/Flags;->exportImport()Z,out/soong/.intermediates/packages/modules/HealthFitness/flags/healthfitness-aconfig-flags-lib/android_common_apex34/javac/srcjars/com/android/healthfitness/flags/Flags.java,24,5,24,25,
+Lcom/android/healthfitness/flags/Flags;->mindfulness()Z,out/soong/.intermediates/packages/modules/HealthFitness/flags/healthfitness-aconfig-flags-lib/android_common_apex34/javac/srcjars/com/android/healthfitness/flags/Flags.java,30,5,30,25,
+Lcom/android/healthfitness/flags/Flags;->personalHealthRecord()Z,out/soong/.intermediates/packages/modules/HealthFitness/flags/healthfitness-aconfig-flags-lib/android_common_apex34/javac/srcjars/com/android/healthfitness/flags/Flags.java,36,5,36,25,
+Lcom/android/healthfitness/flags/Flags;->personalHealthRecordDatabase()Z,out/soong/.intermediates/packages/modules/HealthFitness/flags/healthfitness-aconfig-flags-lib/android_common_apex34/javac/srcjars/com/android/healthfitness/flags/Flags.java,42,5,42,25,
diff --git a/current/hiddenapi/metadata.csv b/current/hiddenapi/metadata.csv
index cdc3800..ef991dd 100644
--- a/current/hiddenapi/metadata.csv
+++ b/current/hiddenapi/metadata.csv
@@ -1,16 +1,20 @@
signature
+|Lcom/android/healthfitness/flags/CustomFeatureFlags;->dependencyInjection()Z|
|Lcom/android/healthfitness/flags/CustomFeatureFlags;->exportImport()Z|
|Lcom/android/healthfitness/flags/CustomFeatureFlags;->mindfulness()Z|
|Lcom/android/healthfitness/flags/CustomFeatureFlags;->personalHealthRecord()Z|
|Lcom/android/healthfitness/flags/CustomFeatureFlags;->personalHealthRecordDatabase()Z|
+|Lcom/android/healthfitness/flags/FeatureFlags;->dependencyInjection()Z|
|Lcom/android/healthfitness/flags/FeatureFlags;->exportImport()Z|
|Lcom/android/healthfitness/flags/FeatureFlags;->mindfulness()Z|
|Lcom/android/healthfitness/flags/FeatureFlags;->personalHealthRecord()Z|
|Lcom/android/healthfitness/flags/FeatureFlags;->personalHealthRecordDatabase()Z|
+|Lcom/android/healthfitness/flags/FeatureFlagsImpl;->dependencyInjection()Z|
|Lcom/android/healthfitness/flags/FeatureFlagsImpl;->exportImport()Z|
|Lcom/android/healthfitness/flags/FeatureFlagsImpl;->mindfulness()Z|
|Lcom/android/healthfitness/flags/FeatureFlagsImpl;->personalHealthRecord()Z|
|Lcom/android/healthfitness/flags/FeatureFlagsImpl;->personalHealthRecordDatabase()Z|
+|Lcom/android/healthfitness/flags/Flags;->dependencyInjection()Z|
|Lcom/android/healthfitness/flags/Flags;->exportImport()Z|
|Lcom/android/healthfitness/flags/Flags;->mindfulness()Z|
|Lcom/android/healthfitness/flags/Flags;->personalHealthRecord()Z|
diff --git a/current/hiddenapi/signature-patterns.csv b/current/hiddenapi/signature-patterns.csv
index a6a51d7..42448d7 100644
--- a/current/hiddenapi/signature-patterns.csv
+++ b/current/hiddenapi/signature-patterns.csv
@@ -7,6 +7,7 @@
android/health/connect/ApplicationInfoResponse
android/health/connect/Constants
android/health/connect/CreateMedicalDataSourceRequest
+android/health/connect/DeleteMedicalResourcesRequest
android/health/connect/DeleteUsingFiltersRequest
android/health/connect/FetchDataOriginsPriorityOrderResponse
android/health/connect/HealthApiVersion
@@ -19,7 +20,6 @@
android/health/connect/HealthServicesInitializer
android/health/connect/InsertRecordsResponse
android/health/connect/LocalTimeRangeFilter
-android/health/connect/MedicalIdFilter
android/health/connect/MedicalPermissionCategory
android/health/connect/MedicalResourceId
android/health/connect/PageTokenWrapper
@@ -59,12 +59,13 @@
android/health/connect/aidl/IGetPriorityResponseCallback
android/health/connect/aidl/IHealthConnectService
android/health/connect/aidl/IInsertRecordsResponseCallback
+android/health/connect/aidl/IMedicalDataSourceResponseCallback
+android/health/connect/aidl/IMedicalResourcesResponseCallback
android/health/connect/aidl/IMigrationCallback
android/health/connect/aidl/IReadMedicalResourcesResponseCallback
android/health/connect/aidl/IReadRecordsResponseCallback
android/health/connect/aidl/IRecordTypeInfoResponseCallback
android/health/connect/aidl/InsertRecordsResponseParcel
-android/health/connect/aidl/MedicalIdFiltersParcel
android/health/connect/aidl/ReadRecordsRequestParcel
android/health/connect/aidl/ReadRecordsResponseParcel
android/health/connect/aidl/RecordIdFiltersParcel
@@ -101,6 +102,8 @@
android/health/connect/datatypes/ExerciseSegmentType
android/health/connect/datatypes/ExerciseSessionRecord
android/health/connect/datatypes/ExerciseSessionType
+android/health/connect/datatypes/FhirResource
+android/health/connect/datatypes/FhirVersion
android/health/connect/datatypes/FloorsClimbedRecord
android/health/connect/datatypes/HeartRateRecord
android/health/connect/datatypes/HeartRateVariabilityRmssdRecord
@@ -191,7 +194,6 @@
android/health/connect/internal/datatypes/IntermenstrualBleedingRecordInternal
android/health/connect/internal/datatypes/IntervalRecordInternal
android/health/connect/internal/datatypes/LeanBodyMassRecordInternal
-android/health/connect/internal/datatypes/MedicalResourceInternal
android/health/connect/internal/datatypes/MenstruationFlowRecordInternal
android/health/connect/internal/datatypes/MenstruationPeriodRecordInternal
android/health/connect/internal/datatypes/MindfulnessSessionRecordInternal
diff --git a/current/snapshot-creation-build-number.txt b/current/snapshot-creation-build-number.txt
index 5023f1a..ea13c36 100644
--- a/current/snapshot-creation-build-number.txt
+++ b/current/snapshot-creation-build-number.txt
@@ -1 +1 @@
-12185175
\ No newline at end of file
+12321823
\ No newline at end of file
