Replace BuildCompat.isAtleastU() with SDK_VERSION check now that Android
U = 34 is available.
Test: No new tests needed.
Fix: 270155686
RelNote: N/A
Change-Id: I1e51943d2f256d0039a22c56feb533c42ac53270
diff --git a/health/connect/connect-client/api/current.txt b/health/connect/connect-client/api/current.txt
index 4eaa66c..47bb65f 100644
--- a/health/connect/connect-client/api/current.txt
+++ b/health/connect/connect-client/api/current.txt
@@ -9,20 +9,20 @@
method public suspend Object? deleteRecords(kotlin.reflect.KClass<? extends androidx.health.connect.client.records.Record> recordType, java.util.List<java.lang.String> recordIdsList, java.util.List<java.lang.String> clientRecordIdsList, kotlin.coroutines.Continuation<? super kotlin.Unit>);
method public suspend Object? getChanges(String changesToken, kotlin.coroutines.Continuation<? super androidx.health.connect.client.response.ChangesResponse>);
method public suspend Object? getChangesToken(androidx.health.connect.client.request.ChangesTokenRequest request, kotlin.coroutines.Continuation<? super java.lang.String>);
- method @androidx.core.os.BuildCompat.PrereleaseSdkCheck public default static String getHealthConnectSettingsAction();
- method @androidx.core.os.BuildCompat.PrereleaseSdkCheck public default static androidx.health.connect.client.HealthConnectClient getOrCreate(android.content.Context context);
- method @androidx.core.os.BuildCompat.PrereleaseSdkCheck public default static androidx.health.connect.client.HealthConnectClient getOrCreate(android.content.Context context, optional String providerPackageName);
+ method public default static String getHealthConnectSettingsAction();
+ method public default static androidx.health.connect.client.HealthConnectClient getOrCreate(android.content.Context context);
+ method public default static androidx.health.connect.client.HealthConnectClient getOrCreate(android.content.Context context, optional String providerPackageName);
method public androidx.health.connect.client.PermissionController getPermissionController();
- method @androidx.core.os.BuildCompat.PrereleaseSdkCheck public default static int getSdkStatus(android.content.Context context);
- method @androidx.core.os.BuildCompat.PrereleaseSdkCheck public default static int getSdkStatus(android.content.Context context, optional String providerPackageName);
+ method public default static int getSdkStatus(android.content.Context context);
+ method public default static int getSdkStatus(android.content.Context context, optional String providerPackageName);
method public suspend Object? insertRecords(java.util.List<? extends androidx.health.connect.client.records.Record> records, kotlin.coroutines.Continuation<? super androidx.health.connect.client.response.InsertRecordsResponse>);
method @Deprecated public default static boolean isApiSupported();
- method @Deprecated @androidx.core.os.BuildCompat.PrereleaseSdkCheck public default static boolean isProviderAvailable(android.content.Context context);
- method @Deprecated @androidx.core.os.BuildCompat.PrereleaseSdkCheck public default static boolean isProviderAvailable(android.content.Context context, optional String providerPackageName);
+ method @Deprecated public default static boolean isProviderAvailable(android.content.Context context);
+ method @Deprecated public default static boolean isProviderAvailable(android.content.Context context, optional String providerPackageName);
method public suspend <T extends androidx.health.connect.client.records.Record> Object? readRecord(kotlin.reflect.KClass<T> recordType, String recordId, kotlin.coroutines.Continuation<? super androidx.health.connect.client.response.ReadRecordResponse<T>>);
method public suspend <T extends androidx.health.connect.client.records.Record> Object? readRecords(androidx.health.connect.client.request.ReadRecordsRequest<T> request, kotlin.coroutines.Continuation<? super androidx.health.connect.client.response.ReadRecordsResponse<T>>);
method public suspend Object? updateRecords(java.util.List<? extends androidx.health.connect.client.records.Record> records, kotlin.coroutines.Continuation<? super kotlin.Unit>);
- property @androidx.core.os.BuildCompat.PrereleaseSdkCheck public default static String ACTION_HEALTH_CONNECT_SETTINGS;
+ property public default static String ACTION_HEALTH_CONNECT_SETTINGS;
property public abstract androidx.health.connect.client.PermissionController permissionController;
field public static final androidx.health.connect.client.HealthConnectClient.Companion Companion;
field public static final int SDK_AVAILABLE = 3; // 0x3
@@ -31,15 +31,15 @@
}
public static final class HealthConnectClient.Companion {
- method @androidx.core.os.BuildCompat.PrereleaseSdkCheck public String getHealthConnectSettingsAction();
- method @androidx.core.os.BuildCompat.PrereleaseSdkCheck public androidx.health.connect.client.HealthConnectClient getOrCreate(android.content.Context context);
- method @androidx.core.os.BuildCompat.PrereleaseSdkCheck public androidx.health.connect.client.HealthConnectClient getOrCreate(android.content.Context context, optional String providerPackageName);
- method @androidx.core.os.BuildCompat.PrereleaseSdkCheck public int getSdkStatus(android.content.Context context);
- method @androidx.core.os.BuildCompat.PrereleaseSdkCheck public int getSdkStatus(android.content.Context context, optional String providerPackageName);
+ method public String getHealthConnectSettingsAction();
+ method public androidx.health.connect.client.HealthConnectClient getOrCreate(android.content.Context context);
+ method public androidx.health.connect.client.HealthConnectClient getOrCreate(android.content.Context context, optional String providerPackageName);
+ method public int getSdkStatus(android.content.Context context);
+ method public int getSdkStatus(android.content.Context context, optional String providerPackageName);
method @Deprecated public boolean isApiSupported();
- method @Deprecated @androidx.core.os.BuildCompat.PrereleaseSdkCheck public boolean isProviderAvailable(android.content.Context context);
- method @Deprecated @androidx.core.os.BuildCompat.PrereleaseSdkCheck public boolean isProviderAvailable(android.content.Context context, optional String providerPackageName);
- property @androidx.core.os.BuildCompat.PrereleaseSdkCheck public final String ACTION_HEALTH_CONNECT_SETTINGS;
+ method @Deprecated public boolean isProviderAvailable(android.content.Context context);
+ method @Deprecated public boolean isProviderAvailable(android.content.Context context, optional String providerPackageName);
+ property public final String ACTION_HEALTH_CONNECT_SETTINGS;
field public static final int SDK_AVAILABLE = 3; // 0x3
field public static final int SDK_UNAVAILABLE = 1; // 0x1
field public static final int SDK_UNAVAILABLE_PROVIDER_UPDATE_REQUIRED = 2; // 0x2
diff --git a/health/connect/connect-client/api/restricted_current.txt b/health/connect/connect-client/api/restricted_current.txt
index 4dadad8..cf5a00c 100644
--- a/health/connect/connect-client/api/restricted_current.txt
+++ b/health/connect/connect-client/api/restricted_current.txt
@@ -9,20 +9,20 @@
method public suspend Object? deleteRecords(kotlin.reflect.KClass<? extends androidx.health.connect.client.records.Record> recordType, java.util.List<java.lang.String> recordIdsList, java.util.List<java.lang.String> clientRecordIdsList, kotlin.coroutines.Continuation<? super kotlin.Unit>);
method public suspend Object? getChanges(String changesToken, kotlin.coroutines.Continuation<? super androidx.health.connect.client.response.ChangesResponse>);
method public suspend Object? getChangesToken(androidx.health.connect.client.request.ChangesTokenRequest request, kotlin.coroutines.Continuation<? super java.lang.String>);
- method @androidx.core.os.BuildCompat.PrereleaseSdkCheck public default static String getHealthConnectSettingsAction();
- method @androidx.core.os.BuildCompat.PrereleaseSdkCheck public default static androidx.health.connect.client.HealthConnectClient getOrCreate(android.content.Context context);
- method @androidx.core.os.BuildCompat.PrereleaseSdkCheck public default static androidx.health.connect.client.HealthConnectClient getOrCreate(android.content.Context context, optional String providerPackageName);
+ method public default static String getHealthConnectSettingsAction();
+ method public default static androidx.health.connect.client.HealthConnectClient getOrCreate(android.content.Context context);
+ method public default static androidx.health.connect.client.HealthConnectClient getOrCreate(android.content.Context context, optional String providerPackageName);
method public androidx.health.connect.client.PermissionController getPermissionController();
- method @androidx.core.os.BuildCompat.PrereleaseSdkCheck public default static int getSdkStatus(android.content.Context context);
- method @androidx.core.os.BuildCompat.PrereleaseSdkCheck public default static int getSdkStatus(android.content.Context context, optional String providerPackageName);
+ method public default static int getSdkStatus(android.content.Context context);
+ method public default static int getSdkStatus(android.content.Context context, optional String providerPackageName);
method public suspend Object? insertRecords(java.util.List<? extends androidx.health.connect.client.records.Record> records, kotlin.coroutines.Continuation<? super androidx.health.connect.client.response.InsertRecordsResponse>);
method @Deprecated public default static boolean isApiSupported();
- method @Deprecated @androidx.core.os.BuildCompat.PrereleaseSdkCheck public default static boolean isProviderAvailable(android.content.Context context);
- method @Deprecated @androidx.core.os.BuildCompat.PrereleaseSdkCheck public default static boolean isProviderAvailable(android.content.Context context, optional String providerPackageName);
+ method @Deprecated public default static boolean isProviderAvailable(android.content.Context context);
+ method @Deprecated public default static boolean isProviderAvailable(android.content.Context context, optional String providerPackageName);
method public suspend <T extends androidx.health.connect.client.records.Record> Object? readRecord(kotlin.reflect.KClass<T> recordType, String recordId, kotlin.coroutines.Continuation<? super androidx.health.connect.client.response.ReadRecordResponse<T>>);
method public suspend <T extends androidx.health.connect.client.records.Record> Object? readRecords(androidx.health.connect.client.request.ReadRecordsRequest<T> request, kotlin.coroutines.Continuation<? super androidx.health.connect.client.response.ReadRecordsResponse<T>>);
method public suspend Object? updateRecords(java.util.List<? extends androidx.health.connect.client.records.Record> records, kotlin.coroutines.Continuation<? super kotlin.Unit>);
- property @androidx.core.os.BuildCompat.PrereleaseSdkCheck public default static String ACTION_HEALTH_CONNECT_SETTINGS;
+ property public default static String ACTION_HEALTH_CONNECT_SETTINGS;
property public abstract androidx.health.connect.client.PermissionController permissionController;
field public static final androidx.health.connect.client.HealthConnectClient.Companion Companion;
field public static final int SDK_AVAILABLE = 3; // 0x3
@@ -31,15 +31,15 @@
}
public static final class HealthConnectClient.Companion {
- method @androidx.core.os.BuildCompat.PrereleaseSdkCheck public String getHealthConnectSettingsAction();
- method @androidx.core.os.BuildCompat.PrereleaseSdkCheck public androidx.health.connect.client.HealthConnectClient getOrCreate(android.content.Context context);
- method @androidx.core.os.BuildCompat.PrereleaseSdkCheck public androidx.health.connect.client.HealthConnectClient getOrCreate(android.content.Context context, optional String providerPackageName);
- method @androidx.core.os.BuildCompat.PrereleaseSdkCheck public int getSdkStatus(android.content.Context context);
- method @androidx.core.os.BuildCompat.PrereleaseSdkCheck public int getSdkStatus(android.content.Context context, optional String providerPackageName);
+ method public String getHealthConnectSettingsAction();
+ method public androidx.health.connect.client.HealthConnectClient getOrCreate(android.content.Context context);
+ method public androidx.health.connect.client.HealthConnectClient getOrCreate(android.content.Context context, optional String providerPackageName);
+ method public int getSdkStatus(android.content.Context context);
+ method public int getSdkStatus(android.content.Context context, optional String providerPackageName);
method @Deprecated public boolean isApiSupported();
- method @Deprecated @androidx.core.os.BuildCompat.PrereleaseSdkCheck public boolean isProviderAvailable(android.content.Context context);
- method @Deprecated @androidx.core.os.BuildCompat.PrereleaseSdkCheck public boolean isProviderAvailable(android.content.Context context, optional String providerPackageName);
- property @androidx.core.os.BuildCompat.PrereleaseSdkCheck public final String ACTION_HEALTH_CONNECT_SETTINGS;
+ method @Deprecated public boolean isProviderAvailable(android.content.Context context);
+ method @Deprecated public boolean isProviderAvailable(android.content.Context context, optional String providerPackageName);
+ property public final String ACTION_HEALTH_CONNECT_SETTINGS;
field public static final int SDK_AVAILABLE = 3; // 0x3
field public static final int SDK_UNAVAILABLE = 1; // 0x1
field public static final int SDK_UNAVAILABLE_PROVIDER_UPDATE_REQUIRED = 2; // 0x2
diff --git a/health/connect/connect-client/lint-baseline.xml b/health/connect/connect-client/lint-baseline.xml
index 76a4965..9f96c0b 100644
--- a/health/connect/connect-client/lint-baseline.xml
+++ b/health/connect/connect-client/lint-baseline.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.1.0-beta01" type="baseline" client="gradle" dependencies="false" name="AGP (8.1.0-beta01)" variant="all" version="8.1.0-beta01">
+<issues format="6" by="lint 8.1.0-beta02" type="baseline" client="gradle" dependencies="false" name="AGP (8.1.0-beta02)" variant="all" version="8.1.0-beta02">
<issue
id="BanHideAnnotation"
@@ -157,87 +157,6 @@
<issue
id="PrereleaseSdkCoreDependency"
message="Prelease SDK check isAtLeastU cannot be called as this project has a versioned dependency on androidx.core:core"
- errorLine1=" if (BuildCompat.isAtLeastU()) "android.health.connect.action.HEALTH_HOME_SETTINGS""
- errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~">
- <location
- file="src/main/java/androidx/health/connect/client/HealthConnectClient.kt"/>
- </issue>
-
- <issue
- id="PrereleaseSdkCoreDependency"
- message="Prelease SDK check isAtLeastU cannot be called as this project has a versioned dependency on androidx.core:core"
- errorLine1=" if (BuildCompat.isAtLeastU()) {"
- errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~">
- <location
- file="src/main/java/androidx/health/connect/client/HealthConnectClient.kt"/>
- </issue>
-
- <issue
- id="PrereleaseSdkCoreDependency"
- message="Prelease SDK check isAtLeastU cannot be called as this project has a versioned dependency on androidx.core:core"
- errorLine1=" if (BuildCompat.isAtLeastU()) {"
- errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~">
- <location
- file="src/main/java/androidx/health/connect/client/HealthConnectClient.kt"/>
- </issue>
-
- <issue
- id="PrereleaseSdkCoreDependency"
- message="Prelease SDK check isAtLeastU cannot be called as this project has a versioned dependency on androidx.core:core"
- errorLine1=" if (BuildCompat.isAtLeastU()) {"
- errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~">
- <location
- file="src/main/java/androidx/health/connect/client/HealthConnectClient.kt"/>
- </issue>
-
- <issue
- id="PrereleaseSdkCoreDependency"
- message="Prelease SDK check isAtLeastU cannot be called as this project has a versioned dependency on androidx.core:core"
- errorLine1=" if (BuildCompat.isAtLeastU()) {"
- errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~">
- <location
- file="src/main/java/androidx/health/connect/client/HealthConnectClient.kt"/>
- </issue>
-
- <issue
- id="PrereleaseSdkCoreDependency"
- message="Prelease SDK check isAtLeastU cannot be called as this project has a versioned dependency on androidx.core:core"
- errorLine1=" if (BuildCompat.isAtLeastU()) {"
- errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~">
- <location
- file="src/main/java/androidx/health/connect/client/HealthConnectClient.kt"/>
- </issue>
-
- <issue
- id="PrereleaseSdkCoreDependency"
- message="Prelease SDK check isAtLeastU cannot be called as this project has a versioned dependency on androidx.core:core"
- errorLine1=" if (BuildCompat.isAtLeastU()) {"
- errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~">
- <location
- file="src/main/java/androidx/health/connect/client/HealthConnectClient.kt"/>
- </issue>
-
- <issue
- id="PrereleaseSdkCoreDependency"
- message="Prelease SDK check isAtLeastU cannot be called as this project has a versioned dependency on androidx.core:core"
- errorLine1=" if (BuildCompat.isAtLeastU()) {"
- errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~">
- <location
- file="src/main/java/androidx/health/connect/client/HealthConnectClient.kt"/>
- </issue>
-
- <issue
- id="PrereleaseSdkCoreDependency"
- message="Prelease SDK check isAtLeastU cannot be called as this project has a versioned dependency on androidx.core:core"
- errorLine1=" if (BuildCompat.isAtLeastU()) {"
- errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~">
- <location
- file="src/main/java/androidx/health/connect/client/HealthConnectClient.kt"/>
- </issue>
-
- <issue
- id="PrereleaseSdkCoreDependency"
- message="Prelease SDK check isAtLeastU cannot be called as this project has a versioned dependency on androidx.core:core"
errorLine1=" if (BuildCompat.isAtLeastU()) {"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~">
<location
@@ -272,429 +191,6 @@
</issue>
<issue
- id="RequireUnstableAidlAnnotation"
- message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
- errorLine1="parcelable AggregateDataRequest;"
- errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
- <location
- file="src/main/aidl/androidx/health/platform/client/request/AggregateDataRequest.aidl"/>
- </issue>
-
- <issue
- id="RequireUnstableAidlAnnotation"
- message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
- errorLine1="parcelable AggregateDataResponse;"
- errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
- <location
- file="src/main/aidl/androidx/health/platform/client/response/AggregateDataResponse.aidl"/>
- </issue>
-
- <issue
- id="RequireUnstableAidlAnnotation"
- message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
- errorLine1="parcelable ChangesEvent;"
- errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~">
- <location
- file="src/main/aidl/androidx/health/platform/client/changes/ChangesEvent.aidl"/>
- </issue>
-
- <issue
- id="RequireUnstableAidlAnnotation"
- message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
- errorLine1="parcelable DeleteDataRangeRequest;"
- errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
- <location
- file="src/main/aidl/androidx/health/platform/client/request/DeleteDataRangeRequest.aidl"/>
- </issue>
-
- <issue
- id="RequireUnstableAidlAnnotation"
- message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
- errorLine1="parcelable DeleteDataRequest;"
- errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
- <location
- file="src/main/aidl/androidx/health/platform/client/request/DeleteDataRequest.aidl"/>
- </issue>
-
- <issue
- id="RequireUnstableAidlAnnotation"
- message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
- errorLine1="parcelable ErrorStatus;"
- errorLine2="~~~~~~~~~~~~~~~~~~~~~~~">
- <location
- file="src/main/aidl/androidx/health/platform/client/error/ErrorStatus.aidl"/>
- </issue>
-
- <issue
- id="RequireUnstableAidlAnnotation"
- message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
- errorLine1="parcelable GetChangesRequest;"
- errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
- <location
- file="src/main/aidl/androidx/health/platform/client/request/GetChangesRequest.aidl"/>
- </issue>
-
- <issue
- id="RequireUnstableAidlAnnotation"
- message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
- errorLine1="parcelable GetChangesResponse;"
- errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
- <location
- file="src/main/aidl/androidx/health/platform/client/response/GetChangesResponse.aidl"/>
- </issue>
-
- <issue
- id="RequireUnstableAidlAnnotation"
- message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
- errorLine1="parcelable GetChangesTokenRequest;"
- errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
- <location
- file="src/main/aidl/androidx/health/platform/client/request/GetChangesTokenRequest.aidl"/>
- </issue>
-
- <issue
- id="RequireUnstableAidlAnnotation"
- message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
- errorLine1="parcelable GetChangesTokenResponse;"
- errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
- <location
- file="src/main/aidl/androidx/health/platform/client/response/GetChangesTokenResponse.aidl"/>
- </issue>
-
- <issue
- id="RequireUnstableAidlAnnotation"
- message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
- errorLine1="oneway interface IAggregateDataCallback {"
- errorLine2="^">
- <location
- file="src/main/aidl/androidx/health/platform/client/service/IAggregateDataCallback.aidl"/>
- </issue>
-
- <issue
- id="RequireUnstableAidlAnnotation"
- message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
- errorLine1="oneway interface IClearOnChangesListenerCallback {"
- errorLine2="^">
- <location
- file="src/main/aidl/androidx/health/platform/client/service/IClearOnChangesListenerCallback.aidl"/>
- </issue>
-
- <issue
- id="RequireUnstableAidlAnnotation"
- message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
- errorLine1="oneway interface IDeleteDataCallback {"
- errorLine2="^">
- <location
- file="src/main/aidl/androidx/health/platform/client/service/IDeleteDataCallback.aidl"/>
- </issue>
-
- <issue
- id="RequireUnstableAidlAnnotation"
- message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
- errorLine1="oneway interface IDeleteDataRangeCallback {"
- errorLine2="^">
- <location
- file="src/main/aidl/androidx/health/platform/client/service/IDeleteDataRangeCallback.aidl"/>
- </issue>
-
- <issue
- id="RequireUnstableAidlAnnotation"
- message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
- errorLine1="oneway interface IFilterGrantedPermissionsCallback {"
- errorLine2="^">
- <location
- file="src/main/aidl/androidx/health/platform/client/service/IFilterGrantedPermissionsCallback.aidl"/>
- </issue>
-
- <issue
- id="RequireUnstableAidlAnnotation"
- message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
- errorLine1="oneway interface IGetChangesCallback {"
- errorLine2="^">
- <location
- file="src/main/aidl/androidx/health/platform/client/service/IGetChangesCallback.aidl"/>
- </issue>
-
- <issue
- id="RequireUnstableAidlAnnotation"
- message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
- errorLine1="oneway interface IGetChangesTokenCallback {"
- errorLine2="^">
- <location
- file="src/main/aidl/androidx/health/platform/client/service/IGetChangesTokenCallback.aidl"/>
- </issue>
-
- <issue
- id="RequireUnstableAidlAnnotation"
- message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
- errorLine1="oneway interface IGetGrantedPermissionsCallback {"
- errorLine2="^">
- <location
- file="src/main/aidl/androidx/health/platform/client/service/IGetGrantedPermissionsCallback.aidl"/>
- </issue>
-
- <issue
- id="RequireUnstableAidlAnnotation"
- message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
- errorLine1="oneway interface IGetIsInForegroundCallback {"
- errorLine2="^">
- <location
- file="src/main/aidl/androidx/health/platform/client/impl/sdkservice/IGetIsInForegroundCallback.aidl"/>
- </issue>
-
- <issue
- id="RequireUnstableAidlAnnotation"
- message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
- errorLine1="oneway interface IGetPermissionTokenCallback {"
- errorLine2="^">
- <location
- file="src/main/aidl/androidx/health/platform/client/impl/sdkservice/IGetPermissionTokenCallback.aidl"/>
- </issue>
-
- <issue
- id="RequireUnstableAidlAnnotation"
- message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
- errorLine1="oneway interface IHealthDataSdkService {"
- errorLine2="^">
- <location
- file="src/main/aidl/androidx/health/platform/client/impl/sdkservice/IHealthDataSdkService.aidl"/>
- </issue>
-
- <issue
- id="RequireUnstableAidlAnnotation"
- message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
- errorLine1="interface IHealthDataService {"
- errorLine2="^">
- <location
- file="src/main/aidl/androidx/health/platform/client/service/IHealthDataService.aidl"/>
- </issue>
-
- <issue
- id="RequireUnstableAidlAnnotation"
- message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
- errorLine1="oneway interface IInsertDataCallback {"
- errorLine2="^">
- <location
- file="src/main/aidl/androidx/health/platform/client/service/IInsertDataCallback.aidl"/>
- </issue>
-
- <issue
- id="RequireUnstableAidlAnnotation"
- message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
- errorLine1="oneway interface IOnChangesListener {"
- errorLine2="^">
- <location
- file="src/main/aidl/androidx/health/platform/client/service/IOnChangesListener.aidl"/>
- </issue>
-
- <issue
- id="RequireUnstableAidlAnnotation"
- message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
- errorLine1="oneway interface IReadDataCallback {"
- errorLine2="^">
- <location
- file="src/main/aidl/androidx/health/platform/client/service/IReadDataCallback.aidl"/>
- </issue>
-
- <issue
- id="RequireUnstableAidlAnnotation"
- message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
- errorLine1="oneway interface IReadDataRangeCallback {"
- errorLine2="^">
- <location
- file="src/main/aidl/androidx/health/platform/client/service/IReadDataRangeCallback.aidl"/>
- </issue>
-
- <issue
- id="RequireUnstableAidlAnnotation"
- message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
- errorLine1="oneway interface IReadExerciseRouteCallback {"
- errorLine2="^">
- <location
- file="src/main/aidl/androidx/health/platform/client/service/IReadExerciseRouteCallback.aidl"/>
- </issue>
-
- <issue
- id="RequireUnstableAidlAnnotation"
- message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
- errorLine1="oneway interface IRegisterForDataNotificationsCallback {"
- errorLine2="^">
- <location
- file="src/main/aidl/androidx/health/platform/client/service/IRegisterForDataNotificationsCallback.aidl"/>
- </issue>
-
- <issue
- id="RequireUnstableAidlAnnotation"
- message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
- errorLine1="oneway interface IRevokeAllPermissionsCallback {"
- errorLine2="^">
- <location
- file="src/main/aidl/androidx/health/platform/client/service/IRevokeAllPermissionsCallback.aidl"/>
- </issue>
-
- <issue
- id="RequireUnstableAidlAnnotation"
- message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
- errorLine1="oneway interface ISetOnChangesListenerCallback {"
- errorLine2="^">
- <location
- file="src/main/aidl/androidx/health/platform/client/service/ISetOnChangesListenerCallback.aidl"/>
- </issue>
-
- <issue
- id="RequireUnstableAidlAnnotation"
- message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
- errorLine1="oneway interface ISetPermissionTokenCallback {"
- errorLine2="^">
- <location
- file="src/main/aidl/androidx/health/platform/client/impl/sdkservice/ISetPermissionTokenCallback.aidl"/>
- </issue>
-
- <issue
- id="RequireUnstableAidlAnnotation"
- message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
- errorLine1="oneway interface IUnregisterFromDataNotificationsCallback {"
- errorLine2="^">
- <location
- file="src/main/aidl/androidx/health/platform/client/service/IUnregisterFromDataNotificationsCallback.aidl"/>
- </issue>
-
- <issue
- id="RequireUnstableAidlAnnotation"
- message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
- errorLine1="oneway interface IUpdateDataCallback {"
- errorLine2="^">
- <location
- file="src/main/aidl/androidx/health/platform/client/service/IUpdateDataCallback.aidl"/>
- </issue>
-
- <issue
- id="RequireUnstableAidlAnnotation"
- message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
- errorLine1="oneway interface IUpsertExerciseRouteCallback {"
- errorLine2="^">
- <location
- file="src/main/aidl/androidx/health/platform/client/service/IUpsertExerciseRouteCallback.aidl"/>
- </issue>
-
- <issue
- id="RequireUnstableAidlAnnotation"
- message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
- errorLine1="parcelable InsertDataResponse;"
- errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
- <location
- file="src/main/aidl/androidx/health/platform/client/response/InsertDataResponse.aidl"/>
- </issue>
-
- <issue
- id="RequireUnstableAidlAnnotation"
- message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
- errorLine1="parcelable Permission;"
- errorLine2="~~~~~~~~~~~~~~~~~~~~~~">
- <location
- file="src/main/aidl/androidx/health/platform/client/permission/Permission.aidl"/>
- </issue>
-
- <issue
- id="RequireUnstableAidlAnnotation"
- message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
- errorLine1="parcelable ReadDataRangeRequest;"
- errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
- <location
- file="src/main/aidl/androidx/health/platform/client/request/ReadDataRangeRequest.aidl"/>
- </issue>
-
- <issue
- id="RequireUnstableAidlAnnotation"
- message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
- errorLine1="parcelable ReadDataRangeResponse;"
- errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
- <location
- file="src/main/aidl/androidx/health/platform/client/response/ReadDataRangeResponse.aidl"/>
- </issue>
-
- <issue
- id="RequireUnstableAidlAnnotation"
- message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
- errorLine1="parcelable ReadDataRequest;"
- errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~">
- <location
- file="src/main/aidl/androidx/health/platform/client/request/ReadDataRequest.aidl"/>
- </issue>
-
- <issue
- id="RequireUnstableAidlAnnotation"
- message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
- errorLine1="parcelable ReadDataResponse;"
- errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
- <location
- file="src/main/aidl/androidx/health/platform/client/response/ReadDataResponse.aidl"/>
- </issue>
-
- <issue
- id="RequireUnstableAidlAnnotation"
- message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
- errorLine1="parcelable ReadExerciseRouteRequest;"
- errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
- <location
- file="src/main/aidl/androidx/health/platform/client/request/ReadExerciseRouteRequest.aidl"/>
- </issue>
-
- <issue
- id="RequireUnstableAidlAnnotation"
- message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
- errorLine1="parcelable ReadExerciseRouteResponse;"
- errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
- <location
- file="src/main/aidl/androidx/health/platform/client/response/ReadExerciseRouteResponse.aidl"/>
- </issue>
-
- <issue
- id="RequireUnstableAidlAnnotation"
- message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
- errorLine1="parcelable RegisterForDataNotificationsRequest;"
- errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
- <location
- file="src/main/aidl/androidx/health/platform/client/request/RegisterForDataNotificationsRequest.aidl"/>
- </issue>
-
- <issue
- id="RequireUnstableAidlAnnotation"
- message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
- errorLine1="parcelable RequestContext;"
- errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~">
- <location
- file="src/main/aidl/androidx/health/platform/client/request/RequestContext.aidl"/>
- </issue>
-
- <issue
- id="RequireUnstableAidlAnnotation"
- message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
- errorLine1="parcelable UnregisterFromDataNotificationsRequest;"
- errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
- <location
- file="src/main/aidl/androidx/health/platform/client/request/UnregisterFromDataNotificationsRequest.aidl"/>
- </issue>
-
- <issue
- id="RequireUnstableAidlAnnotation"
- message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
- errorLine1="parcelable UpsertDataRequest;"
- errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
- <location
- file="src/main/aidl/androidx/health/platform/client/request/UpsertDataRequest.aidl"/>
- </issue>
-
- <issue
- id="RequireUnstableAidlAnnotation"
- message="Unstable AIDL files must be annotated with `@RequiresOptIn` marker"
- errorLine1="parcelable UpsertExerciseRouteRequest;"
- errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
- <location
- file="src/main/aidl/androidx/health/platform/client/request/UpsertExerciseRouteRequest.aidl"/>
- </issue>
-
- <issue
id="UnknownNullness"
message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://developer.android.com/kotlin/interop#nullability_annotations"
errorLine1=" public ClientConfiguration(String apiClientName, String servicePackageName, String bindAction) {"
diff --git a/health/connect/connect-client/src/main/java/androidx/health/connect/client/HealthConnectClient.kt b/health/connect/connect-client/src/main/java/androidx/health/connect/client/HealthConnectClient.kt
index d49ba6a..50c59b0 100644
--- a/health/connect/connect-client/src/main/java/androidx/health/connect/client/HealthConnectClient.kt
+++ b/health/connect/connect-client/src/main/java/androidx/health/connect/client/HealthConnectClient.kt
@@ -25,8 +25,6 @@
import androidx.annotation.IntDef
import androidx.annotation.RestrictTo
import androidx.core.content.pm.PackageInfoCompat
-import androidx.core.os.BuildCompat
-import androidx.core.os.BuildCompat.PrereleaseSdkCheck
import androidx.health.connect.client.aggregate.AggregateMetric
import androidx.health.connect.client.aggregate.AggregationResult
import androidx.health.connect.client.aggregate.AggregationResultGroupedByDuration
@@ -325,14 +323,11 @@
* Intent action to open Health Connect settings on this phone. Developers should use this
* if they want to re-direct the user to Health Connect.
*/
- @get:PrereleaseSdkCheck
- @get:Suppress("IllegalExperimentalApiUsage")
@get:JvmName("getHealthConnectSettingsAction")
@JvmStatic
- @PrereleaseSdkCheck
- @Suppress("OPT_IN_MARKER_ON_WRONG_TARGET", "IllegalExperimentalApiUsage")
val ACTION_HEALTH_CONNECT_SETTINGS =
- if (BuildCompat.isAtLeastU()) "android.health.connect.action.HEALTH_HOME_SETTINGS"
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE)
+ "android.health.connect.action.HEALTH_HOME_SETTINGS"
else "androidx.health.ACTION_HEALTH_CONNECT_SETTINGS"
/**
@@ -381,8 +376,6 @@
@JvmOverloads
@JvmStatic
@AvailabilityStatus
- @PrereleaseSdkCheck
- @Suppress("IllegalExperimentalApiUsage")
fun getSdkStatus(
context: Context,
providerPackageName: String = DEFAULT_PROVIDER_PACKAGE_NAME,
@@ -442,13 +435,11 @@
@JvmOverloads
@JvmStatic
@Deprecated("use sdkStatus()", ReplaceWith("sdkStatus(context)"))
- @PrereleaseSdkCheck
- @Suppress("IllegalExperimentalApiUsage")
public fun isProviderAvailable(
context: Context,
providerPackageName: String = DEFAULT_PROVIDER_PACKAGE_NAME,
): Boolean {
- if (BuildCompat.isAtLeastU()) {
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
return true
}
@Suppress("Deprecation")
@@ -472,8 +463,6 @@
*/
@JvmOverloads
@JvmStatic
- @PrereleaseSdkCheck
- @Suppress("IllegalExperimentalApiUsage")
public fun getOrCreate(
context: Context,
providerPackageName: String = DEFAULT_PROVIDER_PACKAGE_NAME,
@@ -487,7 +476,7 @@
throw IllegalStateException("Service not available")
}
- if (BuildCompat.isAtLeastU()) {
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
return HealthConnectClientUpsideDownImpl(context)
}
return HealthConnectClientImpl(
