| commit | 244163232872d734633c031db8ad094d59b7e724 | [log] [tgz] |
|---|---|---|
| author | Hengrui CAO <hengruicao@google.com> | Mon Jul 18 14:48:12 2022 +0100 |
| committer | Hengrui CAO <hengruicao@google.com> | Mon Jul 18 15:00:02 2022 +0100 |
| tree | 34351bd2e74e2b2720497354aeba1646994701c7 | |
| parent | 6a924e91d248178987bc376d71b561cc6a2885e7 [diff] |
Merge from androidx-platform-dev. Original change: https://googleplex-android-review.git.corp.google.com/c/platform/frameworks/support/+/17774190 Platform dev had deprecation methods so this diverged line prevents future auto-merger from merging properly, see failures in aosp/2143892. Bug: 229972514 Test: :health:health-connect-client:test Change-Id: If3efe2e8f977bfd30e89af713ca64cae6e2c8b91
diff --git a/health/health-connect-client/src/main/java/androidx/health/connect/client/permission/HealthDataRequestPermissions.kt b/health/health-connect-client/src/main/java/androidx/health/connect/client/permission/HealthDataRequestPermissions.kt index 16bade1..c697b09 100644 --- a/health/health-connect-client/src/main/java/androidx/health/connect/client/permission/HealthDataRequestPermissions.kt +++ b/health/health-connect-client/src/main/java/androidx/health/connect/client/permission/HealthDataRequestPermissions.kt
@@ -58,6 +58,7 @@ } } + @Suppress("DEPRECATION") override fun parseResult(resultCode: Int, intent: Intent?): Set<Permission> { return intent ?.getParcelableArrayListExtra<ProtoPermission>(KEY_GRANTED_PERMISSIONS_JETPACK)