In Play Services combination library, return UNDEFINED as the default value
Until the Play Services is ready, we need to fallback on the camera2 libarary even if the app depends on the Play Services AndroidX libarary.
Bug: 376806345
Test: manual test and ./gradlew bOS
Change-Id: I90283983b8bdd39c0ae93d6951804ba47da34c26
diff --git a/camera/camera-feature-combination-query-play-services/src/androidTest/java/androidx/camera/featurecombinationquery/playservices/PlayServicesCameraDeviceSetupCompatTest.kt b/camera/camera-feature-combination-query-play-services/src/androidTest/java/androidx/camera/featurecombinationquery/playservices/PlayServicesCameraDeviceSetupCompatTest.kt
index e2c097b..b13601a 100644
--- a/camera/camera-feature-combination-query-play-services/src/androidTest/java/androidx/camera/featurecombinationquery/playservices/PlayServicesCameraDeviceSetupCompatTest.kt
+++ b/camera/camera-feature-combination-query-play-services/src/androidTest/java/androidx/camera/featurecombinationquery/playservices/PlayServicesCameraDeviceSetupCompatTest.kt
@@ -20,7 +20,6 @@
import android.hardware.camera2.params.SessionConfiguration
import androidx.camera.featurecombinationquery.CameraDeviceSetupCompat.SupportQueryResult
import androidx.camera.featurecombinationquery.CameraDeviceSetupCompat.SupportQueryResult.SOURCE_PLAY_SERVICES
-import androidx.camera.featurecombinationquery.CameraDeviceSetupCompatFactory
import androidx.test.ext.junit.runners.AndroidJUnit4
import androidx.test.filters.SdkSuppress
import androidx.test.filters.SmallTest
@@ -40,8 +39,7 @@
@Test
fun queryResult_resultSourceIsPlayServices() {
// Arrange.
- val factory = CameraDeviceSetupCompatFactory(instrumentation.context)
- val impl = factory.getCameraDeviceSetupCompat("1")
+ val impl = PlayServicesCameraDeviceSetupCompat("0")
val sessionConfiguration =
SessionConfiguration(
SessionConfiguration.SESSION_REGULAR,
@@ -61,7 +59,7 @@
val result = impl.isSessionConfigurationSupported(sessionConfiguration)
// Assert.
assertThat(result.source).isEqualTo(SOURCE_PLAY_SERVICES)
- assertThat(result.supported).isEqualTo(SupportQueryResult.RESULT_UNSUPPORTED)
+ assertThat(result.supported).isEqualTo(SupportQueryResult.RESULT_UNDEFINED)
assertThat(result.timestampMillis).isEqualTo(0)
}
}
diff --git a/camera/camera-feature-combination-query-play-services/src/main/java/androidx/camera/featurecombinationquery/playservices/PlayServicesCameraDeviceSetupCompat.java b/camera/camera-feature-combination-query-play-services/src/main/java/androidx/camera/featurecombinationquery/playservices/PlayServicesCameraDeviceSetupCompat.java
index 9e53d6a..95a6da3 100644
--- a/camera/camera-feature-combination-query-play-services/src/main/java/androidx/camera/featurecombinationquery/playservices/PlayServicesCameraDeviceSetupCompat.java
+++ b/camera/camera-feature-combination-query-play-services/src/main/java/androidx/camera/featurecombinationquery/playservices/PlayServicesCameraDeviceSetupCompat.java
@@ -16,7 +16,7 @@
package androidx.camera.featurecombinationquery.playservices;
-import static androidx.camera.featurecombinationquery.CameraDeviceSetupCompat.SupportQueryResult.RESULT_UNSUPPORTED;
+import static androidx.camera.featurecombinationquery.CameraDeviceSetupCompat.SupportQueryResult.RESULT_UNDEFINED;
import static androidx.camera.featurecombinationquery.CameraDeviceSetupCompat.SupportQueryResult.SOURCE_PLAY_SERVICES;
import android.hardware.camera2.params.SessionConfiguration;
@@ -43,6 +43,6 @@
public SupportQueryResult isSessionConfigurationSupported(
@NonNull SessionConfiguration sessionConfig) {
// TODO: Implement this once Google Play Services CameraDeviceSetup is available.
- return new SupportQueryResult(RESULT_UNSUPPORTED, SOURCE_PLAY_SERVICES, 0);
+ return new SupportQueryResult(RESULT_UNDEFINED, SOURCE_PLAY_SERVICES, 0);
}
}
