Flag off the RouteRequestActivity
Bug: 245085822
Test: atest HealthConnectControllerUITests
Change-Id: I061717bb533b5b0b93dea8f3dc6ceec604032dc5
diff --git a/apk/src/com/android/healthconnect/controller/permissions/request/PermissionsFragment.kt b/apk/src/com/android/healthconnect/controller/permissions/request/PermissionsFragment.kt
index 59a4f63..0715c88 100644
--- a/apk/src/com/android/healthconnect/controller/permissions/request/PermissionsFragment.kt
+++ b/apk/src/com/android/healthconnect/controller/permissions/request/PermissionsFragment.kt
@@ -19,7 +19,6 @@
package com.android.healthconnect.controller.permissions.request
import android.os.Bundle
-import android.util.Log
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
diff --git a/apk/src/com/android/healthconnect/controller/route/RouteRequestActivity.kt b/apk/src/com/android/healthconnect/controller/route/RouteRequestActivity.kt
index f97a437..4fe2a71 100644
--- a/apk/src/com/android/healthconnect/controller/route/RouteRequestActivity.kt
+++ b/apk/src/com/android/healthconnect/controller/route/RouteRequestActivity.kt
@@ -34,6 +34,7 @@
import com.android.healthconnect.controller.route.ExerciseRouteViewModel.SessionWithAttribution
import com.android.healthconnect.controller.shared.app.AppInfoReader
import com.android.healthconnect.controller.shared.map.MapView
+import com.android.healthconnect.controller.utils.FeatureUtils
import com.android.healthconnect.controller.utils.LocalDateTimeFormatter
import dagger.hilt.android.AndroidEntryPoint
import javax.inject.Inject
@@ -48,6 +49,7 @@
}
@Inject lateinit var appInfoReader: AppInfoReader
+ @Inject lateinit var featureUtils: FeatureUtils
@VisibleForTesting lateinit var dialog: AlertDialog
@VisibleForTesting lateinit var infoDialog: AlertDialog
@@ -57,6 +59,13 @@
public override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
+ if (!featureUtils.isExerciseRouteEnabled()) {
+ Log.e(TAG, "Exercise routes not available, finishing.")
+ setResult(Activity.RESULT_CANCELED, Intent())
+ finish()
+ return
+ }
+
if (!intent.hasExtra(EXTRA_SESSION_ID) ||
intent.getStringExtra(EXTRA_SESSION_ID) == null ||
!intent.hasExtra(EXTRA_PACKAGE_NAME) ||
