Merge 25Q1 (ab/BP1A.250305.020) to aosp-main-future Bug: 385190204 Merged-In: I96d691df5635d5a4d3c0b976fde59250873da854 Change-Id: Id105140011ac7e3d539a6758b9f4027ac385b303

commit: fffb23e0b4da3d99ae70f4243871d428b9a69a7d [log] [tgz]
author: Xin Li <[email protected]> Thu Mar 06 12:22:44 2025 -0800
committer: Xin Li <[email protected]> Thu Mar 06 12:22:44 2025 -0800
tree: b4d2086588ae8a0a54d7b4c0fd11708b02c50977
parent: 6dc6d0f1ce9c9634e054d63cf93716efc99cb69b [diff]
parent: b6e76875a16fa13a5324d51b275c1f0223132b80 [diff]
diff --git a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
index bd25fb2..77cc893 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: "12566592"
+    build_id: "12785903"
     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/Android.bp b/current/Android.bp
index a3a1cf3..f6494b8 100644
--- a/current/Android.bp
+++ b/current/Android.bp

@@ -16,7 +16,7 @@
 
 prebuilt_bootclasspath_fragment {
     name: "com.android.healthfitness-bootclasspath-fragment",
-    visibility: ["//packages/modules/HealthFitness:__subpackages__"],
+    visibility: ["//visibility:public"],
     apex_available: ["com.android.healthfitness"],
     licenses: ["healthfitness-module-sdk_Android-Apache-2.0"],
     contents: ["framework-healthfitness"],
@@ -109,7 +109,7 @@
 
 prebuilt_systemserverclasspath_fragment {
     name: "com.android.healthfitness-systemserverclasspath-fragment",
-    visibility: ["//packages/modules/HealthFitness:__subpackages__"],
+    visibility: ["//visibility:public"],
     apex_available: ["com.android.healthfitness"],
     licenses: ["healthfitness-module-sdk_Android-Apache-2.0"],
     contents: ["service-healthfitness"],

diff --git a/current/hiddenapi/annotation-flags.csv b/current/hiddenapi/annotation-flags.csv
index b60e637..6e8292c 100644
--- a/current/hiddenapi/annotation-flags.csv
+++ b/current/hiddenapi/annotation-flags.csv

@@ -1,40 +1,76 @@
+Lcom/android/healthfitness/flags/CustomFeatureFlags;->addMissingAccessLogs()Z,unsupported
+Lcom/android/healthfitness/flags/CustomFeatureFlags;->clearCachesAfterSwitchingUser()Z,unsupported
+Lcom/android/healthfitness/flags/CustomFeatureFlags;->cloudBackupAndRestore()Z,unsupported
+Lcom/android/healthfitness/flags/CustomFeatureFlags;->cyclePhases()Z,unsupported
 Lcom/android/healthfitness/flags/CustomFeatureFlags;->d2dFileDeletionBugFix()Z,unsupported
 Lcom/android/healthfitness/flags/CustomFeatureFlags;->dependencyInjection()Z,unsupported
 Lcom/android/healthfitness/flags/CustomFeatureFlags;->developmentDatabase()Z,unsupported
+Lcom/android/healthfitness/flags/CustomFeatureFlags;->ecosystemMetrics()Z,unsupported
 Lcom/android/healthfitness/flags/CustomFeatureFlags;->exportImport()Z,unsupported
+Lcom/android/healthfitness/flags/CustomFeatureFlags;->exportImportFastFollow()Z,unsupported
 Lcom/android/healthfitness/flags/CustomFeatureFlags;->healthConnectMappings()Z,unsupported
+Lcom/android/healthfitness/flags/CustomFeatureFlags;->immediateExport()Z,unsupported
+Lcom/android/healthfitness/flags/CustomFeatureFlags;->infraToGuardDbChanges()Z,unsupported
 Lcom/android/healthfitness/flags/CustomFeatureFlags;->mindfulness()Z,unsupported
 Lcom/android/healthfitness/flags/CustomFeatureFlags;->newInformationArchitecture()Z,unsupported
 Lcom/android/healthfitness/flags/CustomFeatureFlags;->onboarding()Z,unsupported
 Lcom/android/healthfitness/flags/CustomFeatureFlags;->personalHealthRecord()Z,unsupported
 Lcom/android/healthfitness/flags/CustomFeatureFlags;->personalHealthRecordDatabase()Z,unsupported
+Lcom/android/healthfitness/flags/CustomFeatureFlags;->readAssetsForDisabledAppsFromPackageManager()Z,unsupported
+Lcom/android/healthfitness/flags/FeatureFlags;->addMissingAccessLogs()Z,unsupported
+Lcom/android/healthfitness/flags/FeatureFlags;->clearCachesAfterSwitchingUser()Z,unsupported
+Lcom/android/healthfitness/flags/FeatureFlags;->cloudBackupAndRestore()Z,unsupported
+Lcom/android/healthfitness/flags/FeatureFlags;->cyclePhases()Z,unsupported
 Lcom/android/healthfitness/flags/FeatureFlags;->d2dFileDeletionBugFix()Z,unsupported
 Lcom/android/healthfitness/flags/FeatureFlags;->dependencyInjection()Z,unsupported
 Lcom/android/healthfitness/flags/FeatureFlags;->developmentDatabase()Z,unsupported
+Lcom/android/healthfitness/flags/FeatureFlags;->ecosystemMetrics()Z,unsupported
 Lcom/android/healthfitness/flags/FeatureFlags;->exportImport()Z,unsupported
+Lcom/android/healthfitness/flags/FeatureFlags;->exportImportFastFollow()Z,unsupported
 Lcom/android/healthfitness/flags/FeatureFlags;->healthConnectMappings()Z,unsupported
+Lcom/android/healthfitness/flags/FeatureFlags;->immediateExport()Z,unsupported
+Lcom/android/healthfitness/flags/FeatureFlags;->infraToGuardDbChanges()Z,unsupported
 Lcom/android/healthfitness/flags/FeatureFlags;->mindfulness()Z,unsupported
 Lcom/android/healthfitness/flags/FeatureFlags;->newInformationArchitecture()Z,unsupported
 Lcom/android/healthfitness/flags/FeatureFlags;->onboarding()Z,unsupported
 Lcom/android/healthfitness/flags/FeatureFlags;->personalHealthRecord()Z,unsupported
 Lcom/android/healthfitness/flags/FeatureFlags;->personalHealthRecordDatabase()Z,unsupported
+Lcom/android/healthfitness/flags/FeatureFlags;->readAssetsForDisabledAppsFromPackageManager()Z,unsupported
+Lcom/android/healthfitness/flags/FeatureFlagsImpl;->addMissingAccessLogs()Z,unsupported
+Lcom/android/healthfitness/flags/FeatureFlagsImpl;->clearCachesAfterSwitchingUser()Z,unsupported
+Lcom/android/healthfitness/flags/FeatureFlagsImpl;->cloudBackupAndRestore()Z,unsupported
+Lcom/android/healthfitness/flags/FeatureFlagsImpl;->cyclePhases()Z,unsupported
 Lcom/android/healthfitness/flags/FeatureFlagsImpl;->d2dFileDeletionBugFix()Z,unsupported
 Lcom/android/healthfitness/flags/FeatureFlagsImpl;->dependencyInjection()Z,unsupported
 Lcom/android/healthfitness/flags/FeatureFlagsImpl;->developmentDatabase()Z,unsupported
+Lcom/android/healthfitness/flags/FeatureFlagsImpl;->ecosystemMetrics()Z,unsupported
 Lcom/android/healthfitness/flags/FeatureFlagsImpl;->exportImport()Z,unsupported
+Lcom/android/healthfitness/flags/FeatureFlagsImpl;->exportImportFastFollow()Z,unsupported
 Lcom/android/healthfitness/flags/FeatureFlagsImpl;->healthConnectMappings()Z,unsupported
+Lcom/android/healthfitness/flags/FeatureFlagsImpl;->immediateExport()Z,unsupported
+Lcom/android/healthfitness/flags/FeatureFlagsImpl;->infraToGuardDbChanges()Z,unsupported
 Lcom/android/healthfitness/flags/FeatureFlagsImpl;->mindfulness()Z,unsupported
 Lcom/android/healthfitness/flags/FeatureFlagsImpl;->newInformationArchitecture()Z,unsupported
 Lcom/android/healthfitness/flags/FeatureFlagsImpl;->onboarding()Z,unsupported
 Lcom/android/healthfitness/flags/FeatureFlagsImpl;->personalHealthRecord()Z,unsupported
 Lcom/android/healthfitness/flags/FeatureFlagsImpl;->personalHealthRecordDatabase()Z,unsupported
+Lcom/android/healthfitness/flags/FeatureFlagsImpl;->readAssetsForDisabledAppsFromPackageManager()Z,unsupported
+Lcom/android/healthfitness/flags/Flags;->addMissingAccessLogs()Z,unsupported
+Lcom/android/healthfitness/flags/Flags;->clearCachesAfterSwitchingUser()Z,unsupported
+Lcom/android/healthfitness/flags/Flags;->cloudBackupAndRestore()Z,unsupported
+Lcom/android/healthfitness/flags/Flags;->cyclePhases()Z,unsupported
 Lcom/android/healthfitness/flags/Flags;->d2dFileDeletionBugFix()Z,unsupported
 Lcom/android/healthfitness/flags/Flags;->dependencyInjection()Z,unsupported
 Lcom/android/healthfitness/flags/Flags;->developmentDatabase()Z,unsupported
+Lcom/android/healthfitness/flags/Flags;->ecosystemMetrics()Z,unsupported
 Lcom/android/healthfitness/flags/Flags;->exportImport()Z,unsupported
+Lcom/android/healthfitness/flags/Flags;->exportImportFastFollow()Z,unsupported
 Lcom/android/healthfitness/flags/Flags;->healthConnectMappings()Z,unsupported
+Lcom/android/healthfitness/flags/Flags;->immediateExport()Z,unsupported
+Lcom/android/healthfitness/flags/Flags;->infraToGuardDbChanges()Z,unsupported
 Lcom/android/healthfitness/flags/Flags;->mindfulness()Z,unsupported
 Lcom/android/healthfitness/flags/Flags;->newInformationArchitecture()Z,unsupported
 Lcom/android/healthfitness/flags/Flags;->onboarding()Z,unsupported
 Lcom/android/healthfitness/flags/Flags;->personalHealthRecord()Z,unsupported
 Lcom/android/healthfitness/flags/Flags;->personalHealthRecordDatabase()Z,unsupported
+Lcom/android/healthfitness/flags/Flags;->readAssetsForDisabledAppsFromPackageManager()Z,unsupported

diff --git a/current/hiddenapi/filtered-flags.csv b/current/hiddenapi/filtered-flags.csv
index f0cc776..ce3e756 100644
--- a/current/hiddenapi/filtered-flags.csv
+++ b/current/hiddenapi/filtered-flags.csv

@@ -30,6 +30,8 @@
 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$$ExternalSyntheticLambda0;->accept(Ljava/lang/Object;)V,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/health/connect/DeleteMedicalResourcesRequest$$ExternalSyntheticLambda1;->applyAsInt(Ljava/lang/Object;)I,core-platform-api,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
@@ -172,6 +174,7 @@
 Landroid/health/connect/HealthDataCategory;->SLEEP:I,sdk,system-api,test-api
 Landroid/health/connect/HealthDataCategory;->UNKNOWN:I,sdk,system-api,test-api
 Landroid/health/connect/HealthDataCategory;->VITALS:I,sdk,system-api,test-api
+Landroid/health/connect/HealthDataCategory;->WELLNESS:I,sdk,system-api,test-api
 Landroid/health/connect/HealthPermissionCategory;->ACTIVE_CALORIES_BURNED:I,sdk,system-api,test-api
 Landroid/health/connect/HealthPermissionCategory;->BASAL_BODY_TEMPERATURE:I,sdk,system-api,test-api
 Landroid/health/connect/HealthPermissionCategory;->BASAL_METABOLIC_RATE:I,sdk,system-api,test-api
@@ -193,6 +196,7 @@
 Landroid/health/connect/HealthPermissionCategory;->INTERMENSTRUAL_BLEEDING:I,sdk,system-api,test-api
 Landroid/health/connect/HealthPermissionCategory;->LEAN_BODY_MASS:I,sdk,system-api,test-api
 Landroid/health/connect/HealthPermissionCategory;->MENSTRUATION:I,sdk,system-api,test-api
+Landroid/health/connect/HealthPermissionCategory;->MINDFULNESS:I,sdk,system-api,test-api
 Landroid/health/connect/HealthPermissionCategory;->NUTRITION:I,sdk,system-api,test-api
 Landroid/health/connect/HealthPermissionCategory;->OVULATION_TEST:I,sdk,system-api,test-api
 Landroid/health/connect/HealthPermissionCategory;->OXYGEN_SATURATION:I,sdk,system-api,test-api
@@ -210,7 +214,6 @@
 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
@@ -238,6 +241,7 @@
 Landroid/health/connect/HealthPermissions;->READ_INTERMENSTRUAL_BLEEDING:Ljava/lang/String;,public-api,sdk,system-api,test-api
 Landroid/health/connect/HealthPermissions;->READ_LEAN_BODY_MASS:Ljava/lang/String;,public-api,sdk,system-api,test-api
 Landroid/health/connect/HealthPermissions;->READ_MENSTRUATION:Ljava/lang/String;,public-api,sdk,system-api,test-api
+Landroid/health/connect/HealthPermissions;->READ_MINDFULNESS:Ljava/lang/String;,public-api,sdk,system-api,test-api
 Landroid/health/connect/HealthPermissions;->READ_NUTRITION:Ljava/lang/String;,public-api,sdk,system-api,test-api
 Landroid/health/connect/HealthPermissions;->READ_OVULATION_TEST:Ljava/lang/String;,public-api,sdk,system-api,test-api
 Landroid/health/connect/HealthPermissions;->READ_OXYGEN_SATURATION:Ljava/lang/String;,public-api,sdk,system-api,test-api
@@ -276,6 +280,7 @@
 Landroid/health/connect/HealthPermissions;->WRITE_INTERMENSTRUAL_BLEEDING:Ljava/lang/String;,public-api,sdk,system-api,test-api
 Landroid/health/connect/HealthPermissions;->WRITE_LEAN_BODY_MASS:Ljava/lang/String;,public-api,sdk,system-api,test-api
 Landroid/health/connect/HealthPermissions;->WRITE_MENSTRUATION:Ljava/lang/String;,public-api,sdk,system-api,test-api
+Landroid/health/connect/HealthPermissions;->WRITE_MINDFULNESS:Ljava/lang/String;,public-api,sdk,system-api,test-api
 Landroid/health/connect/HealthPermissions;->WRITE_NUTRITION:Ljava/lang/String;,public-api,sdk,system-api,test-api
 Landroid/health/connect/HealthPermissions;->WRITE_OVULATION_TEST:Ljava/lang/String;,public-api,sdk,system-api,test-api
 Landroid/health/connect/HealthPermissions;->WRITE_OXYGEN_SATURATION:Ljava/lang/String;,public-api,sdk,system-api,test-api
@@ -310,27 +315,27 @@
 Landroid/health/connect/MedicalResourceId;->hashCode()I,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/health/connect/MedicalResourceId;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/health/connect/MedicalResourceId;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
-Landroid/health/connect/MedicalResourceTypeInfoResponse$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
-Landroid/health/connect/MedicalResourceTypeInfoResponse$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
-Landroid/health/connect/MedicalResourceTypeInfoResponse;->describeContents()I,public-api,sdk,system-api,test-api
-Landroid/health/connect/MedicalResourceTypeInfoResponse;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/health/connect/MedicalResourceTypeInfoResponse;->hashCode()I,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/health/connect/MedicalResourceTypeInfoResponse;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
+Landroid/health/connect/MedicalResourceTypeInfo$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
+Landroid/health/connect/MedicalResourceTypeInfo$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
+Landroid/health/connect/MedicalResourceTypeInfo;->describeContents()I,public-api,sdk,system-api,test-api
+Landroid/health/connect/MedicalResourceTypeInfo;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/health/connect/MedicalResourceTypeInfo;->hashCode()I,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/health/connect/MedicalResourceTypeInfo;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
 Landroid/health/connect/PageTokenWrapper;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/health/connect/PageTokenWrapper;->hashCode()I,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/health/connect/PageTokenWrapper;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/health/connect/ReadMedicalResourcesRequest$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
-Landroid/health/connect/ReadMedicalResourcesRequest$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
-Landroid/health/connect/ReadMedicalResourcesRequest;->describeContents()I,public-api,sdk,system-api,test-api
-Landroid/health/connect/ReadMedicalResourcesRequest;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/health/connect/ReadMedicalResourcesRequest;->hashCode()I,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/health/connect/ReadMedicalResourcesRequest;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/health/connect/ReadMedicalResourcesRequest;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
+Landroid/health/connect/ReadMedicalResourcesInitialRequest;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/health/connect/ReadMedicalResourcesInitialRequest;->hashCode()I,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/health/connect/ReadMedicalResourcesInitialRequest;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/health/connect/ReadMedicalResourcesPageRequest;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/health/connect/ReadMedicalResourcesPageRequest;->hashCode()I,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/health/connect/ReadMedicalResourcesPageRequest;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/health/connect/ReadMedicalResourcesResponse$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
 Landroid/health/connect/ReadMedicalResourcesResponse$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
 Landroid/health/connect/ReadMedicalResourcesResponse;->describeContents()I,public-api,sdk,system-api,test-api
 Landroid/health/connect/ReadMedicalResourcesResponse;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/health/connect/ReadMedicalResourcesResponse;->hashCode()I,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/health/connect/ReadMedicalResourcesResponse;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/health/connect/ReadMedicalResourcesResponse;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
 Landroid/health/connect/ReadRecordsRequest;->getRecordType()Ljava/lang/Class;,public-api,sdk,system-api,test-api
 Landroid/health/connect/ReadRecordsRequestUsingFilters$Builder;-><init>(Ljava/lang/Class;)V,public-api,sdk,system-api,test-api
@@ -377,6 +382,7 @@
 Landroid/health/connect/UpsertMedicalResourceRequest;->describeContents()I,public-api,sdk,system-api,test-api
 Landroid/health/connect/UpsertMedicalResourceRequest;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/health/connect/UpsertMedicalResourceRequest;->hashCode()I,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/health/connect/UpsertMedicalResourceRequest;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/health/connect/UpsertMedicalResourceRequest;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
 Landroid/health/connect/accesslog/AccessLog$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
 Landroid/health/connect/accesslog/AccessLog$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
@@ -500,10 +506,10 @@
 Landroid/health/connect/aidl/IMedicalDataSourcesResponseCallback$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
 Landroid/health/connect/aidl/IMedicalDataSourcesResponseCallback$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
 Landroid/health/connect/aidl/IMedicalDataSourcesResponseCallback$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,sdk,system-api,test-api
-Landroid/health/connect/aidl/IMedicalResourceTypesInfoResponseCallback$Default;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
-Landroid/health/connect/aidl/IMedicalResourceTypesInfoResponseCallback$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
-Landroid/health/connect/aidl/IMedicalResourceTypesInfoResponseCallback$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
-Landroid/health/connect/aidl/IMedicalResourceTypesInfoResponseCallback$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,sdk,system-api,test-api
+Landroid/health/connect/aidl/IMedicalResourceTypeInfosCallback$Default;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
+Landroid/health/connect/aidl/IMedicalResourceTypeInfosCallback$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
+Landroid/health/connect/aidl/IMedicalResourceTypeInfosCallback$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
+Landroid/health/connect/aidl/IMedicalResourceTypeInfosCallback$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
@@ -528,6 +534,10 @@
 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/ReadMedicalResourcesRequestParcel$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
+Landroid/health/connect/aidl/ReadMedicalResourcesRequestParcel$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
+Landroid/health/connect/aidl/ReadMedicalResourcesRequestParcel;->describeContents()I,public-api,sdk,system-api,test-api
+Landroid/health/connect/aidl/ReadMedicalResourcesRequestParcel;->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
@@ -1212,7 +1222,24 @@
 Landroid/health/connect/datatypes/Metadata;->getLastModifiedTime()Ljava/time/Instant;,public-api,sdk,system-api,test-api
 Landroid/health/connect/datatypes/Metadata;->getRecordingMethod()I,public-api,sdk,system-api,test-api
 Landroid/health/connect/datatypes/Metadata;->hashCode()I,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/health/connect/datatypes/MindfulnessSessionRecord$Builder;-><init>(Landroid/health/connect/datatypes/Metadata;Ljava/time/Instant;Ljava/time/Instant;I)V,public-api,sdk,system-api,test-api
+Landroid/health/connect/datatypes/MindfulnessSessionRecord$Builder;->build()Landroid/health/connect/datatypes/MindfulnessSessionRecord;,public-api,sdk,system-api,test-api
+Landroid/health/connect/datatypes/MindfulnessSessionRecord$Builder;->setEndZoneOffset(Ljava/time/ZoneOffset;)Landroid/health/connect/datatypes/MindfulnessSessionRecord$Builder;,public-api,sdk,system-api,test-api
+Landroid/health/connect/datatypes/MindfulnessSessionRecord$Builder;->setNotes(Ljava/lang/CharSequence;)Landroid/health/connect/datatypes/MindfulnessSessionRecord$Builder;,public-api,sdk,system-api,test-api
+Landroid/health/connect/datatypes/MindfulnessSessionRecord$Builder;->setStartZoneOffset(Ljava/time/ZoneOffset;)Landroid/health/connect/datatypes/MindfulnessSessionRecord$Builder;,public-api,sdk,system-api,test-api
+Landroid/health/connect/datatypes/MindfulnessSessionRecord$Builder;->setTitle(Ljava/lang/CharSequence;)Landroid/health/connect/datatypes/MindfulnessSessionRecord$Builder;,public-api,sdk,system-api,test-api
+Landroid/health/connect/datatypes/MindfulnessSessionRecord;->MINDFULNESS_DURATION_TOTAL:Landroid/health/connect/datatypes/AggregationType;,public-api,sdk,system-api,test-api
+Landroid/health/connect/datatypes/MindfulnessSessionRecord;->MINDFULNESS_SESSION_TYPE_BREATHING:I,public-api,sdk,system-api,test-api
+Landroid/health/connect/datatypes/MindfulnessSessionRecord;->MINDFULNESS_SESSION_TYPE_MEDITATION:I,public-api,sdk,system-api,test-api
+Landroid/health/connect/datatypes/MindfulnessSessionRecord;->MINDFULNESS_SESSION_TYPE_MOVEMENT:I,public-api,sdk,system-api,test-api
+Landroid/health/connect/datatypes/MindfulnessSessionRecord;->MINDFULNESS_SESSION_TYPE_MUSIC:I,public-api,sdk,system-api,test-api
+Landroid/health/connect/datatypes/MindfulnessSessionRecord;->MINDFULNESS_SESSION_TYPE_OTHER:I,public-api,sdk,system-api,test-api
+Landroid/health/connect/datatypes/MindfulnessSessionRecord;->MINDFULNESS_SESSION_TYPE_UNGUIDED:I,public-api,sdk,system-api,test-api
+Landroid/health/connect/datatypes/MindfulnessSessionRecord;->MINDFULNESS_SESSION_TYPE_UNKNOWN:I,public-api,sdk,system-api,test-api
 Landroid/health/connect/datatypes/MindfulnessSessionRecord;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/health/connect/datatypes/MindfulnessSessionRecord;->getMindfulnessSessionType()I,public-api,sdk,system-api,test-api
+Landroid/health/connect/datatypes/MindfulnessSessionRecord;->getNotes()Ljava/lang/CharSequence;,public-api,sdk,system-api,test-api
+Landroid/health/connect/datatypes/MindfulnessSessionRecord;->getTitle()Ljava/lang/CharSequence;,public-api,sdk,system-api,test-api
 Landroid/health/connect/datatypes/MindfulnessSessionRecord;->hashCode()I,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/health/connect/datatypes/NutritionRecord$Builder;-><init>(Landroid/health/connect/datatypes/Metadata;Ljava/time/Instant;Ljava/time/Instant;)V,public-api,sdk,system-api,test-api
 Landroid/health/connect/datatypes/NutritionRecord$Builder;->build()Landroid/health/connect/datatypes/NutritionRecord;,public-api,sdk,system-api,test-api
@@ -1478,6 +1505,7 @@
 Landroid/health/connect/datatypes/RecordTypeIdentifier;->RECORD_TYPE_LEAN_BODY_MASS:I,sdk,system-api,test-api
 Landroid/health/connect/datatypes/RecordTypeIdentifier;->RECORD_TYPE_MENSTRUATION_FLOW:I,sdk,system-api,test-api
 Landroid/health/connect/datatypes/RecordTypeIdentifier;->RECORD_TYPE_MENSTRUATION_PERIOD:I,sdk,system-api,test-api
+Landroid/health/connect/datatypes/RecordTypeIdentifier;->RECORD_TYPE_MINDFULNESS_SESSION:I,sdk,system-api,test-api
 Landroid/health/connect/datatypes/RecordTypeIdentifier;->RECORD_TYPE_NUTRITION:I,sdk,system-api,test-api
 Landroid/health/connect/datatypes/RecordTypeIdentifier;->RECORD_TYPE_OVULATION_TEST:I,sdk,system-api,test-api
 Landroid/health/connect/datatypes/RecordTypeIdentifier;->RECORD_TYPE_OXYGEN_SATURATION:I,sdk,system-api,test-api
@@ -1818,6 +1846,7 @@
 Landroid/health/connect/internal/datatypes/utils/HealthConnectMappings$$ExternalSyntheticLambda5;->apply(Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/health/connect/internal/datatypes/utils/HealthConnectMappings$$ExternalSyntheticLambda6;->apply(Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/health/connect/internal/datatypes/utils/HealthConnectMappings$$ExternalSyntheticLambda7;->apply(Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/health/connect/internal/datatypes/utils/MedicalResourceTypePermissionMapper$$ExternalSyntheticLambda0;->accept(Ljava/lang/Object;Ljava/lang/Object;)V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/health/connect/internal/datatypes/utils/RecordMapper$$ExternalSyntheticLambda0;->accept(Ljava/lang/Object;Ljava/lang/Object;)V,core-platform-api,public-api,sdk,system-api,test-api
 Landroid/health/connect/migration/AppInfoMigrationPayload$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
 Landroid/health/connect/migration/AppInfoMigrationPayload$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
@@ -1928,7 +1957,17 @@
 Landroid/health/connect/restore/StageRemoteDataRequest$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
 Landroid/health/connect/restore/StageRemoteDataRequest;->describeContents()I,public-api,sdk,system-api,test-api
 Landroid/health/connect/restore/StageRemoteDataRequest;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
+Lcom/android/healthfitness/flags/AconfigFlagHelper$$ExternalSyntheticLambda0;->getAsBoolean()Z,core-platform-api,public-api,sdk,system-api,test-api
 Lcom/android/healthfitness/flags/CustomFeatureFlags$$ExternalSyntheticLambda0;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
+Lcom/android/healthfitness/flags/CustomFeatureFlags$$ExternalSyntheticLambda10;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
+Lcom/android/healthfitness/flags/CustomFeatureFlags$$ExternalSyntheticLambda11;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
+Lcom/android/healthfitness/flags/CustomFeatureFlags$$ExternalSyntheticLambda12;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
+Lcom/android/healthfitness/flags/CustomFeatureFlags$$ExternalSyntheticLambda13;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
+Lcom/android/healthfitness/flags/CustomFeatureFlags$$ExternalSyntheticLambda14;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
+Lcom/android/healthfitness/flags/CustomFeatureFlags$$ExternalSyntheticLambda15;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
+Lcom/android/healthfitness/flags/CustomFeatureFlags$$ExternalSyntheticLambda16;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
+Lcom/android/healthfitness/flags/CustomFeatureFlags$$ExternalSyntheticLambda17;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
+Lcom/android/healthfitness/flags/CustomFeatureFlags$$ExternalSyntheticLambda18;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
 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
@@ -1938,43 +1977,79 @@
 Lcom/android/healthfitness/flags/CustomFeatureFlags$$ExternalSyntheticLambda7;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
 Lcom/android/healthfitness/flags/CustomFeatureFlags$$ExternalSyntheticLambda8;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
 Lcom/android/healthfitness/flags/CustomFeatureFlags$$ExternalSyntheticLambda9;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
+Lcom/android/healthfitness/flags/CustomFeatureFlags;->addMissingAccessLogs()Z,unsupported
+Lcom/android/healthfitness/flags/CustomFeatureFlags;->clearCachesAfterSwitchingUser()Z,unsupported
+Lcom/android/healthfitness/flags/CustomFeatureFlags;->cloudBackupAndRestore()Z,unsupported
+Lcom/android/healthfitness/flags/CustomFeatureFlags;->cyclePhases()Z,unsupported
 Lcom/android/healthfitness/flags/CustomFeatureFlags;->d2dFileDeletionBugFix()Z,unsupported
 Lcom/android/healthfitness/flags/CustomFeatureFlags;->dependencyInjection()Z,unsupported
 Lcom/android/healthfitness/flags/CustomFeatureFlags;->developmentDatabase()Z,unsupported
+Lcom/android/healthfitness/flags/CustomFeatureFlags;->ecosystemMetrics()Z,unsupported
 Lcom/android/healthfitness/flags/CustomFeatureFlags;->exportImport()Z,unsupported
+Lcom/android/healthfitness/flags/CustomFeatureFlags;->exportImportFastFollow()Z,unsupported
 Lcom/android/healthfitness/flags/CustomFeatureFlags;->healthConnectMappings()Z,unsupported
+Lcom/android/healthfitness/flags/CustomFeatureFlags;->immediateExport()Z,unsupported
+Lcom/android/healthfitness/flags/CustomFeatureFlags;->infraToGuardDbChanges()Z,unsupported
 Lcom/android/healthfitness/flags/CustomFeatureFlags;->mindfulness()Z,unsupported
 Lcom/android/healthfitness/flags/CustomFeatureFlags;->newInformationArchitecture()Z,unsupported
 Lcom/android/healthfitness/flags/CustomFeatureFlags;->onboarding()Z,unsupported
 Lcom/android/healthfitness/flags/CustomFeatureFlags;->personalHealthRecord()Z,unsupported
 Lcom/android/healthfitness/flags/CustomFeatureFlags;->personalHealthRecordDatabase()Z,unsupported
+Lcom/android/healthfitness/flags/CustomFeatureFlags;->readAssetsForDisabledAppsFromPackageManager()Z,unsupported
+Lcom/android/healthfitness/flags/FeatureFlags;->addMissingAccessLogs()Z,unsupported
+Lcom/android/healthfitness/flags/FeatureFlags;->clearCachesAfterSwitchingUser()Z,unsupported
+Lcom/android/healthfitness/flags/FeatureFlags;->cloudBackupAndRestore()Z,unsupported
+Lcom/android/healthfitness/flags/FeatureFlags;->cyclePhases()Z,unsupported
 Lcom/android/healthfitness/flags/FeatureFlags;->d2dFileDeletionBugFix()Z,unsupported
 Lcom/android/healthfitness/flags/FeatureFlags;->dependencyInjection()Z,unsupported
 Lcom/android/healthfitness/flags/FeatureFlags;->developmentDatabase()Z,unsupported
+Lcom/android/healthfitness/flags/FeatureFlags;->ecosystemMetrics()Z,unsupported
 Lcom/android/healthfitness/flags/FeatureFlags;->exportImport()Z,unsupported
+Lcom/android/healthfitness/flags/FeatureFlags;->exportImportFastFollow()Z,unsupported
 Lcom/android/healthfitness/flags/FeatureFlags;->healthConnectMappings()Z,unsupported
+Lcom/android/healthfitness/flags/FeatureFlags;->immediateExport()Z,unsupported
+Lcom/android/healthfitness/flags/FeatureFlags;->infraToGuardDbChanges()Z,unsupported
 Lcom/android/healthfitness/flags/FeatureFlags;->mindfulness()Z,unsupported
 Lcom/android/healthfitness/flags/FeatureFlags;->newInformationArchitecture()Z,unsupported
 Lcom/android/healthfitness/flags/FeatureFlags;->onboarding()Z,unsupported
 Lcom/android/healthfitness/flags/FeatureFlags;->personalHealthRecord()Z,unsupported
 Lcom/android/healthfitness/flags/FeatureFlags;->personalHealthRecordDatabase()Z,unsupported
+Lcom/android/healthfitness/flags/FeatureFlags;->readAssetsForDisabledAppsFromPackageManager()Z,unsupported
+Lcom/android/healthfitness/flags/FeatureFlagsImpl;->addMissingAccessLogs()Z,unsupported
+Lcom/android/healthfitness/flags/FeatureFlagsImpl;->clearCachesAfterSwitchingUser()Z,unsupported
+Lcom/android/healthfitness/flags/FeatureFlagsImpl;->cloudBackupAndRestore()Z,unsupported
+Lcom/android/healthfitness/flags/FeatureFlagsImpl;->cyclePhases()Z,unsupported
 Lcom/android/healthfitness/flags/FeatureFlagsImpl;->d2dFileDeletionBugFix()Z,unsupported
 Lcom/android/healthfitness/flags/FeatureFlagsImpl;->dependencyInjection()Z,unsupported
 Lcom/android/healthfitness/flags/FeatureFlagsImpl;->developmentDatabase()Z,unsupported
+Lcom/android/healthfitness/flags/FeatureFlagsImpl;->ecosystemMetrics()Z,unsupported
 Lcom/android/healthfitness/flags/FeatureFlagsImpl;->exportImport()Z,unsupported
+Lcom/android/healthfitness/flags/FeatureFlagsImpl;->exportImportFastFollow()Z,unsupported
 Lcom/android/healthfitness/flags/FeatureFlagsImpl;->healthConnectMappings()Z,unsupported
+Lcom/android/healthfitness/flags/FeatureFlagsImpl;->immediateExport()Z,unsupported
+Lcom/android/healthfitness/flags/FeatureFlagsImpl;->infraToGuardDbChanges()Z,unsupported
 Lcom/android/healthfitness/flags/FeatureFlagsImpl;->mindfulness()Z,unsupported
 Lcom/android/healthfitness/flags/FeatureFlagsImpl;->newInformationArchitecture()Z,unsupported
 Lcom/android/healthfitness/flags/FeatureFlagsImpl;->onboarding()Z,unsupported
 Lcom/android/healthfitness/flags/FeatureFlagsImpl;->personalHealthRecord()Z,unsupported
 Lcom/android/healthfitness/flags/FeatureFlagsImpl;->personalHealthRecordDatabase()Z,unsupported
+Lcom/android/healthfitness/flags/FeatureFlagsImpl;->readAssetsForDisabledAppsFromPackageManager()Z,unsupported
+Lcom/android/healthfitness/flags/Flags;->addMissingAccessLogs()Z,unsupported
+Lcom/android/healthfitness/flags/Flags;->clearCachesAfterSwitchingUser()Z,unsupported
+Lcom/android/healthfitness/flags/Flags;->cloudBackupAndRestore()Z,unsupported
+Lcom/android/healthfitness/flags/Flags;->cyclePhases()Z,unsupported
 Lcom/android/healthfitness/flags/Flags;->d2dFileDeletionBugFix()Z,unsupported
 Lcom/android/healthfitness/flags/Flags;->dependencyInjection()Z,unsupported
 Lcom/android/healthfitness/flags/Flags;->developmentDatabase()Z,unsupported
+Lcom/android/healthfitness/flags/Flags;->ecosystemMetrics()Z,unsupported
 Lcom/android/healthfitness/flags/Flags;->exportImport()Z,unsupported
+Lcom/android/healthfitness/flags/Flags;->exportImportFastFollow()Z,unsupported
 Lcom/android/healthfitness/flags/Flags;->healthConnectMappings()Z,unsupported
+Lcom/android/healthfitness/flags/Flags;->immediateExport()Z,unsupported
+Lcom/android/healthfitness/flags/Flags;->infraToGuardDbChanges()Z,unsupported
 Lcom/android/healthfitness/flags/Flags;->mindfulness()Z,unsupported
 Lcom/android/healthfitness/flags/Flags;->newInformationArchitecture()Z,unsupported
 Lcom/android/healthfitness/flags/Flags;->onboarding()Z,unsupported
 Lcom/android/healthfitness/flags/Flags;->personalHealthRecord()Z,unsupported
 Lcom/android/healthfitness/flags/Flags;->personalHealthRecordDatabase()Z,unsupported
+Lcom/android/healthfitness/flags/Flags;->readAssetsForDisabledAppsFromPackageManager()Z,unsupported

diff --git a/current/hiddenapi/filtered-stub-flags.csv b/current/hiddenapi/filtered-stub-flags.csv
index cf1ef3f..944b791 100644
--- a/current/hiddenapi/filtered-stub-flags.csv
+++ b/current/hiddenapi/filtered-stub-flags.csv

@@ -30,6 +30,8 @@
 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$$ExternalSyntheticLambda0;->accept(Ljava/lang/Object;)V,core-platform-api,public-api,system-api,test-api
+Landroid/health/connect/DeleteMedicalResourcesRequest$$ExternalSyntheticLambda1;->applyAsInt(Ljava/lang/Object;)I,core-platform-api,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
@@ -172,6 +174,7 @@
 Landroid/health/connect/HealthDataCategory;->SLEEP:I,system-api,test-api
 Landroid/health/connect/HealthDataCategory;->UNKNOWN:I,system-api,test-api
 Landroid/health/connect/HealthDataCategory;->VITALS:I,system-api,test-api
+Landroid/health/connect/HealthDataCategory;->WELLNESS:I,system-api,test-api
 Landroid/health/connect/HealthPermissionCategory;->ACTIVE_CALORIES_BURNED:I,system-api,test-api
 Landroid/health/connect/HealthPermissionCategory;->BASAL_BODY_TEMPERATURE:I,system-api,test-api
 Landroid/health/connect/HealthPermissionCategory;->BASAL_METABOLIC_RATE:I,system-api,test-api
@@ -193,6 +196,7 @@
 Landroid/health/connect/HealthPermissionCategory;->INTERMENSTRUAL_BLEEDING:I,system-api,test-api
 Landroid/health/connect/HealthPermissionCategory;->LEAN_BODY_MASS:I,system-api,test-api
 Landroid/health/connect/HealthPermissionCategory;->MENSTRUATION:I,system-api,test-api
+Landroid/health/connect/HealthPermissionCategory;->MINDFULNESS:I,system-api,test-api
 Landroid/health/connect/HealthPermissionCategory;->NUTRITION:I,system-api,test-api
 Landroid/health/connect/HealthPermissionCategory;->OVULATION_TEST:I,system-api,test-api
 Landroid/health/connect/HealthPermissionCategory;->OXYGEN_SATURATION:I,system-api,test-api
@@ -210,7 +214,6 @@
 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
@@ -238,6 +241,7 @@
 Landroid/health/connect/HealthPermissions;->READ_INTERMENSTRUAL_BLEEDING:Ljava/lang/String;,public-api,system-api,test-api
 Landroid/health/connect/HealthPermissions;->READ_LEAN_BODY_MASS:Ljava/lang/String;,public-api,system-api,test-api
 Landroid/health/connect/HealthPermissions;->READ_MENSTRUATION:Ljava/lang/String;,public-api,system-api,test-api
+Landroid/health/connect/HealthPermissions;->READ_MINDFULNESS:Ljava/lang/String;,public-api,system-api,test-api
 Landroid/health/connect/HealthPermissions;->READ_NUTRITION:Ljava/lang/String;,public-api,system-api,test-api
 Landroid/health/connect/HealthPermissions;->READ_OVULATION_TEST:Ljava/lang/String;,public-api,system-api,test-api
 Landroid/health/connect/HealthPermissions;->READ_OXYGEN_SATURATION:Ljava/lang/String;,public-api,system-api,test-api
@@ -276,6 +280,7 @@
 Landroid/health/connect/HealthPermissions;->WRITE_INTERMENSTRUAL_BLEEDING:Ljava/lang/String;,public-api,system-api,test-api
 Landroid/health/connect/HealthPermissions;->WRITE_LEAN_BODY_MASS:Ljava/lang/String;,public-api,system-api,test-api
 Landroid/health/connect/HealthPermissions;->WRITE_MENSTRUATION:Ljava/lang/String;,public-api,system-api,test-api
+Landroid/health/connect/HealthPermissions;->WRITE_MINDFULNESS:Ljava/lang/String;,public-api,system-api,test-api
 Landroid/health/connect/HealthPermissions;->WRITE_NUTRITION:Ljava/lang/String;,public-api,system-api,test-api
 Landroid/health/connect/HealthPermissions;->WRITE_OVULATION_TEST:Ljava/lang/String;,public-api,system-api,test-api
 Landroid/health/connect/HealthPermissions;->WRITE_OXYGEN_SATURATION:Ljava/lang/String;,public-api,system-api,test-api
@@ -310,27 +315,27 @@
 Landroid/health/connect/MedicalResourceId;->hashCode()I,core-platform-api,public-api,system-api,test-api
 Landroid/health/connect/MedicalResourceId;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
 Landroid/health/connect/MedicalResourceId;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
-Landroid/health/connect/MedicalResourceTypeInfoResponse$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
-Landroid/health/connect/MedicalResourceTypeInfoResponse$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
-Landroid/health/connect/MedicalResourceTypeInfoResponse;->describeContents()I,public-api,system-api,test-api
-Landroid/health/connect/MedicalResourceTypeInfoResponse;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
-Landroid/health/connect/MedicalResourceTypeInfoResponse;->hashCode()I,core-platform-api,public-api,system-api,test-api
-Landroid/health/connect/MedicalResourceTypeInfoResponse;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
+Landroid/health/connect/MedicalResourceTypeInfo$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
+Landroid/health/connect/MedicalResourceTypeInfo$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
+Landroid/health/connect/MedicalResourceTypeInfo;->describeContents()I,public-api,system-api,test-api
+Landroid/health/connect/MedicalResourceTypeInfo;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
+Landroid/health/connect/MedicalResourceTypeInfo;->hashCode()I,core-platform-api,public-api,system-api,test-api
+Landroid/health/connect/MedicalResourceTypeInfo;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
 Landroid/health/connect/PageTokenWrapper;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
 Landroid/health/connect/PageTokenWrapper;->hashCode()I,core-platform-api,public-api,system-api,test-api
 Landroid/health/connect/PageTokenWrapper;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
-Landroid/health/connect/ReadMedicalResourcesRequest$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
-Landroid/health/connect/ReadMedicalResourcesRequest$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
-Landroid/health/connect/ReadMedicalResourcesRequest;->describeContents()I,public-api,system-api,test-api
-Landroid/health/connect/ReadMedicalResourcesRequest;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
-Landroid/health/connect/ReadMedicalResourcesRequest;->hashCode()I,core-platform-api,public-api,system-api,test-api
-Landroid/health/connect/ReadMedicalResourcesRequest;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
-Landroid/health/connect/ReadMedicalResourcesRequest;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
+Landroid/health/connect/ReadMedicalResourcesInitialRequest;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
+Landroid/health/connect/ReadMedicalResourcesInitialRequest;->hashCode()I,core-platform-api,public-api,system-api,test-api
+Landroid/health/connect/ReadMedicalResourcesInitialRequest;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
+Landroid/health/connect/ReadMedicalResourcesPageRequest;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
+Landroid/health/connect/ReadMedicalResourcesPageRequest;->hashCode()I,core-platform-api,public-api,system-api,test-api
+Landroid/health/connect/ReadMedicalResourcesPageRequest;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
 Landroid/health/connect/ReadMedicalResourcesResponse$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
 Landroid/health/connect/ReadMedicalResourcesResponse$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
 Landroid/health/connect/ReadMedicalResourcesResponse;->describeContents()I,public-api,system-api,test-api
 Landroid/health/connect/ReadMedicalResourcesResponse;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
 Landroid/health/connect/ReadMedicalResourcesResponse;->hashCode()I,core-platform-api,public-api,system-api,test-api
+Landroid/health/connect/ReadMedicalResourcesResponse;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
 Landroid/health/connect/ReadMedicalResourcesResponse;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
 Landroid/health/connect/ReadRecordsRequest;->getRecordType()Ljava/lang/Class;,public-api,system-api,test-api
 Landroid/health/connect/ReadRecordsRequestUsingFilters$Builder;-><init>(Ljava/lang/Class;)V,public-api,system-api,test-api
@@ -377,6 +382,7 @@
 Landroid/health/connect/UpsertMedicalResourceRequest;->describeContents()I,public-api,system-api,test-api
 Landroid/health/connect/UpsertMedicalResourceRequest;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
 Landroid/health/connect/UpsertMedicalResourceRequest;->hashCode()I,core-platform-api,public-api,system-api,test-api
+Landroid/health/connect/UpsertMedicalResourceRequest;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
 Landroid/health/connect/UpsertMedicalResourceRequest;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
 Landroid/health/connect/accesslog/AccessLog$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
 Landroid/health/connect/accesslog/AccessLog$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
@@ -500,10 +506,10 @@
 Landroid/health/connect/aidl/IMedicalDataSourcesResponseCallback$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
 Landroid/health/connect/aidl/IMedicalDataSourcesResponseCallback$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
 Landroid/health/connect/aidl/IMedicalDataSourcesResponseCallback$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
-Landroid/health/connect/aidl/IMedicalResourceTypesInfoResponseCallback$Default;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
-Landroid/health/connect/aidl/IMedicalResourceTypesInfoResponseCallback$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
-Landroid/health/connect/aidl/IMedicalResourceTypesInfoResponseCallback$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
-Landroid/health/connect/aidl/IMedicalResourceTypesInfoResponseCallback$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
+Landroid/health/connect/aidl/IMedicalResourceTypeInfosCallback$Default;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
+Landroid/health/connect/aidl/IMedicalResourceTypeInfosCallback$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
+Landroid/health/connect/aidl/IMedicalResourceTypeInfosCallback$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
+Landroid/health/connect/aidl/IMedicalResourceTypeInfosCallback$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
@@ -528,6 +534,10 @@
 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/ReadMedicalResourcesRequestParcel$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
+Landroid/health/connect/aidl/ReadMedicalResourcesRequestParcel$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
+Landroid/health/connect/aidl/ReadMedicalResourcesRequestParcel;->describeContents()I,public-api,system-api,test-api
+Landroid/health/connect/aidl/ReadMedicalResourcesRequestParcel;->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
@@ -1212,7 +1222,24 @@
 Landroid/health/connect/datatypes/Metadata;->getLastModifiedTime()Ljava/time/Instant;,public-api,system-api,test-api
 Landroid/health/connect/datatypes/Metadata;->getRecordingMethod()I,public-api,system-api,test-api
 Landroid/health/connect/datatypes/Metadata;->hashCode()I,core-platform-api,public-api,system-api,test-api
+Landroid/health/connect/datatypes/MindfulnessSessionRecord$Builder;-><init>(Landroid/health/connect/datatypes/Metadata;Ljava/time/Instant;Ljava/time/Instant;I)V,public-api,system-api,test-api
+Landroid/health/connect/datatypes/MindfulnessSessionRecord$Builder;->build()Landroid/health/connect/datatypes/MindfulnessSessionRecord;,public-api,system-api,test-api
+Landroid/health/connect/datatypes/MindfulnessSessionRecord$Builder;->setEndZoneOffset(Ljava/time/ZoneOffset;)Landroid/health/connect/datatypes/MindfulnessSessionRecord$Builder;,public-api,system-api,test-api
+Landroid/health/connect/datatypes/MindfulnessSessionRecord$Builder;->setNotes(Ljava/lang/CharSequence;)Landroid/health/connect/datatypes/MindfulnessSessionRecord$Builder;,public-api,system-api,test-api
+Landroid/health/connect/datatypes/MindfulnessSessionRecord$Builder;->setStartZoneOffset(Ljava/time/ZoneOffset;)Landroid/health/connect/datatypes/MindfulnessSessionRecord$Builder;,public-api,system-api,test-api
+Landroid/health/connect/datatypes/MindfulnessSessionRecord$Builder;->setTitle(Ljava/lang/CharSequence;)Landroid/health/connect/datatypes/MindfulnessSessionRecord$Builder;,public-api,system-api,test-api
+Landroid/health/connect/datatypes/MindfulnessSessionRecord;->MINDFULNESS_DURATION_TOTAL:Landroid/health/connect/datatypes/AggregationType;,public-api,system-api,test-api
+Landroid/health/connect/datatypes/MindfulnessSessionRecord;->MINDFULNESS_SESSION_TYPE_BREATHING:I,public-api,system-api,test-api
+Landroid/health/connect/datatypes/MindfulnessSessionRecord;->MINDFULNESS_SESSION_TYPE_MEDITATION:I,public-api,system-api,test-api
+Landroid/health/connect/datatypes/MindfulnessSessionRecord;->MINDFULNESS_SESSION_TYPE_MOVEMENT:I,public-api,system-api,test-api
+Landroid/health/connect/datatypes/MindfulnessSessionRecord;->MINDFULNESS_SESSION_TYPE_MUSIC:I,public-api,system-api,test-api
+Landroid/health/connect/datatypes/MindfulnessSessionRecord;->MINDFULNESS_SESSION_TYPE_OTHER:I,public-api,system-api,test-api
+Landroid/health/connect/datatypes/MindfulnessSessionRecord;->MINDFULNESS_SESSION_TYPE_UNGUIDED:I,public-api,system-api,test-api
+Landroid/health/connect/datatypes/MindfulnessSessionRecord;->MINDFULNESS_SESSION_TYPE_UNKNOWN:I,public-api,system-api,test-api
 Landroid/health/connect/datatypes/MindfulnessSessionRecord;->equals(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
+Landroid/health/connect/datatypes/MindfulnessSessionRecord;->getMindfulnessSessionType()I,public-api,system-api,test-api
+Landroid/health/connect/datatypes/MindfulnessSessionRecord;->getNotes()Ljava/lang/CharSequence;,public-api,system-api,test-api
+Landroid/health/connect/datatypes/MindfulnessSessionRecord;->getTitle()Ljava/lang/CharSequence;,public-api,system-api,test-api
 Landroid/health/connect/datatypes/MindfulnessSessionRecord;->hashCode()I,core-platform-api,public-api,system-api,test-api
 Landroid/health/connect/datatypes/NutritionRecord$Builder;-><init>(Landroid/health/connect/datatypes/Metadata;Ljava/time/Instant;Ljava/time/Instant;)V,public-api,system-api,test-api
 Landroid/health/connect/datatypes/NutritionRecord$Builder;->build()Landroid/health/connect/datatypes/NutritionRecord;,public-api,system-api,test-api
@@ -1478,6 +1505,7 @@
 Landroid/health/connect/datatypes/RecordTypeIdentifier;->RECORD_TYPE_LEAN_BODY_MASS:I,system-api,test-api
 Landroid/health/connect/datatypes/RecordTypeIdentifier;->RECORD_TYPE_MENSTRUATION_FLOW:I,system-api,test-api
 Landroid/health/connect/datatypes/RecordTypeIdentifier;->RECORD_TYPE_MENSTRUATION_PERIOD:I,system-api,test-api
+Landroid/health/connect/datatypes/RecordTypeIdentifier;->RECORD_TYPE_MINDFULNESS_SESSION:I,system-api,test-api
 Landroid/health/connect/datatypes/RecordTypeIdentifier;->RECORD_TYPE_NUTRITION:I,system-api,test-api
 Landroid/health/connect/datatypes/RecordTypeIdentifier;->RECORD_TYPE_OVULATION_TEST:I,system-api,test-api
 Landroid/health/connect/datatypes/RecordTypeIdentifier;->RECORD_TYPE_OXYGEN_SATURATION:I,system-api,test-api
@@ -1818,6 +1846,7 @@
 Landroid/health/connect/internal/datatypes/utils/HealthConnectMappings$$ExternalSyntheticLambda5;->apply(Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,system-api,test-api
 Landroid/health/connect/internal/datatypes/utils/HealthConnectMappings$$ExternalSyntheticLambda6;->apply(Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,system-api,test-api
 Landroid/health/connect/internal/datatypes/utils/HealthConnectMappings$$ExternalSyntheticLambda7;->apply(Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,system-api,test-api
+Landroid/health/connect/internal/datatypes/utils/MedicalResourceTypePermissionMapper$$ExternalSyntheticLambda0;->accept(Ljava/lang/Object;Ljava/lang/Object;)V,core-platform-api,public-api,system-api,test-api
 Landroid/health/connect/internal/datatypes/utils/RecordMapper$$ExternalSyntheticLambda0;->accept(Ljava/lang/Object;Ljava/lang/Object;)V,core-platform-api,public-api,system-api,test-api
 Landroid/health/connect/migration/AppInfoMigrationPayload$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
 Landroid/health/connect/migration/AppInfoMigrationPayload$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
@@ -1928,7 +1957,17 @@
 Landroid/health/connect/restore/StageRemoteDataRequest$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
 Landroid/health/connect/restore/StageRemoteDataRequest;->describeContents()I,public-api,system-api,test-api
 Landroid/health/connect/restore/StageRemoteDataRequest;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
+Lcom/android/healthfitness/flags/AconfigFlagHelper$$ExternalSyntheticLambda0;->getAsBoolean()Z,core-platform-api,public-api,system-api,test-api
 Lcom/android/healthfitness/flags/CustomFeatureFlags$$ExternalSyntheticLambda0;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
+Lcom/android/healthfitness/flags/CustomFeatureFlags$$ExternalSyntheticLambda10;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
+Lcom/android/healthfitness/flags/CustomFeatureFlags$$ExternalSyntheticLambda11;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
+Lcom/android/healthfitness/flags/CustomFeatureFlags$$ExternalSyntheticLambda12;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
+Lcom/android/healthfitness/flags/CustomFeatureFlags$$ExternalSyntheticLambda13;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
+Lcom/android/healthfitness/flags/CustomFeatureFlags$$ExternalSyntheticLambda14;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
+Lcom/android/healthfitness/flags/CustomFeatureFlags$$ExternalSyntheticLambda15;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
+Lcom/android/healthfitness/flags/CustomFeatureFlags$$ExternalSyntheticLambda16;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
+Lcom/android/healthfitness/flags/CustomFeatureFlags$$ExternalSyntheticLambda17;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
+Lcom/android/healthfitness/flags/CustomFeatureFlags$$ExternalSyntheticLambda18;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
 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

diff --git a/current/hiddenapi/index.csv b/current/hiddenapi/index.csv
index 402be92..eb3fefe 100644
--- a/current/hiddenapi/index.csv
+++ b/current/hiddenapi/index.csv

@@ -1,41 +1,77 @@
 signature,file,startline,startcol,endline,endcol,properties
-Lcom/android/healthfitness/flags/CustomFeatureFlags;->d2dFileDeletionBugFix()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;->dependencyInjection()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;->developmentDatabase()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;->exportImport()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;->healthConnectMappings()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/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,56,5,56,25,
-Lcom/android/healthfitness/flags/CustomFeatureFlags;->newInformationArchitecture()Z,out/soong/.intermediates/packages/modules/HealthFitness/flags/healthfitness-aconfig-flags-lib/android_common_apex34/javac/srcjars/com/android/healthfitness/flags/CustomFeatureFlags.java,63,5,63,25,
-Lcom/android/healthfitness/flags/CustomFeatureFlags;->onboarding()Z,out/soong/.intermediates/packages/modules/HealthFitness/flags/healthfitness-aconfig-flags-lib/android_common_apex34/javac/srcjars/com/android/healthfitness/flags/CustomFeatureFlags.java,70,5,70,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,77,5,77,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,84,5,84,25,
-Lcom/android/healthfitness/flags/FeatureFlags;->d2dFileDeletionBugFix()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;->dependencyInjection()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;->developmentDatabase()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;->exportImport()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;->healthConnectMappings()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/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,29,5,29,25,
-Lcom/android/healthfitness/flags/FeatureFlags;->newInformationArchitecture()Z,out/soong/.intermediates/packages/modules/HealthFitness/flags/healthfitness-aconfig-flags-lib/android_common_apex34/javac/srcjars/com/android/healthfitness/flags/FeatureFlags.java,33,5,33,25,
-Lcom/android/healthfitness/flags/FeatureFlags;->onboarding()Z,out/soong/.intermediates/packages/modules/HealthFitness/flags/healthfitness-aconfig-flags-lib/android_common_apex34/javac/srcjars/com/android/healthfitness/flags/FeatureFlags.java,37,5,37,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,41,5,41,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,45,5,45,25,
-Lcom/android/healthfitness/flags/FeatureFlagsImpl;->d2dFileDeletionBugFix()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;->dependencyInjection()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;->developmentDatabase()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;->exportImport()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;->healthConnectMappings()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/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,43,5,43,25,
-Lcom/android/healthfitness/flags/FeatureFlagsImpl;->newInformationArchitecture()Z,out/soong/.intermediates/packages/modules/HealthFitness/flags/healthfitness-aconfig-flags-lib/android_common_apex34/javac/srcjars/com/android/healthfitness/flags/FeatureFlagsImpl.java,50,5,50,25,
-Lcom/android/healthfitness/flags/FeatureFlagsImpl;->onboarding()Z,out/soong/.intermediates/packages/modules/HealthFitness/flags/healthfitness-aconfig-flags-lib/android_common_apex34/javac/srcjars/com/android/healthfitness/flags/FeatureFlagsImpl.java,57,5,57,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,64,5,64,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,71,5,71,25,
-Lcom/android/healthfitness/flags/Flags;->d2dFileDeletionBugFix()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;->dependencyInjection()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/Flags;->developmentDatabase()Z,out/soong/.intermediates/packages/modules/HealthFitness/flags/healthfitness-aconfig-flags-lib/android_common_apex34/javac/srcjars/com/android/healthfitness/flags/Flags.java,40,5,40,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,46,5,46,25,
-Lcom/android/healthfitness/flags/Flags;->healthConnectMappings()Z,out/soong/.intermediates/packages/modules/HealthFitness/flags/healthfitness-aconfig-flags-lib/android_common_apex34/javac/srcjars/com/android/healthfitness/flags/Flags.java,52,5,52,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,58,5,58,25,
-Lcom/android/healthfitness/flags/Flags;->newInformationArchitecture()Z,out/soong/.intermediates/packages/modules/HealthFitness/flags/healthfitness-aconfig-flags-lib/android_common_apex34/javac/srcjars/com/android/healthfitness/flags/Flags.java,64,5,64,25,
-Lcom/android/healthfitness/flags/Flags;->onboarding()Z,out/soong/.intermediates/packages/modules/HealthFitness/flags/healthfitness-aconfig-flags-lib/android_common_apex34/javac/srcjars/com/android/healthfitness/flags/Flags.java,70,5,70,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,76,5,76,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,82,5,82,25,
+Lcom/android/healthfitness/flags/CustomFeatureFlags;->addMissingAccessLogs()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;->clearCachesAfterSwitchingUser()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;->cloudBackupAndRestore()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;->cyclePhases()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;->d2dFileDeletionBugFix()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/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,56,5,56,25,
+Lcom/android/healthfitness/flags/CustomFeatureFlags;->developmentDatabase()Z,out/soong/.intermediates/packages/modules/HealthFitness/flags/healthfitness-aconfig-flags-lib/android_common_apex34/javac/srcjars/com/android/healthfitness/flags/CustomFeatureFlags.java,63,5,63,25,
+Lcom/android/healthfitness/flags/CustomFeatureFlags;->ecosystemMetrics()Z,out/soong/.intermediates/packages/modules/HealthFitness/flags/healthfitness-aconfig-flags-lib/android_common_apex34/javac/srcjars/com/android/healthfitness/flags/CustomFeatureFlags.java,70,5,70,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,77,5,77,25,
+Lcom/android/healthfitness/flags/CustomFeatureFlags;->exportImportFastFollow()Z,out/soong/.intermediates/packages/modules/HealthFitness/flags/healthfitness-aconfig-flags-lib/android_common_apex34/javac/srcjars/com/android/healthfitness/flags/CustomFeatureFlags.java,84,5,84,25,
+Lcom/android/healthfitness/flags/CustomFeatureFlags;->healthConnectMappings()Z,out/soong/.intermediates/packages/modules/HealthFitness/flags/healthfitness-aconfig-flags-lib/android_common_apex34/javac/srcjars/com/android/healthfitness/flags/CustomFeatureFlags.java,91,5,91,25,
+Lcom/android/healthfitness/flags/CustomFeatureFlags;->immediateExport()Z,out/soong/.intermediates/packages/modules/HealthFitness/flags/healthfitness-aconfig-flags-lib/android_common_apex34/javac/srcjars/com/android/healthfitness/flags/CustomFeatureFlags.java,98,5,98,25,
+Lcom/android/healthfitness/flags/CustomFeatureFlags;->infraToGuardDbChanges()Z,out/soong/.intermediates/packages/modules/HealthFitness/flags/healthfitness-aconfig-flags-lib/android_common_apex34/javac/srcjars/com/android/healthfitness/flags/CustomFeatureFlags.java,105,5,105,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,112,5,112,25,
+Lcom/android/healthfitness/flags/CustomFeatureFlags;->newInformationArchitecture()Z,out/soong/.intermediates/packages/modules/HealthFitness/flags/healthfitness-aconfig-flags-lib/android_common_apex34/javac/srcjars/com/android/healthfitness/flags/CustomFeatureFlags.java,119,5,119,25,
+Lcom/android/healthfitness/flags/CustomFeatureFlags;->onboarding()Z,out/soong/.intermediates/packages/modules/HealthFitness/flags/healthfitness-aconfig-flags-lib/android_common_apex34/javac/srcjars/com/android/healthfitness/flags/CustomFeatureFlags.java,126,5,126,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,133,5,133,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,140,5,140,25,
+Lcom/android/healthfitness/flags/CustomFeatureFlags;->readAssetsForDisabledAppsFromPackageManager()Z,out/soong/.intermediates/packages/modules/HealthFitness/flags/healthfitness-aconfig-flags-lib/android_common_apex34/javac/srcjars/com/android/healthfitness/flags/CustomFeatureFlags.java,147,5,147,25,
+Lcom/android/healthfitness/flags/FeatureFlags;->addMissingAccessLogs()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;->clearCachesAfterSwitchingUser()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;->cloudBackupAndRestore()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;->cyclePhases()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;->d2dFileDeletionBugFix()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/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,29,5,29,25,
+Lcom/android/healthfitness/flags/FeatureFlags;->developmentDatabase()Z,out/soong/.intermediates/packages/modules/HealthFitness/flags/healthfitness-aconfig-flags-lib/android_common_apex34/javac/srcjars/com/android/healthfitness/flags/FeatureFlags.java,33,5,33,25,
+Lcom/android/healthfitness/flags/FeatureFlags;->ecosystemMetrics()Z,out/soong/.intermediates/packages/modules/HealthFitness/flags/healthfitness-aconfig-flags-lib/android_common_apex34/javac/srcjars/com/android/healthfitness/flags/FeatureFlags.java,37,5,37,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,41,5,41,25,
+Lcom/android/healthfitness/flags/FeatureFlags;->exportImportFastFollow()Z,out/soong/.intermediates/packages/modules/HealthFitness/flags/healthfitness-aconfig-flags-lib/android_common_apex34/javac/srcjars/com/android/healthfitness/flags/FeatureFlags.java,45,5,45,25,
+Lcom/android/healthfitness/flags/FeatureFlags;->healthConnectMappings()Z,out/soong/.intermediates/packages/modules/HealthFitness/flags/healthfitness-aconfig-flags-lib/android_common_apex34/javac/srcjars/com/android/healthfitness/flags/FeatureFlags.java,49,5,49,25,
+Lcom/android/healthfitness/flags/FeatureFlags;->immediateExport()Z,out/soong/.intermediates/packages/modules/HealthFitness/flags/healthfitness-aconfig-flags-lib/android_common_apex34/javac/srcjars/com/android/healthfitness/flags/FeatureFlags.java,53,5,53,25,
+Lcom/android/healthfitness/flags/FeatureFlags;->infraToGuardDbChanges()Z,out/soong/.intermediates/packages/modules/HealthFitness/flags/healthfitness-aconfig-flags-lib/android_common_apex34/javac/srcjars/com/android/healthfitness/flags/FeatureFlags.java,57,5,57,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,61,5,61,25,
+Lcom/android/healthfitness/flags/FeatureFlags;->newInformationArchitecture()Z,out/soong/.intermediates/packages/modules/HealthFitness/flags/healthfitness-aconfig-flags-lib/android_common_apex34/javac/srcjars/com/android/healthfitness/flags/FeatureFlags.java,65,5,65,25,
+Lcom/android/healthfitness/flags/FeatureFlags;->onboarding()Z,out/soong/.intermediates/packages/modules/HealthFitness/flags/healthfitness-aconfig-flags-lib/android_common_apex34/javac/srcjars/com/android/healthfitness/flags/FeatureFlags.java,69,5,69,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,73,5,73,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,77,5,77,25,
+Lcom/android/healthfitness/flags/FeatureFlags;->readAssetsForDisabledAppsFromPackageManager()Z,out/soong/.intermediates/packages/modules/HealthFitness/flags/healthfitness-aconfig-flags-lib/android_common_apex34/javac/srcjars/com/android/healthfitness/flags/FeatureFlags.java,81,5,81,25,
+Lcom/android/healthfitness/flags/FeatureFlagsImpl;->addMissingAccessLogs()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;->clearCachesAfterSwitchingUser()Z,out/soong/.intermediates/packages/modules/HealthFitness/flags/healthfitness-aconfig-flags-lib/android_common_apex34/javac/srcjars/com/android/healthfitness/flags/FeatureFlagsImpl.java,16,5,16,25,
+Lcom/android/healthfitness/flags/FeatureFlagsImpl;->cloudBackupAndRestore()Z,out/soong/.intermediates/packages/modules/HealthFitness/flags/healthfitness-aconfig-flags-lib/android_common_apex34/javac/srcjars/com/android/healthfitness/flags/FeatureFlagsImpl.java,24,5,24,25,
+Lcom/android/healthfitness/flags/FeatureFlagsImpl;->cyclePhases()Z,out/soong/.intermediates/packages/modules/HealthFitness/flags/healthfitness-aconfig-flags-lib/android_common_apex34/javac/srcjars/com/android/healthfitness/flags/FeatureFlagsImpl.java,32,5,32,25,
+Lcom/android/healthfitness/flags/FeatureFlagsImpl;->d2dFileDeletionBugFix()Z,out/soong/.intermediates/packages/modules/HealthFitness/flags/healthfitness-aconfig-flags-lib/android_common_apex34/javac/srcjars/com/android/healthfitness/flags/FeatureFlagsImpl.java,40,5,40,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,48,5,48,25,
+Lcom/android/healthfitness/flags/FeatureFlagsImpl;->developmentDatabase()Z,out/soong/.intermediates/packages/modules/HealthFitness/flags/healthfitness-aconfig-flags-lib/android_common_apex34/javac/srcjars/com/android/healthfitness/flags/FeatureFlagsImpl.java,56,5,56,25,
+Lcom/android/healthfitness/flags/FeatureFlagsImpl;->ecosystemMetrics()Z,out/soong/.intermediates/packages/modules/HealthFitness/flags/healthfitness-aconfig-flags-lib/android_common_apex34/javac/srcjars/com/android/healthfitness/flags/FeatureFlagsImpl.java,64,5,64,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,72,5,72,25,
+Lcom/android/healthfitness/flags/FeatureFlagsImpl;->exportImportFastFollow()Z,out/soong/.intermediates/packages/modules/HealthFitness/flags/healthfitness-aconfig-flags-lib/android_common_apex34/javac/srcjars/com/android/healthfitness/flags/FeatureFlagsImpl.java,80,5,80,25,
+Lcom/android/healthfitness/flags/FeatureFlagsImpl;->healthConnectMappings()Z,out/soong/.intermediates/packages/modules/HealthFitness/flags/healthfitness-aconfig-flags-lib/android_common_apex34/javac/srcjars/com/android/healthfitness/flags/FeatureFlagsImpl.java,88,5,88,25,
+Lcom/android/healthfitness/flags/FeatureFlagsImpl;->immediateExport()Z,out/soong/.intermediates/packages/modules/HealthFitness/flags/healthfitness-aconfig-flags-lib/android_common_apex34/javac/srcjars/com/android/healthfitness/flags/FeatureFlagsImpl.java,96,5,96,25,
+Lcom/android/healthfitness/flags/FeatureFlagsImpl;->infraToGuardDbChanges()Z,out/soong/.intermediates/packages/modules/HealthFitness/flags/healthfitness-aconfig-flags-lib/android_common_apex34/javac/srcjars/com/android/healthfitness/flags/FeatureFlagsImpl.java,104,5,104,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,112,5,112,25,
+Lcom/android/healthfitness/flags/FeatureFlagsImpl;->newInformationArchitecture()Z,out/soong/.intermediates/packages/modules/HealthFitness/flags/healthfitness-aconfig-flags-lib/android_common_apex34/javac/srcjars/com/android/healthfitness/flags/FeatureFlagsImpl.java,120,5,120,25,
+Lcom/android/healthfitness/flags/FeatureFlagsImpl;->onboarding()Z,out/soong/.intermediates/packages/modules/HealthFitness/flags/healthfitness-aconfig-flags-lib/android_common_apex34/javac/srcjars/com/android/healthfitness/flags/FeatureFlagsImpl.java,128,5,128,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,136,5,136,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,144,5,144,25,
+Lcom/android/healthfitness/flags/FeatureFlagsImpl;->readAssetsForDisabledAppsFromPackageManager()Z,out/soong/.intermediates/packages/modules/HealthFitness/flags/healthfitness-aconfig-flags-lib/android_common_apex34/javac/srcjars/com/android/healthfitness/flags/FeatureFlagsImpl.java,152,5,152,25,
+Lcom/android/healthfitness/flags/Flags;->addMissingAccessLogs()Z,out/soong/.intermediates/packages/modules/HealthFitness/flags/healthfitness-aconfig-flags-lib/android_common_apex34/javac/srcjars/com/android/healthfitness/flags/Flags.java,46,5,46,25,
+Lcom/android/healthfitness/flags/Flags;->clearCachesAfterSwitchingUser()Z,out/soong/.intermediates/packages/modules/HealthFitness/flags/healthfitness-aconfig-flags-lib/android_common_apex34/javac/srcjars/com/android/healthfitness/flags/Flags.java,52,5,52,25,
+Lcom/android/healthfitness/flags/Flags;->cloudBackupAndRestore()Z,out/soong/.intermediates/packages/modules/HealthFitness/flags/healthfitness-aconfig-flags-lib/android_common_apex34/javac/srcjars/com/android/healthfitness/flags/Flags.java,58,5,58,25,
+Lcom/android/healthfitness/flags/Flags;->cyclePhases()Z,out/soong/.intermediates/packages/modules/HealthFitness/flags/healthfitness-aconfig-flags-lib/android_common_apex34/javac/srcjars/com/android/healthfitness/flags/Flags.java,64,5,64,25,
+Lcom/android/healthfitness/flags/Flags;->d2dFileDeletionBugFix()Z,out/soong/.intermediates/packages/modules/HealthFitness/flags/healthfitness-aconfig-flags-lib/android_common_apex34/javac/srcjars/com/android/healthfitness/flags/Flags.java,70,5,70,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,76,5,76,25,
+Lcom/android/healthfitness/flags/Flags;->developmentDatabase()Z,out/soong/.intermediates/packages/modules/HealthFitness/flags/healthfitness-aconfig-flags-lib/android_common_apex34/javac/srcjars/com/android/healthfitness/flags/Flags.java,82,5,82,25,
+Lcom/android/healthfitness/flags/Flags;->ecosystemMetrics()Z,out/soong/.intermediates/packages/modules/HealthFitness/flags/healthfitness-aconfig-flags-lib/android_common_apex34/javac/srcjars/com/android/healthfitness/flags/Flags.java,88,5,88,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,94,5,94,25,
+Lcom/android/healthfitness/flags/Flags;->exportImportFastFollow()Z,out/soong/.intermediates/packages/modules/HealthFitness/flags/healthfitness-aconfig-flags-lib/android_common_apex34/javac/srcjars/com/android/healthfitness/flags/Flags.java,100,5,100,25,
+Lcom/android/healthfitness/flags/Flags;->healthConnectMappings()Z,out/soong/.intermediates/packages/modules/HealthFitness/flags/healthfitness-aconfig-flags-lib/android_common_apex34/javac/srcjars/com/android/healthfitness/flags/Flags.java,106,5,106,25,
+Lcom/android/healthfitness/flags/Flags;->immediateExport()Z,out/soong/.intermediates/packages/modules/HealthFitness/flags/healthfitness-aconfig-flags-lib/android_common_apex34/javac/srcjars/com/android/healthfitness/flags/Flags.java,112,5,112,25,
+Lcom/android/healthfitness/flags/Flags;->infraToGuardDbChanges()Z,out/soong/.intermediates/packages/modules/HealthFitness/flags/healthfitness-aconfig-flags-lib/android_common_apex34/javac/srcjars/com/android/healthfitness/flags/Flags.java,118,5,118,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,124,5,124,25,
+Lcom/android/healthfitness/flags/Flags;->newInformationArchitecture()Z,out/soong/.intermediates/packages/modules/HealthFitness/flags/healthfitness-aconfig-flags-lib/android_common_apex34/javac/srcjars/com/android/healthfitness/flags/Flags.java,130,5,130,25,
+Lcom/android/healthfitness/flags/Flags;->onboarding()Z,out/soong/.intermediates/packages/modules/HealthFitness/flags/healthfitness-aconfig-flags-lib/android_common_apex34/javac/srcjars/com/android/healthfitness/flags/Flags.java,136,5,136,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,142,5,142,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,148,5,148,25,
+Lcom/android/healthfitness/flags/Flags;->readAssetsForDisabledAppsFromPackageManager()Z,out/soong/.intermediates/packages/modules/HealthFitness/flags/healthfitness-aconfig-flags-lib/android_common_apex34/javac/srcjars/com/android/healthfitness/flags/Flags.java,154,5,154,25,

diff --git a/current/hiddenapi/metadata.csv b/current/hiddenapi/metadata.csv
index 0178149..8d80e57 100644
--- a/current/hiddenapi/metadata.csv
+++ b/current/hiddenapi/metadata.csv

@@ -1,41 +1,77 @@
 signature
+|Lcom/android/healthfitness/flags/CustomFeatureFlags;->addMissingAccessLogs()Z|
+|Lcom/android/healthfitness/flags/CustomFeatureFlags;->clearCachesAfterSwitchingUser()Z|
+|Lcom/android/healthfitness/flags/CustomFeatureFlags;->cloudBackupAndRestore()Z|
+|Lcom/android/healthfitness/flags/CustomFeatureFlags;->cyclePhases()Z|
 |Lcom/android/healthfitness/flags/CustomFeatureFlags;->d2dFileDeletionBugFix()Z|
 |Lcom/android/healthfitness/flags/CustomFeatureFlags;->dependencyInjection()Z|
 |Lcom/android/healthfitness/flags/CustomFeatureFlags;->developmentDatabase()Z|
+|Lcom/android/healthfitness/flags/CustomFeatureFlags;->ecosystemMetrics()Z|
 |Lcom/android/healthfitness/flags/CustomFeatureFlags;->exportImport()Z|
+|Lcom/android/healthfitness/flags/CustomFeatureFlags;->exportImportFastFollow()Z|
 |Lcom/android/healthfitness/flags/CustomFeatureFlags;->healthConnectMappings()Z|
+|Lcom/android/healthfitness/flags/CustomFeatureFlags;->immediateExport()Z|
+|Lcom/android/healthfitness/flags/CustomFeatureFlags;->infraToGuardDbChanges()Z|
 |Lcom/android/healthfitness/flags/CustomFeatureFlags;->mindfulness()Z|
 |Lcom/android/healthfitness/flags/CustomFeatureFlags;->newInformationArchitecture()Z|
 |Lcom/android/healthfitness/flags/CustomFeatureFlags;->onboarding()Z|
 |Lcom/android/healthfitness/flags/CustomFeatureFlags;->personalHealthRecord()Z|
 |Lcom/android/healthfitness/flags/CustomFeatureFlags;->personalHealthRecordDatabase()Z|
+|Lcom/android/healthfitness/flags/CustomFeatureFlags;->readAssetsForDisabledAppsFromPackageManager()Z|
+|Lcom/android/healthfitness/flags/FeatureFlags;->addMissingAccessLogs()Z|
+|Lcom/android/healthfitness/flags/FeatureFlags;->clearCachesAfterSwitchingUser()Z|
+|Lcom/android/healthfitness/flags/FeatureFlags;->cloudBackupAndRestore()Z|
+|Lcom/android/healthfitness/flags/FeatureFlags;->cyclePhases()Z|
 |Lcom/android/healthfitness/flags/FeatureFlags;->d2dFileDeletionBugFix()Z|
 |Lcom/android/healthfitness/flags/FeatureFlags;->dependencyInjection()Z|
 |Lcom/android/healthfitness/flags/FeatureFlags;->developmentDatabase()Z|
+|Lcom/android/healthfitness/flags/FeatureFlags;->ecosystemMetrics()Z|
 |Lcom/android/healthfitness/flags/FeatureFlags;->exportImport()Z|
+|Lcom/android/healthfitness/flags/FeatureFlags;->exportImportFastFollow()Z|
 |Lcom/android/healthfitness/flags/FeatureFlags;->healthConnectMappings()Z|
+|Lcom/android/healthfitness/flags/FeatureFlags;->immediateExport()Z|
+|Lcom/android/healthfitness/flags/FeatureFlags;->infraToGuardDbChanges()Z|
 |Lcom/android/healthfitness/flags/FeatureFlags;->mindfulness()Z|
 |Lcom/android/healthfitness/flags/FeatureFlags;->newInformationArchitecture()Z|
 |Lcom/android/healthfitness/flags/FeatureFlags;->onboarding()Z|
 |Lcom/android/healthfitness/flags/FeatureFlags;->personalHealthRecord()Z|
 |Lcom/android/healthfitness/flags/FeatureFlags;->personalHealthRecordDatabase()Z|
+|Lcom/android/healthfitness/flags/FeatureFlags;->readAssetsForDisabledAppsFromPackageManager()Z|
+|Lcom/android/healthfitness/flags/FeatureFlagsImpl;->addMissingAccessLogs()Z|
+|Lcom/android/healthfitness/flags/FeatureFlagsImpl;->clearCachesAfterSwitchingUser()Z|
+|Lcom/android/healthfitness/flags/FeatureFlagsImpl;->cloudBackupAndRestore()Z|
+|Lcom/android/healthfitness/flags/FeatureFlagsImpl;->cyclePhases()Z|
 |Lcom/android/healthfitness/flags/FeatureFlagsImpl;->d2dFileDeletionBugFix()Z|
 |Lcom/android/healthfitness/flags/FeatureFlagsImpl;->dependencyInjection()Z|
 |Lcom/android/healthfitness/flags/FeatureFlagsImpl;->developmentDatabase()Z|
+|Lcom/android/healthfitness/flags/FeatureFlagsImpl;->ecosystemMetrics()Z|
 |Lcom/android/healthfitness/flags/FeatureFlagsImpl;->exportImport()Z|
+|Lcom/android/healthfitness/flags/FeatureFlagsImpl;->exportImportFastFollow()Z|
 |Lcom/android/healthfitness/flags/FeatureFlagsImpl;->healthConnectMappings()Z|
+|Lcom/android/healthfitness/flags/FeatureFlagsImpl;->immediateExport()Z|
+|Lcom/android/healthfitness/flags/FeatureFlagsImpl;->infraToGuardDbChanges()Z|
 |Lcom/android/healthfitness/flags/FeatureFlagsImpl;->mindfulness()Z|
 |Lcom/android/healthfitness/flags/FeatureFlagsImpl;->newInformationArchitecture()Z|
 |Lcom/android/healthfitness/flags/FeatureFlagsImpl;->onboarding()Z|
 |Lcom/android/healthfitness/flags/FeatureFlagsImpl;->personalHealthRecord()Z|
 |Lcom/android/healthfitness/flags/FeatureFlagsImpl;->personalHealthRecordDatabase()Z|
+|Lcom/android/healthfitness/flags/FeatureFlagsImpl;->readAssetsForDisabledAppsFromPackageManager()Z|
+|Lcom/android/healthfitness/flags/Flags;->addMissingAccessLogs()Z|
+|Lcom/android/healthfitness/flags/Flags;->clearCachesAfterSwitchingUser()Z|
+|Lcom/android/healthfitness/flags/Flags;->cloudBackupAndRestore()Z|
+|Lcom/android/healthfitness/flags/Flags;->cyclePhases()Z|
 |Lcom/android/healthfitness/flags/Flags;->d2dFileDeletionBugFix()Z|
 |Lcom/android/healthfitness/flags/Flags;->dependencyInjection()Z|
 |Lcom/android/healthfitness/flags/Flags;->developmentDatabase()Z|
+|Lcom/android/healthfitness/flags/Flags;->ecosystemMetrics()Z|
 |Lcom/android/healthfitness/flags/Flags;->exportImport()Z|
+|Lcom/android/healthfitness/flags/Flags;->exportImportFastFollow()Z|
 |Lcom/android/healthfitness/flags/Flags;->healthConnectMappings()Z|
+|Lcom/android/healthfitness/flags/Flags;->immediateExport()Z|
+|Lcom/android/healthfitness/flags/Flags;->infraToGuardDbChanges()Z|
 |Lcom/android/healthfitness/flags/Flags;->mindfulness()Z|
 |Lcom/android/healthfitness/flags/Flags;->newInformationArchitecture()Z|
 |Lcom/android/healthfitness/flags/Flags;->onboarding()Z|
 |Lcom/android/healthfitness/flags/Flags;->personalHealthRecord()Z|
 |Lcom/android/healthfitness/flags/Flags;->personalHealthRecordDatabase()Z|
+|Lcom/android/healthfitness/flags/Flags;->readAssetsForDisabledAppsFromPackageManager()Z|

diff --git a/current/hiddenapi/signature-patterns.csv b/current/hiddenapi/signature-patterns.csv
index 0c1d89c..a99dcaf 100644
--- a/current/hiddenapi/signature-patterns.csv
+++ b/current/hiddenapi/signature-patterns.csv

@@ -21,10 +21,11 @@
 android/health/connect/HealthServicesInitializer
 android/health/connect/InsertRecordsResponse
 android/health/connect/LocalTimeRangeFilter
-android/health/connect/MedicalPermissionCategory
 android/health/connect/MedicalResourceId
-android/health/connect/MedicalResourceTypeInfoResponse
+android/health/connect/MedicalResourceTypeInfo
 android/health/connect/PageTokenWrapper
+android/health/connect/ReadMedicalResourcesInitialRequest
+android/health/connect/ReadMedicalResourcesPageRequest
 android/health/connect/ReadMedicalResourcesRequest
 android/health/connect/ReadMedicalResourcesResponse
 android/health/connect/ReadRecordsRequest
@@ -63,13 +64,14 @@
 android/health/connect/aidl/IInsertRecordsResponseCallback
 android/health/connect/aidl/IMedicalDataSourceResponseCallback
 android/health/connect/aidl/IMedicalDataSourcesResponseCallback
-android/health/connect/aidl/IMedicalResourceTypesInfoResponseCallback
+android/health/connect/aidl/IMedicalResourceTypeInfosCallback
 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/ReadMedicalResourcesRequestParcel
 android/health/connect/aidl/ReadRecordsRequestParcel
 android/health/connect/aidl/ReadRecordsResponseParcel
 android/health/connect/aidl/RecordIdFiltersParcel
@@ -230,7 +232,7 @@
 android/health/connect/internal/datatypes/utils/FhirResourceTypeStringToIntMapper
 android/health/connect/internal/datatypes/utils/HealthConnectMappings
 android/health/connect/internal/datatypes/utils/InternalExternalRecordConverter
-android/health/connect/internal/datatypes/utils/MedicalResourceTypePermissionCategoryMapper
+android/health/connect/internal/datatypes/utils/MedicalResourceTypePermissionMapper
 android/health/connect/internal/datatypes/utils/ParcelRecordConverter
 android/health/connect/internal/datatypes/utils/RecordMapper
 android/health/connect/internal/datatypes/utils/RecordTypePermissionCategoryMapper
@@ -251,7 +253,9 @@
 android/health/connect/restore/BackupFileNamesSet
 android/health/connect/restore/StageRemoteDataException
 android/health/connect/restore/StageRemoteDataRequest
+com/android/healthfitness/flags/AconfigFlagHelper
 com/android/healthfitness/flags/CustomFeatureFlags
+com/android/healthfitness/flags/DatabaseVersions
 com/android/healthfitness/flags/FakeFeatureFlagsImpl
 com/android/healthfitness/flags/FeatureFlags
 com/android/healthfitness/flags/FeatureFlagsImpl

diff --git a/current/sdk_library/module-lib/framework-healthfitness-stubs.jar b/current/sdk_library/module-lib/framework-healthfitness-stubs.jar
index 8d9e9ee..c9b91a9 100644
--- a/current/sdk_library/module-lib/framework-healthfitness-stubs.jar
+++ b/current/sdk_library/module-lib/framework-healthfitness-stubs.jar
Binary files differ

diff --git a/current/sdk_library/module-lib/framework-healthfitness.srcjar b/current/sdk_library/module-lib/framework-healthfitness.srcjar
index a08bca0..69957f8 100644
--- a/current/sdk_library/module-lib/framework-healthfitness.srcjar
+++ b/current/sdk_library/module-lib/framework-healthfitness.srcjar
Binary files differ

diff --git a/current/sdk_library/module-lib/framework-healthfitness_annotations.zip b/current/sdk_library/module-lib/framework-healthfitness_annotations.zip
index cf3da2d..448ca90 100644
--- a/current/sdk_library/module-lib/framework-healthfitness_annotations.zip
+++ b/current/sdk_library/module-lib/framework-healthfitness_annotations.zip
Binary files differ

diff --git a/current/sdk_library/public/framework-healthfitness-stubs.jar b/current/sdk_library/public/framework-healthfitness-stubs.jar
index 883b4f7..0a4159d 100644
--- a/current/sdk_library/public/framework-healthfitness-stubs.jar
+++ b/current/sdk_library/public/framework-healthfitness-stubs.jar
Binary files differ

diff --git a/current/sdk_library/public/framework-healthfitness.srcjar b/current/sdk_library/public/framework-healthfitness.srcjar
index f7eff2d..347958e 100644
--- a/current/sdk_library/public/framework-healthfitness.srcjar
+++ b/current/sdk_library/public/framework-healthfitness.srcjar
Binary files differ

diff --git a/current/sdk_library/public/framework-healthfitness.txt b/current/sdk_library/public/framework-healthfitness.txt
index c7bdd72..f32adec 100644
--- a/current/sdk_library/public/framework-healthfitness.txt
+++ b/current/sdk_library/public/framework-healthfitness.txt

@@ -50,7 +50,7 @@
   }
 
   public class HealthConnectManager {
-    method @NonNull public <T> void aggregate(@NonNull android.health.connect.AggregateRecordsRequest<T>, @NonNull java.util.concurrent.Executor, @NonNull android.os.OutcomeReceiver<android.health.connect.AggregateRecordsResponse<T>,android.health.connect.HealthConnectException>);
+    method public <T> void aggregate(@NonNull android.health.connect.AggregateRecordsRequest<T>, @NonNull java.util.concurrent.Executor, @NonNull android.os.OutcomeReceiver<android.health.connect.AggregateRecordsResponse<T>,android.health.connect.HealthConnectException>);
     method public <T> void aggregateGroupByDuration(@NonNull android.health.connect.AggregateRecordsRequest<T>, @NonNull java.time.Duration, @NonNull java.util.concurrent.Executor, @NonNull android.os.OutcomeReceiver<java.util.List<android.health.connect.AggregateRecordsGroupedByDurationResponse<T>>,android.health.connect.HealthConnectException>);
     method public <T> void aggregateGroupByPeriod(@NonNull android.health.connect.AggregateRecordsRequest<T>, @NonNull java.time.Period, @NonNull java.util.concurrent.Executor, @NonNull android.os.OutcomeReceiver<java.util.List<android.health.connect.AggregateRecordsGroupedByPeriodResponse<T>>,android.health.connect.HealthConnectException>);
     method public void deleteRecords(@NonNull java.util.List<android.health.connect.RecordIdFilter>, @NonNull java.util.concurrent.Executor, @NonNull android.os.OutcomeReceiver<java.lang.Void,android.health.connect.HealthConnectException>);
@@ -92,6 +92,7 @@
     field public static final String READ_INTERMENSTRUAL_BLEEDING = "android.permission.health.READ_INTERMENSTRUAL_BLEEDING";
     field public static final String READ_LEAN_BODY_MASS = "android.permission.health.READ_LEAN_BODY_MASS";
     field public static final String READ_MENSTRUATION = "android.permission.health.READ_MENSTRUATION";
+    field public static final String READ_MINDFULNESS = "android.permission.health.READ_MINDFULNESS";
     field public static final String READ_NUTRITION = "android.permission.health.READ_NUTRITION";
     field public static final String READ_OVULATION_TEST = "android.permission.health.READ_OVULATION_TEST";
     field public static final String READ_OXYGEN_SATURATION = "android.permission.health.READ_OXYGEN_SATURATION";
@@ -130,6 +131,7 @@
     field public static final String WRITE_INTERMENSTRUAL_BLEEDING = "android.permission.health.WRITE_INTERMENSTRUAL_BLEEDING";
     field public static final String WRITE_LEAN_BODY_MASS = "android.permission.health.WRITE_LEAN_BODY_MASS";
     field public static final String WRITE_MENSTRUATION = "android.permission.health.WRITE_MENSTRUATION";
+    field public static final String WRITE_MINDFULNESS = "android.permission.health.WRITE_MINDFULNESS";
     field public static final String WRITE_NUTRITION = "android.permission.health.WRITE_NUTRITION";
     field public static final String WRITE_OVULATION_TEST = "android.permission.health.WRITE_OVULATION_TEST";
     field public static final String WRITE_OXYGEN_SATURATION = "android.permission.health.WRITE_OXYGEN_SATURATION";
@@ -1054,6 +1056,29 @@
     method @NonNull public android.health.connect.datatypes.Metadata.Builder setRecordingMethod(int);
   }
 
+  public final class MindfulnessSessionRecord extends android.health.connect.datatypes.IntervalRecord {
+    method public int getMindfulnessSessionType();
+    method @Nullable public CharSequence getNotes();
+    method @Nullable public CharSequence getTitle();
+    field @NonNull public static final android.health.connect.datatypes.AggregationType<java.lang.Long> MINDFULNESS_DURATION_TOTAL;
+    field public static final int MINDFULNESS_SESSION_TYPE_BREATHING = 3; // 0x3
+    field public static final int MINDFULNESS_SESSION_TYPE_MEDITATION = 1; // 0x1
+    field public static final int MINDFULNESS_SESSION_TYPE_MOVEMENT = 5; // 0x5
+    field public static final int MINDFULNESS_SESSION_TYPE_MUSIC = 4; // 0x4
+    field public static final int MINDFULNESS_SESSION_TYPE_OTHER = 2; // 0x2
+    field public static final int MINDFULNESS_SESSION_TYPE_UNGUIDED = 6; // 0x6
+    field public static final int MINDFULNESS_SESSION_TYPE_UNKNOWN = 0; // 0x0
+  }
+
+  public static final class MindfulnessSessionRecord.Builder {
+    ctor public MindfulnessSessionRecord.Builder(@NonNull android.health.connect.datatypes.Metadata, @NonNull java.time.Instant, @NonNull java.time.Instant, int);
+    method @NonNull public android.health.connect.datatypes.MindfulnessSessionRecord build();
+    method @NonNull public android.health.connect.datatypes.MindfulnessSessionRecord.Builder setEndZoneOffset(@NonNull java.time.ZoneOffset);
+    method @NonNull public android.health.connect.datatypes.MindfulnessSessionRecord.Builder setNotes(@Nullable CharSequence);
+    method @NonNull public android.health.connect.datatypes.MindfulnessSessionRecord.Builder setStartZoneOffset(@NonNull java.time.ZoneOffset);
+    method @NonNull public android.health.connect.datatypes.MindfulnessSessionRecord.Builder setTitle(@Nullable CharSequence);
+  }
+
   public final class NutritionRecord extends android.health.connect.datatypes.IntervalRecord {
     method @Nullable public android.health.connect.datatypes.units.Mass getBiotin();
     method @Nullable public android.health.connect.datatypes.units.Mass getCaffeine();

diff --git a/current/sdk_library/public/framework-healthfitness_annotations.zip b/current/sdk_library/public/framework-healthfitness_annotations.zip
index 97e826f..9d42ece 100644
--- a/current/sdk_library/public/framework-healthfitness_annotations.zip
+++ b/current/sdk_library/public/framework-healthfitness_annotations.zip
Binary files differ

diff --git a/current/sdk_library/system/framework-healthfitness-stubs.jar b/current/sdk_library/system/framework-healthfitness-stubs.jar
index bf70e4c..534b9b1 100644
--- a/current/sdk_library/system/framework-healthfitness-stubs.jar
+++ b/current/sdk_library/system/framework-healthfitness-stubs.jar
Binary files differ

diff --git a/current/sdk_library/system/framework-healthfitness.srcjar b/current/sdk_library/system/framework-healthfitness.srcjar
index 3d16432..5e816b6 100644
--- a/current/sdk_library/system/framework-healthfitness.srcjar
+++ b/current/sdk_library/system/framework-healthfitness.srcjar
Binary files differ

diff --git a/current/sdk_library/system/framework-healthfitness.txt b/current/sdk_library/system/framework-healthfitness.txt
index 5c3bb68..4b91895 100644
--- a/current/sdk_library/system/framework-healthfitness.txt
+++ b/current/sdk_library/system/framework-healthfitness.txt

@@ -51,14 +51,14 @@
     method @RequiresPermission(android.health.connect.HealthPermissions.MANAGE_HEALTH_PERMISSIONS) public void deleteRecords(@NonNull android.health.connect.DeleteUsingFiltersRequest, @NonNull java.util.concurrent.Executor, @NonNull android.os.OutcomeReceiver<java.lang.Void,android.health.connect.HealthConnectException>);
     method @RequiresPermission(android.health.connect.HealthPermissions.MANAGE_HEALTH_DATA_PERMISSION) public void fetchDataOriginsPriorityOrder(int, @NonNull java.util.concurrent.Executor, @NonNull android.os.OutcomeReceiver<android.health.connect.FetchDataOriginsPriorityOrderResponse,android.health.connect.HealthConnectException>);
     method @RequiresPermission(android.Manifest.permission.MIGRATE_HEALTH_CONNECT_DATA) public void finishMigration(@NonNull java.util.concurrent.Executor, @NonNull android.os.OutcomeReceiver<java.lang.Void,android.health.connect.migration.MigrationException>);
-    method @NonNull @RequiresPermission(android.health.connect.HealthPermissions.MANAGE_HEALTH_DATA_PERMISSION) public void getContributorApplicationsInfo(@NonNull java.util.concurrent.Executor, @NonNull android.os.OutcomeReceiver<android.health.connect.ApplicationInfoResponse,android.health.connect.HealthConnectException>);
-    method @NonNull @RequiresPermission(anyOf={android.health.connect.HealthPermissions.MANAGE_HEALTH_DATA_PERMISSION, android.Manifest.permission.MIGRATE_HEALTH_CONNECT_DATA}) public void getHealthConnectDataState(@NonNull java.util.concurrent.Executor, @NonNull android.os.OutcomeReceiver<android.health.connect.HealthConnectDataState,android.health.connect.HealthConnectException>);
+    method @RequiresPermission(android.health.connect.HealthPermissions.MANAGE_HEALTH_DATA_PERMISSION) public void getContributorApplicationsInfo(@NonNull java.util.concurrent.Executor, @NonNull android.os.OutcomeReceiver<android.health.connect.ApplicationInfoResponse,android.health.connect.HealthConnectException>);
+    method @RequiresPermission(anyOf={android.health.connect.HealthPermissions.MANAGE_HEALTH_DATA_PERMISSION, android.Manifest.permission.MIGRATE_HEALTH_CONNECT_DATA}) public void getHealthConnectDataState(@NonNull java.util.concurrent.Executor, @NonNull android.os.OutcomeReceiver<android.health.connect.HealthConnectDataState,android.health.connect.HealthConnectException>);
     method @NonNull public static java.util.Set<java.lang.String> getHealthPermissions(@NonNull android.content.Context);
     method @IntRange(from=0, to=7300) @RequiresPermission(android.health.connect.HealthPermissions.MANAGE_HEALTH_DATA_PERMISSION) public int getRecordRetentionPeriodInDays();
     method @RequiresPermission(android.Manifest.permission.MIGRATE_HEALTH_CONNECT_DATA) public void insertMinDataMigrationSdkExtensionVersion(int, @NonNull java.util.concurrent.Executor, @NonNull android.os.OutcomeReceiver<java.lang.Void,android.health.connect.migration.MigrationException>);
     method public static boolean isHealthPermission(@NonNull android.content.Context, @NonNull String);
     method @RequiresPermission(android.health.connect.HealthPermissions.MANAGE_HEALTH_DATA_PERMISSION) public void queryAccessLogs(@NonNull java.util.concurrent.Executor, @NonNull android.os.OutcomeReceiver<java.util.List<android.health.connect.accesslog.AccessLog>,android.health.connect.HealthConnectException>);
-    method @NonNull @RequiresPermission(android.health.connect.HealthPermissions.MANAGE_HEALTH_DATA_PERMISSION) public void queryActivityDates(@NonNull java.util.List<java.lang.Class<? extends android.health.connect.datatypes.Record>>, @NonNull java.util.concurrent.Executor, @NonNull android.os.OutcomeReceiver<java.util.List<java.time.LocalDate>,android.health.connect.HealthConnectException>);
+    method @RequiresPermission(android.health.connect.HealthPermissions.MANAGE_HEALTH_DATA_PERMISSION) public void queryActivityDates(@NonNull java.util.List<java.lang.Class<? extends android.health.connect.datatypes.Record>>, @NonNull java.util.concurrent.Executor, @NonNull android.os.OutcomeReceiver<java.util.List<java.time.LocalDate>,android.health.connect.HealthConnectException>);
     method @RequiresPermission(android.health.connect.HealthPermissions.MANAGE_HEALTH_DATA_PERMISSION) public void queryAllRecordTypesInfo(@NonNull java.util.concurrent.Executor, @NonNull android.os.OutcomeReceiver<java.util.Map<java.lang.Class<? extends android.health.connect.datatypes.Record>,android.health.connect.RecordTypeInfoResponse>,android.health.connect.HealthConnectException>);
     method @RequiresPermission(android.health.connect.HealthPermissions.MANAGE_HEALTH_DATA_PERMISSION) public void setRecordRetentionPeriodInDays(@IntRange(from=0, to=7300) int, @NonNull java.util.concurrent.Executor, @NonNull android.os.OutcomeReceiver<java.lang.Void,android.health.connect.HealthConnectException>);
     method @RequiresPermission(android.Manifest.permission.STAGE_HEALTH_CONNECT_REMOTE_DATA) public void stageAllHealthConnectRemoteData(@NonNull java.util.Map<java.lang.String,android.os.ParcelFileDescriptor>, @NonNull java.util.concurrent.Executor, @NonNull android.os.OutcomeReceiver<java.lang.Void,android.health.connect.restore.StageRemoteDataException>) throws java.lang.NullPointerException;
@@ -86,6 +86,7 @@
     field public static final int SLEEP = 5; // 0x5
     field public static final int UNKNOWN = 0; // 0x0
     field public static final int VITALS = 6; // 0x6
+    field public static final int WELLNESS = 7; // 0x7
   }
 
   public class HealthPermissionCategory {
@@ -110,6 +111,7 @@
     field public static final int INTERMENSTRUAL_BLEEDING = 38; // 0x26
     field public static final int LEAN_BODY_MASS = 15; // 0xf
     field public static final int MENSTRUATION = 20; // 0x14
+    field public static final int MINDFULNESS = 41; // 0x29
     field public static final int NUTRITION = 24; // 0x18
     field public static final int OVULATION_TEST = 21; // 0x15
     field public static final int OXYGEN_SATURATION = 31; // 0x1f
@@ -199,6 +201,7 @@
     field public static final int RECORD_TYPE_LEAN_BODY_MASS = 27; // 0x1b
     field public static final int RECORD_TYPE_MENSTRUATION_FLOW = 21; // 0x15
     field public static final int RECORD_TYPE_MENSTRUATION_PERIOD = 10; // 0xa
+    field public static final int RECORD_TYPE_MINDFULNESS_SESSION = 41; // 0x29
     field public static final int RECORD_TYPE_NUTRITION = 8; // 0x8
     field public static final int RECORD_TYPE_OVULATION_TEST = 30; // 0x1e
     field public static final int RECORD_TYPE_OXYGEN_SATURATION = 22; // 0x16

diff --git a/current/sdk_library/system/framework-healthfitness_annotations.zip b/current/sdk_library/system/framework-healthfitness_annotations.zip
index cf3da2d..448ca90 100644
--- a/current/sdk_library/system/framework-healthfitness_annotations.zip
+++ b/current/sdk_library/system/framework-healthfitness_annotations.zip
Binary files differ

diff --git a/current/snapshot-creation-build-number.txt b/current/snapshot-creation-build-number.txt
index 04e0838..37effd9 100644
--- a/current/snapshot-creation-build-number.txt
+++ b/current/snapshot-creation-build-number.txt

@@ -1 +1 @@
-12323836
\ No newline at end of file
+12572608
\ No newline at end of file
commit	fffb23e0b4da3d99ae70f4243871d428b9a69a7d	[log] [tgz]
author	Xin Li <[email protected]>	Thu Mar 06 12:22:44 2025 -0800
committer	Xin Li <[email protected]>	Thu Mar 06 12:22:44 2025 -0800
tree	b4d2086588ae8a0a54d7b4c0fd11708b02c50977
parent	6dc6d0f1ce9c9634e054d63cf93716efc99cb69b [diff]
parent	b6e76875a16fa13a5324d51b275c1f0223132b80 [diff]