Merge "Split out Flow.Spotting into its own record type." into androidx-main

diff --git a/activity/activity/build.gradle b/activity/activity/build.gradle
index d086cea..27fd54e 100644
--- a/activity/activity/build.gradle
+++ b/activity/activity/build.gradle

@@ -9,7 +9,6 @@
 android {
     defaultConfig {
         multiDexEnabled true
-        testInstrumentationRunnerArgument "listener", "leakcanary.FailTestOnLeakRunListener"
     }
     namespace "androidx.activity"
 }

diff --git a/activity/activity/src/androidTest/java/androidx/activity/ComponentActivityCallbacksTest.kt b/activity/activity/src/androidTest/java/androidx/activity/ComponentActivityCallbacksTest.kt
index f773be2..ab89766 100644
--- a/activity/activity/src/androidTest/java/androidx/activity/ComponentActivityCallbacksTest.kt
+++ b/activity/activity/src/androidTest/java/androidx/activity/ComponentActivityCallbacksTest.kt

@@ -30,12 +30,18 @@
 import androidx.testutils.withUse
 import com.google.common.truth.Truth.assertThat
 import com.google.common.truth.Truth.assertWithMessage
+import leakcanary.DetectLeaksAfterTestSuccess
+import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 
 @LargeTest
 @RunWith(AndroidJUnit4::class)
 class ComponentActivityCallbacksTest {
+
+    @get:Rule
+    val rule = DetectLeaksAfterTestSuccess()
+
     @Test
     fun onConfigurationChanged() {
        withUse(ActivityScenario.launch(ComponentActivity::class.java)) {

diff --git a/activity/activity/src/androidTest/java/androidx/activity/ComponentActivityLifecycleTest.kt b/activity/activity/src/androidTest/java/androidx/activity/ComponentActivityLifecycleTest.kt
index 56ed97d..2a23d40 100644
--- a/activity/activity/src/androidTest/java/androidx/activity/ComponentActivityLifecycleTest.kt
+++ b/activity/activity/src/androidTest/java/androidx/activity/ComponentActivityLifecycleTest.kt

@@ -24,6 +24,8 @@
 import androidx.test.filters.LargeTest
 import androidx.testutils.withActivity
 import com.google.common.truth.Truth.assertThat
+import leakcanary.DetectLeaksAfterTestSuccess
+import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 
@@ -37,6 +39,9 @@
 @RunWith(AndroidJUnit4::class)
 class ComponentActivityLifecycleTest {
 
+    @get:Rule
+    val rule = DetectLeaksAfterTestSuccess()
+
     @Test
     @Throws(Throwable::class)
     fun testLifecycleObserver() {

diff --git a/activity/activity/src/androidTest/java/androidx/activity/ComponentActivityMenuTest.kt b/activity/activity/src/androidTest/java/androidx/activity/ComponentActivityMenuTest.kt
index 4062812..f72721a 100644
--- a/activity/activity/src/androidTest/java/androidx/activity/ComponentActivityMenuTest.kt
+++ b/activity/activity/src/androidTest/java/androidx/activity/ComponentActivityMenuTest.kt

@@ -44,6 +44,8 @@
 import com.google.common.truth.Truth.assertWithMessage
 import java.util.concurrent.CountDownLatch
 import java.util.concurrent.TimeUnit
+import leakcanary.DetectLeaksAfterTestSuccess
+import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 
@@ -53,6 +55,9 @@
 @RunWith(AndroidJUnit4::class)
 class ComponentActivityMenuTest {
 
+    @get:Rule
+    val rule = DetectLeaksAfterTestSuccess()
+
     @Test
     fun inflatesMenu() {
        withUse(ActivityScenario.launch(ComponentActivity::class.java)) {

diff --git a/activity/activity/src/androidTest/java/androidx/activity/ComponentActivityOverrideLifecycleTest.kt b/activity/activity/src/androidTest/java/androidx/activity/ComponentActivityOverrideLifecycleTest.kt
index 8e67e4f..23758b0 100644
--- a/activity/activity/src/androidTest/java/androidx/activity/ComponentActivityOverrideLifecycleTest.kt
+++ b/activity/activity/src/androidTest/java/androidx/activity/ComponentActivityOverrideLifecycleTest.kt

@@ -25,7 +25,9 @@
 import androidx.testutils.withActivity
 import androidx.testutils.withUse
 import com.google.common.truth.Truth.assertThat
+import leakcanary.DetectLeaksAfterTestSuccess
 import org.junit.Assert.fail
+import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 
@@ -33,6 +35,9 @@
 @RunWith(AndroidJUnit4::class)
 class ComponentActivityOverrideLifecycleTest {
 
+    @get:Rule
+    val rule = DetectLeaksAfterTestSuccess()
+
     @UiThreadTest
     @Test
     fun testEagerOverride() {

diff --git a/activity/activity/src/androidTest/java/androidx/activity/ComponentActivityReportFullyDrawnTest.kt b/activity/activity/src/androidTest/java/androidx/activity/ComponentActivityReportFullyDrawnTest.kt
index c0a91ed..a091c94 100644
--- a/activity/activity/src/androidTest/java/androidx/activity/ComponentActivityReportFullyDrawnTest.kt
+++ b/activity/activity/src/androidTest/java/androidx/activity/ComponentActivityReportFullyDrawnTest.kt

@@ -20,6 +20,8 @@
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.LargeTest
 import androidx.testutils.withActivity
+import leakcanary.DetectLeaksAfterTestSuccess
+import org.junit.Rule
 import androidx.testutils.withUse
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -28,6 +30,9 @@
 @RunWith(AndroidJUnit4::class)
 class ComponentActivityReportFullyDrawnTest {
 
+    @get:Rule
+    val rule = DetectLeaksAfterTestSuccess()
+
     @Test
     fun testReportFullyDrawn() {
        withUse(ActivityScenario.launch(ReportFullyDrawnActivity::class.java)) {

diff --git a/activity/activity/src/androidTest/java/androidx/activity/ComponentActivityResultTest.kt b/activity/activity/src/androidTest/java/androidx/activity/ComponentActivityResultTest.kt
index ecbd905..e2025c9 100644
--- a/activity/activity/src/androidTest/java/androidx/activity/ComponentActivityResultTest.kt
+++ b/activity/activity/src/androidTest/java/androidx/activity/ComponentActivityResultTest.kt

@@ -31,6 +31,8 @@
 import androidx.test.filters.LargeTest
 import androidx.testutils.withActivity
 import com.google.common.truth.Truth.assertThat
+import leakcanary.DetectLeaksAfterTestSuccess
+import org.junit.Rule
 import java.util.concurrent.CountDownLatch
 import java.util.concurrent.TimeUnit
 import org.junit.Test
@@ -39,6 +41,10 @@
 @LargeTest
 @RunWith(AndroidJUnit4::class)
 class ComponentActivityResultTest {
+
+    @get:Rule
+    val rule = DetectLeaksAfterTestSuccess()
+
     @Test
     fun launchInOnCreate() {
         ActivityScenario.launch(ResultComponentActivity::class.java).use { scenario ->

diff --git a/activity/activity/src/androidTest/java/androidx/activity/ComponentActivityRunOnNextRecreateTest.kt b/activity/activity/src/androidTest/java/androidx/activity/ComponentActivityRunOnNextRecreateTest.kt
index e89edfa..38fe672 100644
--- a/activity/activity/src/androidTest/java/androidx/activity/ComponentActivityRunOnNextRecreateTest.kt
+++ b/activity/activity/src/androidTest/java/androidx/activity/ComponentActivityRunOnNextRecreateTest.kt

@@ -26,6 +26,8 @@
 import androidx.testutils.withActivity
 import androidx.testutils.withUse
 import com.google.common.truth.Truth.assertThat
+import leakcanary.DetectLeaksAfterTestSuccess
+import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 
@@ -33,6 +35,9 @@
 @RunWith(AndroidJUnit4::class)
 class ComponentActivityRunOnNextRecreateTest {
 
+    @get:Rule
+    val rule = DetectLeaksAfterTestSuccess()
+
     private class Restarted2 : SavedStateRegistry.AutoRecreated {
         override fun onRecreated(owner: SavedStateRegistryOwner) {
             (owner as? AutoRestarterActivity)?.restartedValue = "restarted"

diff --git a/activity/activity/src/androidTest/java/androidx/activity/ComponentActivitySavedStateTest.kt b/activity/activity/src/androidTest/java/androidx/activity/ComponentActivitySavedStateTest.kt
index 238b742..0222cd4 100644
--- a/activity/activity/src/androidTest/java/androidx/activity/ComponentActivitySavedStateTest.kt
+++ b/activity/activity/src/androidTest/java/androidx/activity/ComponentActivitySavedStateTest.kt

@@ -27,7 +27,9 @@
 import androidx.testutils.withActivity
 import androidx.testutils.withUse
 import com.google.common.truth.Truth.assertThat
+import leakcanary.DetectLeaksAfterTestSuccess
 import org.junit.After
+import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 
@@ -35,6 +37,9 @@
 @RunWith(AndroidJUnit4::class)
 class ComponentActivitySavedStateTest {
 
+    @get:Rule
+    val rule = DetectLeaksAfterTestSuccess()
+
     @After
     fun clear() {
         SavedStateActivity.checkEnabledInOnCreate = false

diff --git a/activity/activity/src/androidTest/java/androidx/activity/ComponentActivityViewModelTest.kt b/activity/activity/src/androidTest/java/androidx/activity/ComponentActivityViewModelTest.kt
index 4b9b9e6..cd451a7 100644
--- a/activity/activity/src/androidTest/java/androidx/activity/ComponentActivityViewModelTest.kt
+++ b/activity/activity/src/androidTest/java/androidx/activity/ComponentActivityViewModelTest.kt

@@ -31,6 +31,8 @@
 import androidx.testutils.withUse
 import com.google.common.truth.Truth.assertThat
 import com.google.common.truth.Truth.assertWithMessage
+import leakcanary.DetectLeaksAfterTestSuccess
+import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 
@@ -38,6 +40,9 @@
 @RunWith(AndroidJUnit4::class)
 class ComponentActivityViewModelTest {
 
+    @get:Rule
+    val rule = DetectLeaksAfterTestSuccess()
+
     @Test(expected = IllegalStateException::class)
     @UiThreadTest
     fun testNotAttachedActivity() {

diff --git a/activity/activity/src/androidTest/java/androidx/activity/ComponentDialogTest.kt b/activity/activity/src/androidTest/java/androidx/activity/ComponentDialogTest.kt
index 5eaa89cb..b3a2567 100644
--- a/activity/activity/src/androidTest/java/androidx/activity/ComponentDialogTest.kt
+++ b/activity/activity/src/androidTest/java/androidx/activity/ComponentDialogTest.kt

@@ -26,6 +26,8 @@
 import androidx.testutils.withUse
 import com.google.common.truth.Truth.assertThat
 import com.google.common.truth.Truth.assertWithMessage
+import leakcanary.DetectLeaksAfterTestSuccess
+import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 
@@ -33,6 +35,10 @@
 @LargeTest
 @RunWith(AndroidJUnit4::class)
 class ComponentDialogTest {
+
+    @get:Rule
+    val rule = DetectLeaksAfterTestSuccess()
+
     @Test
     fun testLifecycle() {
        withUse(ActivityScenario.launch(EmptyContentActivity::class.java)) {

diff --git a/activity/activity/src/androidTest/java/androidx/activity/ContentViewTest.kt b/activity/activity/src/androidTest/java/androidx/activity/ContentViewTest.kt
index 1908896..925adcd 100644
--- a/activity/activity/src/androidTest/java/androidx/activity/ContentViewTest.kt
+++ b/activity/activity/src/androidTest/java/androidx/activity/ContentViewTest.kt

@@ -31,6 +31,8 @@
 import androidx.testutils.withUse
 import com.google.common.truth.Truth.assertThat
 import com.google.common.truth.Truth.assertWithMessage
+import leakcanary.DetectLeaksAfterTestSuccess
+import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 
@@ -38,6 +40,9 @@
 @RunWith(AndroidJUnit4::class)
 class ContentViewTest {
 
+    @get:Rule
+    val rule = DetectLeaksAfterTestSuccess()
+
     @Test
     fun testLifecycleObserver() {
        withUse(ActivityScenario.launch(ContentViewActivity::class.java)) {

diff --git a/activity/activity/src/androidTest/java/androidx/activity/FullyDrawnReporterTest.kt b/activity/activity/src/androidTest/java/androidx/activity/FullyDrawnReporterTest.kt
index 2d7ff0a..1562394 100644
--- a/activity/activity/src/androidTest/java/androidx/activity/FullyDrawnReporterTest.kt
+++ b/activity/activity/src/androidTest/java/androidx/activity/FullyDrawnReporterTest.kt

@@ -32,6 +32,8 @@
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.sync.Mutex
+import leakcanary.DetectLeaksAfterTestSuccess
+import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 
@@ -39,6 +41,10 @@
 @RunWith(AndroidJUnit4::class)
 @SdkSuppress(minSdkVersion = Build.VERSION_CODES.KITKAT)
 class FullyDrawnReporterTest {
+
+    @get:Rule
+    val rule = DetectLeaksAfterTestSuccess()
+
     @Test
     fun findFullyDrawnReporterOwner() {
         withUse(ActivityScenario.launch(FullyDrawnActivity::class.java)) {

diff --git a/activity/activity/src/androidTest/java/androidx/activity/LeakInputMethodManagerTest.kt b/activity/activity/src/androidTest/java/androidx/activity/LeakInputMethodManagerTest.kt
index f324886..19d07fd 100644
--- a/activity/activity/src/androidTest/java/androidx/activity/LeakInputMethodManagerTest.kt
+++ b/activity/activity/src/androidTest/java/androidx/activity/LeakInputMethodManagerTest.kt

@@ -25,20 +25,26 @@
 import android.widget.TextView
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.LargeTest
-import org.junit.Rule
-import org.junit.Test
-import org.junit.runner.RunWith
 import java.util.concurrent.CountDownLatch
 import java.util.concurrent.TimeUnit
+import leakcanary.DetectLeaksAfterTestSuccess
+import org.junit.Rule
+import org.junit.Test
+import org.junit.rules.RuleChain
+import org.junit.runner.RunWith
 
 @LargeTest
 @RunWith(AndroidJUnit4::class)
 class LeakInputMethodManagerTest {
 
     @Suppress("DEPRECATION")
-    @get:Rule
     val activityRule = androidx.test.rule.ActivityTestRule(LeakingActivity::class.java)
 
+    // Detect leaks BEFORE and AFTER activity is destroyed
+    @get:Rule
+    val ruleChain: RuleChain = RuleChain.outerRule(DetectLeaksAfterTestSuccess())
+        .around(activityRule)
+
     @Test
     fun leakThroughRemovedEditText() {
         activityRule.runOnUiThread {

diff --git a/activity/activity/src/androidTest/java/androidx/activity/OnBackPressedDispatcherInvokerTest.kt b/activity/activity/src/androidTest/java/androidx/activity/OnBackPressedDispatcherInvokerTest.kt
index 5e1790d..1ff31b7 100644
--- a/activity/activity/src/androidTest/java/androidx/activity/OnBackPressedDispatcherInvokerTest.kt
+++ b/activity/activity/src/androidTest/java/androidx/activity/OnBackPressedDispatcherInvokerTest.kt

@@ -24,6 +24,8 @@
 import androidx.test.filters.SdkSuppress
 import androidx.test.filters.SmallTest
 import com.google.common.truth.Truth.assertThat
+import leakcanary.DetectLeaksAfterTestSuccess
+import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 
@@ -33,6 +35,9 @@
 @SdkSuppress(minSdkVersion = Build.VERSION_CODES.S_V2)
 class OnBackPressedDispatcherInvokerTest {
 
+    @get:Rule
+    val rule = DetectLeaksAfterTestSuccess()
+
     @Test
     fun testSimpleInvoker() {
         var registerCount = 0

diff --git a/activity/activity/src/androidTest/java/androidx/activity/OnBackPressedDispatcherTest.kt b/activity/activity/src/androidTest/java/androidx/activity/OnBackPressedDispatcherTest.kt
index 3a75468..7380772 100644
--- a/activity/activity/src/androidTest/java/androidx/activity/OnBackPressedDispatcherTest.kt
+++ b/activity/activity/src/androidTest/java/androidx/activity/OnBackPressedDispatcherTest.kt

@@ -26,7 +26,9 @@
 import androidx.testutils.withActivity
 import androidx.testutils.withUse
 import com.google.common.truth.Truth.assertWithMessage
+import leakcanary.DetectLeaksAfterTestSuccess
 import org.junit.Before
+import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 
@@ -37,6 +39,9 @@
     private var fallbackCount = 0
     lateinit var dispatcher: OnBackPressedDispatcher
 
+    @get:Rule
+    val rule = DetectLeaksAfterTestSuccess()
+
     @Before
     fun setup() {
         fallbackCount = 0

diff --git a/activity/activity/src/androidTest/java/androidx/activity/ViewTreeOnBackPressedDispatcherTest.kt b/activity/activity/src/androidTest/java/androidx/activity/ViewTreeOnBackPressedDispatcherTest.kt
index 98a312c..f78e6ea 100644
--- a/activity/activity/src/androidTest/java/androidx/activity/ViewTreeOnBackPressedDispatcherTest.kt
+++ b/activity/activity/src/androidTest/java/androidx/activity/ViewTreeOnBackPressedDispatcherTest.kt

@@ -23,12 +23,18 @@
 import androidx.test.filters.SmallTest
 import androidx.test.platform.app.InstrumentationRegistry
 import com.google.common.truth.Truth.assertWithMessage
+import leakcanary.DetectLeaksAfterTestSuccess
+import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 
 @SmallTest
 @RunWith(AndroidJUnit4::class)
 class ViewTreeOnBackPressedDispatcherTest {
+
+    @get:Rule
+    val rule = DetectLeaksAfterTestSuccess()
+
     /**
      * Tests that a direct set/get on a single view survives a round trip
      */

diff --git a/activity/activity/src/androidTest/java/androidx/activity/contextaware/ContextAwareHelperTest.kt b/activity/activity/src/androidTest/java/androidx/activity/contextaware/ContextAwareHelperTest.kt
index 424d646..e3bbb87 100644
--- a/activity/activity/src/androidTest/java/androidx/activity/contextaware/ContextAwareHelperTest.kt
+++ b/activity/activity/src/androidTest/java/androidx/activity/contextaware/ContextAwareHelperTest.kt

@@ -21,6 +21,8 @@
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.SmallTest
 import com.google.common.truth.Truth.assertThat
+import leakcanary.DetectLeaksAfterTestSuccess
+import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 
@@ -29,6 +31,9 @@
 class ContextAwareHelperTest {
     private val contextAware = TestContextAware()
 
+    @get:Rule
+    val rule = DetectLeaksAfterTestSuccess()
+
     @Test
     fun addOnContextAvailableListener() {
         var callbackCount = 0

diff --git a/activity/activity/src/androidTest/java/androidx/activity/result/ActivityResultLauncherTest.kt b/activity/activity/src/androidTest/java/androidx/activity/result/ActivityResultLauncherTest.kt
index f6240cc..3ef8476 100644
--- a/activity/activity/src/androidTest/java/androidx/activity/result/ActivityResultLauncherTest.kt
+++ b/activity/activity/src/androidTest/java/androidx/activity/result/ActivityResultLauncherTest.kt

@@ -26,6 +26,8 @@
 import androidx.test.filters.SdkSuppress
 import com.google.common.truth.Truth.assertThat
 import com.google.common.truth.Truth.assertWithMessage
+import leakcanary.DetectLeaksAfterTestSuccess
+import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 
@@ -47,6 +49,9 @@
         }
     }
 
+    @get:Rule
+    val rule = DetectLeaksAfterTestSuccess()
+
     @Test
     fun launchTest() {
         val launcher = registry.register("key", StartActivityForResult()) {}

diff --git a/activity/activity/src/androidTest/java/androidx/activity/result/ActivityResultRegistryTest.kt b/activity/activity/src/androidTest/java/androidx/activity/result/ActivityResultRegistryTest.kt
index 03474b9..dad575f 100644
--- a/activity/activity/src/androidTest/java/androidx/activity/result/ActivityResultRegistryTest.kt
+++ b/activity/activity/src/androidTest/java/androidx/activity/result/ActivityResultRegistryTest.kt

@@ -29,7 +29,9 @@
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.MediumTest
 import com.google.common.truth.Truth.assertThat
+import leakcanary.DetectLeaksAfterTestSuccess
 import org.junit.Assert.fail
+import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 
@@ -47,6 +49,9 @@
         }
     }
 
+    @get:Rule
+    val rule = DetectLeaksAfterTestSuccess()
+
     @Test
     fun testRegisterLifecycleOwnerCallback() {
         val lifecycleOwner = TestLifecycleOwner(Lifecycle.State.INITIALIZED)

diff --git a/activity/activity/src/androidTest/java/androidx/activity/result/PickVisualMediaRequestTest.kt b/activity/activity/src/androidTest/java/androidx/activity/result/PickVisualMediaRequestTest.kt
index 42992fb..fde1fa0 100644
--- a/activity/activity/src/androidTest/java/androidx/activity/result/PickVisualMediaRequestTest.kt
+++ b/activity/activity/src/androidTest/java/androidx/activity/result/PickVisualMediaRequestTest.kt

@@ -20,6 +20,8 @@
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.MediumTest
 import com.google.common.truth.Truth.assertThat
+import leakcanary.DetectLeaksAfterTestSuccess
+import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 
@@ -27,6 +29,9 @@
 @RunWith(AndroidJUnit4::class)
 class PickVisualMediaRequestTest {
 
+    @get:Rule
+    val rule = DetectLeaksAfterTestSuccess()
+
     @Test
     fun buildPickVisualMedia() {
         val request = PickVisualMediaRequest.Builder().setMediaType(

diff --git a/activity/integration-tests/testapp/build.gradle b/activity/integration-tests/testapp/build.gradle
index 733b7e4..b8d1e1f 100644
--- a/activity/integration-tests/testapp/build.gradle
+++ b/activity/integration-tests/testapp/build.gradle

@@ -22,8 +22,6 @@
 
 android {
     defaultConfig {
-        testInstrumentationRunnerArgument "listener", "com.squareup.leakcanary.FailTestOnLeakRunListener"
-
         applicationId "androidx.activity.integration.testapp"
     }
     namespace "androidx.activity.integration.testapp"

diff --git a/appcompat/appcompat/build.gradle b/appcompat/appcompat/build.gradle
index 6b454fa..c188aea 100644
--- a/appcompat/appcompat/build.gradle
+++ b/appcompat/appcompat/build.gradle

@@ -54,7 +54,6 @@
         exclude group: "androidx.appcompat", module: "appcompat"
         exclude group: "androidx.core", module: "core"
     })
-    androidTestImplementation(projectOrArtifact(":recyclerview:recyclerview"))
     androidTestImplementation(libs.multidex)
 
     testImplementation(libs.kotlinStdlib)

diff --git a/appcompat/appcompat/src/androidTest/java/androidx/appcompat/app/BaseBasicsTestCase.java b/appcompat/appcompat/src/androidTest/java/androidx/appcompat/app/BaseBasicsTestCase.java
index 863853d..e126d37 100644
--- a/appcompat/appcompat/src/androidTest/java/androidx/appcompat/app/BaseBasicsTestCase.java
+++ b/appcompat/appcompat/src/androidTest/java/androidx/appcompat/app/BaseBasicsTestCase.java

@@ -56,6 +56,7 @@
 import androidx.test.filters.SmallTest;
 import androidx.test.rule.ActivityTestRule;
 
+import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -80,6 +81,7 @@
                 mActivityTestRule.getActivity().getSupportActionBar());
     }
 
+    @Ignore // b/256195085
     @Test
     public void testActionBarOverflowVisibilityListener() {
         if ("ranchu".equals(Build.HARDWARE)) {

diff --git a/appcompat/appcompat/src/androidTest/java/androidx/appcompat/app/LocalesUpdateTestCase.kt b/appcompat/appcompat/src/androidTest/java/androidx/appcompat/app/LocalesUpdateTestCase.kt
index 5bd08dc..3e48121 100644
--- a/appcompat/appcompat/src/androidTest/java/androidx/appcompat/app/LocalesUpdateTestCase.kt
+++ b/appcompat/appcompat/src/androidTest/java/androidx/appcompat/app/LocalesUpdateTestCase.kt

@@ -26,6 +26,7 @@
 import androidx.appcompat.testutils.LocalesUtils.setLocalesAndWait
 import androidx.appcompat.testutils.LocalesUtils.setLocalesAndWaitForRecreate
 import androidx.core.os.LocaleListCompat
+import androidx.test.filters.FlakyTest
 import androidx.test.filters.LargeTest
 import androidx.test.filters.SdkSuppress
 import androidx.testutils.waitForExecution
@@ -118,6 +119,7 @@
 
     @SdkSuppress(minSdkVersion = 17)
     @Test
+    @FlakyTest(bugId = 255765202)
     fun testLayoutDirectionAfterRecreating() {
         setLocalesAndWaitForRecreate(rule, getRTLLocaleList())
 

diff --git a/benchmark/benchmark-darwin-gradle-plugin/build.gradle b/benchmark/benchmark-darwin-gradle-plugin/build.gradle
index 4282513..ee36734 100644
--- a/benchmark/benchmark-darwin-gradle-plugin/build.gradle
+++ b/benchmark/benchmark-darwin-gradle-plugin/build.gradle

@@ -25,6 +25,7 @@
 
 dependencies {
     api(gradleApi())
+    implementation(libs.kotlinGradlePluginz)
     implementation(libs.gson)
     implementation(libs.apacheCommonsMath)
     testImplementation(gradleTestKit())

diff --git a/benchmark/benchmark-darwin-gradle-plugin/src/main/kotlin/androidx/benchmark/darwin/gradle/DarwinBenchmarkPlugin.kt b/benchmark/benchmark-darwin-gradle-plugin/src/main/kotlin/androidx/benchmark/darwin/gradle/DarwinBenchmarkPlugin.kt
index b712be2..13f1350 100644
--- a/benchmark/benchmark-darwin-gradle-plugin/src/main/kotlin/androidx/benchmark/darwin/gradle/DarwinBenchmarkPlugin.kt
+++ b/benchmark/benchmark-darwin-gradle-plugin/src/main/kotlin/androidx/benchmark/darwin/gradle/DarwinBenchmarkPlugin.kt

@@ -16,8 +16,12 @@
 
 package androidx.benchmark.darwin.gradle
 
+import java.util.concurrent.atomic.AtomicBoolean
 import org.gradle.api.Plugin
 import org.gradle.api.Project
+import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
+import org.jetbrains.kotlin.gradle.plugin.KotlinMultiplatformPluginWrapper
+import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
 
 /**
  * The Darwin benchmark plugin that helps run KMP benchmarks on iOS devices, and extracts benchmark
@@ -28,6 +32,28 @@
         val extension =
             project.extensions.create("darwinBenchmark", DarwinBenchmarkPluginExtension::class.java)
 
+        val appliedDarwinPlugin = AtomicBoolean()
+
+        project.plugins.withType(KotlinMultiplatformPluginWrapper::class.java) {
+            val multiplatformExtension: KotlinMultiplatformExtension =
+                project.extensions.getByType(it.projectExtensionClass.java)
+            multiplatformExtension.targets.all { kotlinTarget ->
+                if (kotlinTarget is KotlinNativeTarget) {
+                    if (kotlinTarget.konanTarget.family.isAppleFamily) {
+                        // We want to apply the plugin only once.
+                        if (appliedDarwinPlugin.compareAndSet(false, true)) {
+                            applyDarwinPlugin(extension, project)
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    private fun applyDarwinPlugin(
+        extension: DarwinBenchmarkPluginExtension,
+        project: Project
+    ) {
         val xcodeProjectPath = extension.xcodeProjectName.flatMap { name ->
             project.layout.buildDirectory.dir("$name.xcodeproj")
         }
@@ -51,13 +77,10 @@
             it.xcodeProjectPath.set(generateXCodeProjectTask.flatMap { task ->
                 task.xcProjectPath
             })
-            val taskName = extension.xcFrameworkConfig.map { name ->
-                "assemble${name}ReleaseXCFramework"
-            }
             it.destination.set(extension.destination)
             it.scheme.set(extension.scheme)
             it.xcResultPath.set(xcResultPath)
-            it.dependsOn(taskName)
+            it.dependsOn(XCFRAMEWORK_TASK_NAME)
         }
 
         project.tasks.register(
@@ -78,5 +101,9 @@
         const val GENERATE_XCODE_PROJECT_TASK = "generateXCodeProject"
         const val RUN_DARWIN_BENCHMARKS_TASK = "runDarwinBenchmarks"
         const val DARWIN_BENCHMARK_RESULTS_TASK = "darwinBenchmarkResults"
+
+        // There is always a XCFrameworkConfig with the name `AndroidXDarwinBenchmarks`
+        // The corresponding task name is `assemble{name}ReleaseXCFramework`
+        const val XCFRAMEWORK_TASK_NAME = "assembleAndroidXDarwinBenchmarksReleaseXCFramework"
     }
 }

diff --git a/benchmark/benchmark-darwin-gradle-plugin/src/main/kotlin/androidx/benchmark/darwin/gradle/DarwinBenchmarkPluginExtension.kt b/benchmark/benchmark-darwin-gradle-plugin/src/main/kotlin/androidx/benchmark/darwin/gradle/DarwinBenchmarkPluginExtension.kt
index 83781e8..35fec87 100644
--- a/benchmark/benchmark-darwin-gradle-plugin/src/main/kotlin/androidx/benchmark/darwin/gradle/DarwinBenchmarkPluginExtension.kt
+++ b/benchmark/benchmark-darwin-gradle-plugin/src/main/kotlin/androidx/benchmark/darwin/gradle/DarwinBenchmarkPluginExtension.kt

@@ -43,10 +43,4 @@
      * This is typically discovered by using `xcrun xctrace list devices`.
      */
     abstract val destination: Property<String>
-
-    /**
-     * The name of the `XCFrameworkConfig` defined in the benchmark's module build.gradle.
-     * This is used to derive the name of the `release` task to generate the `XCFramework`.
-     */
-    abstract val xcFrameworkConfig: Property<String>
 }

diff --git a/benchmark/benchmark-darwin-samples/build.gradle b/benchmark/benchmark-darwin-samples/build.gradle
index da95b27..dc8c184 100644
--- a/benchmark/benchmark-darwin-samples/build.gradle
+++ b/benchmark/benchmark-darwin-samples/build.gradle

@@ -7,8 +7,7 @@
 }
 
 androidXMultiplatform {
-
-    // XCFrameworkConfig must match module name
+    // XCFrameworkConfig must always be called AndroidXDarwinBenchmarks
     def xcf = new XCFrameworkConfig(project, "AndroidXDarwinBenchmarks")
 
     ios {
@@ -57,7 +56,6 @@
     scheme = "testapp-ios"
     // ios 13, 15.2
     destination = "platform=iOS Simulator,name=iPhone 13,OS=15.2"
-    xcFrameworkConfig = "AndroidXDarwinBenchmarks"
 }
 
 androidx {

diff --git a/benchmark/benchmark-macro/src/androidTest/java/androidx/benchmark/macro/BaselineProfilesTest.kt b/benchmark/benchmark-macro/src/androidTest/java/androidx/benchmark/macro/BaselineProfilesTest.kt
index 602fcbc..05451ec 100644
--- a/benchmark/benchmark-macro/src/androidTest/java/androidx/benchmark/macro/BaselineProfilesTest.kt
+++ b/benchmark/benchmark-macro/src/androidTest/java/androidx/benchmark/macro/BaselineProfilesTest.kt

@@ -16,8 +16,11 @@
 
 package androidx.benchmark.macro
 
+import androidx.benchmark.DeviceInfo
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.SmallTest
+import kotlin.test.assertNotEquals
+import kotlin.test.assertTrue
 import org.junit.Assert.assertEquals
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -37,4 +40,15 @@
         assertEquals(filtered.lines().size, 1)
         assertEquals("Landroidx/Foo/Bar;", filtered)
     }
+
+    @Test
+    fun deviceSpecifier() {
+        if (DeviceInfo.isEmulator) {
+            assertEquals(deviceSpecifier, "-e ")
+        } else {
+            assertTrue(deviceSpecifier.startsWith("-s "), "observed $deviceSpecifier")
+            assertTrue(deviceSpecifier.endsWith(" "), "observed $deviceSpecifier")
+            assertNotEquals(deviceSpecifier, "-s  ")
+        }
+    }
 }

diff --git a/benchmark/benchmark-macro/src/androidTest/java/androidx/benchmark/macro/ConfigurableActivity.kt b/benchmark/benchmark-macro/src/androidTest/java/androidx/benchmark/macro/ConfigurableActivity.kt
index edfd61f..5d953d2 100644
--- a/benchmark/benchmark-macro/src/androidTest/java/androidx/benchmark/macro/ConfigurableActivity.kt
+++ b/benchmark/benchmark-macro/src/androidTest/java/androidx/benchmark/macro/ConfigurableActivity.kt

@@ -28,9 +28,10 @@
 class ConfigurableActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        val textContent = intent.getStringExtra(EXTRA_TEXT)
 
         val view = TextView(this).apply {
-            text = intent.getStringExtra(EXTRA_TEXT)
+            text = textContent
         }
         setContentView(view)
 
@@ -50,7 +51,11 @@
             else -> {
                 // report delayed, modify text
                 val runnable = {
-                    view.text = FULLY_DRAWN_TEXT
+                    view.text = if (textContent == INNER_ACTIVITY_TEXT) {
+                        INNER_ACTIVITY_FULLY_DRAWN_TEXT
+                    } else {
+                        FULLY_DRAWN_TEXT
+                    }
                     reportFullyDrawn()
                 }
                 view.postDelayed(runnable, reportFullyDrawnDelayMs)
@@ -76,6 +81,7 @@
         private const val EXTRA_REPORT_FULLY_DRAWN_DELAY_MS = "REPORT_FULLY_DRAWN_DELAY_MS"
         const val FULLY_DRAWN_TEXT = "FULLY DRAWN"
         const val INNER_ACTIVITY_TEXT = "INNER ACTIVITY"
+        const val INNER_ACTIVITY_FULLY_DRAWN_TEXT = "INNER ACTIVITY FULLY DRAWN"
 
         fun createIntent(
             text: String,

diff --git a/benchmark/benchmark-macro/src/androidTest/java/androidx/benchmark/macro/MacrobenchmarkScopeTest.kt b/benchmark/benchmark-macro/src/androidTest/java/androidx/benchmark/macro/MacrobenchmarkScopeTest.kt
index 0815a2a..3fc5027 100644
--- a/benchmark/benchmark-macro/src/androidTest/java/androidx/benchmark/macro/MacrobenchmarkScopeTest.kt
+++ b/benchmark/benchmark-macro/src/androidTest/java/androidx/benchmark/macro/MacrobenchmarkScopeTest.kt

@@ -27,11 +27,13 @@
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.uiautomator.By
 import androidx.test.uiautomator.UiDevice
+import kotlin.test.assertEquals
 import kotlin.test.assertFailsWith
+import kotlin.test.assertFalse
+import kotlin.test.assertNotEquals
 import kotlin.test.assertNotNull
+import kotlin.test.assertNull
 import kotlin.test.assertTrue
-import org.junit.Assert.assertEquals
-import org.junit.Assert.assertFalse
 import org.junit.Assert.fail
 import org.junit.Assume.assumeTrue
 import org.junit.Before
@@ -212,4 +214,58 @@
     /** Tests getFrameStats after launch which does nothing, as Activity already visible */
     @Test
     fun getFrameStats_noop() = validateLaunchAndFrameStats(pressHome = false)
+
+    private fun validateShaderCache(empty: Boolean, packageName: String) {
+        val path = MacrobenchmarkScope.getShaderCachePath(packageName)
+        println("validating shader path $path")
+        val fileCount = Shell.executeScript("find $path -type f | wc -l").trim().toInt()
+        if (empty) {
+            assertEquals(0, fileCount)
+        } else {
+            assertNotEquals(0, fileCount)
+        }
+    }
+
+    private fun validateDropShaderCacheWithRoot(
+        dropShaderCacheBlock: MacrobenchmarkScope.() -> Unit
+    ) {
+        // need root to inspect target app's code cache dir, and emulators
+        // don't seem to store shaders
+        assumeTrue(Shell.isSessionRooted() && !DeviceInfo.isEmulator)
+
+        val scope = MacrobenchmarkScope(
+            Packages.TARGET,
+            launchWithClearTask = false
+        )
+        // reset to empty to begin with
+        scope.killProcess()
+        scope.dropShaderCacheBlock()
+        validateShaderCache(empty = true, scope.packageName)
+
+        // start an activity, expecting shader compilation
+        scope.pressHome()
+        // NOTE: if platform fixes default activity to not compile shaders,
+        //   may need to update this test UI to trigger shader creation
+        scope.startActivityAndWait()
+        Thread.sleep(5000) // sleep to await flushing cache to disk
+        scope.killProcess()
+        validateShaderCache(empty = false, scope.packageName)
+
+        // verify deletion
+        scope.killProcess()
+        scope.dropShaderCacheBlock()
+        validateShaderCache(empty = true, scope.packageName)
+    }
+
+    @Test
+    fun dropShaderCacheBroadcast() = validateDropShaderCacheWithRoot {
+        // since this test runs on root and the public api falls back to
+        // a root impl, test the broadcast directly
+        assertNull(ProfileInstallBroadcast.dropShaderCache(packageName))
+    }
+
+    @Test
+    fun dropShaderCachePublicApi() = validateDropShaderCacheWithRoot {
+        dropShaderCache()
+    }
 }

diff --git a/benchmark/benchmark-macro/src/androidTest/java/androidx/benchmark/macro/StartupTimingMetricTest.kt b/benchmark/benchmark-macro/src/androidTest/java/androidx/benchmark/macro/StartupTimingMetricTest.kt
index c3fbdc2..892820b 100644
--- a/benchmark/benchmark-macro/src/androidTest/java/androidx/benchmark/macro/StartupTimingMetricTest.kt
+++ b/benchmark/benchmark-macro/src/androidTest/java/androidx/benchmark/macro/StartupTimingMetricTest.kt

@@ -129,10 +129,18 @@
                 scope.startActivityAndWait(launchIntent)
             }
 
-            if (delayMs > 0) {
+            if (useInAppNav) {
+                // in app nav destinations always have different strings to differentiate
+                // vs the first activity's strings to prevent races
+                awaitActivityText(
+                    if (delayMs > 0) {
+                        ConfigurableActivity.INNER_ACTIVITY_FULLY_DRAWN_TEXT
+                    } else {
+                        ConfigurableActivity.INNER_ACTIVITY_TEXT
+                    }
+                )
+            } else if (delayMs > 0) {
                 awaitActivityText(ConfigurableActivity.FULLY_DRAWN_TEXT)
-            } else if (useInAppNav) {
-                awaitActivityText(ConfigurableActivity.INNER_ACTIVITY_TEXT)
             }
         }
 

diff --git a/benchmark/benchmark-macro/src/main/java/androidx/benchmark/macro/BaselineProfiles.kt b/benchmark/benchmark-macro/src/main/java/androidx/benchmark/macro/BaselineProfiles.kt
index e9e3b13..749f23e 100644
--- a/benchmark/benchmark-macro/src/main/java/androidx/benchmark/macro/BaselineProfiles.kt
+++ b/benchmark/benchmark-macro/src/main/java/androidx/benchmark/macro/BaselineProfiles.kt

@@ -22,6 +22,7 @@
 import androidx.annotation.RestrictTo
 import androidx.annotation.VisibleForTesting
 import androidx.benchmark.Arguments
+import androidx.benchmark.DeviceInfo
 import androidx.benchmark.InstrumentationResults
 import androidx.benchmark.Outputs
 import androidx.benchmark.Shell
@@ -285,7 +286,7 @@
         .append(
             """
                 To copy the profile use:
-                adb pull "${record.profilePath}" .
+                adb pull $deviceSpecifier"${record.profilePath}" .
             """.trimIndent()
         )
 
@@ -296,13 +297,31 @@
             .append(
                 """
                     To copy the startup profile use:
-                    adb pull "${record.startupProfilePath}" .
+                    adb pull $deviceSpecifier"${record.startupProfilePath}" .
                 """.trimIndent()
             )
     }
     return summary.toString()
 }
 
+/**
+ * adb device specifier, blank if can't be defined. Includes right side space.
+ */
+internal val deviceSpecifier by lazy {
+    if (DeviceInfo.isEmulator) {
+        // emulators have serials that aren't usable via ADB -s,
+        // so we just specify emulator and hope there's only one
+        "-e "
+    } else {
+        val getpropOutput = Shell.executeScriptWithStderr("getprop ro.serialno")
+        if (getpropOutput.stdout.isBlank() || getpropOutput.stderr.isNotBlank()) {
+            "" // failed to get serial
+        } else {
+            "-s ${getpropOutput.stdout.trim()} "
+        }
+    }
+}
+
 private data class Summary(
     val totalRunTime: Long,
     val profilePath: String,

diff --git a/benchmark/benchmark-macro/src/main/java/androidx/benchmark/macro/CompilationMode.kt b/benchmark/benchmark-macro/src/main/java/androidx/benchmark/macro/CompilationMode.kt
index 39cf318..285827b 100644
--- a/benchmark/benchmark-macro/src/main/java/androidx/benchmark/macro/CompilationMode.kt
+++ b/benchmark/benchmark-macro/src/main/java/androidx/benchmark/macro/CompilationMode.kt

@@ -28,16 +28,14 @@
 import androidx.benchmark.macro.CompilationMode.Ignore
 import androidx.benchmark.macro.CompilationMode.None
 import androidx.benchmark.macro.CompilationMode.Partial
-import androidx.benchmark.userspaceTrace
 import androidx.profileinstaller.ProfileInstallReceiver
 import org.junit.AssumptionViolatedException
 
 /**
  * Type of compilation to use for a Macrobenchmark.
  *
- * Every Macrobenchmark has compilation reset before running, so that previous runs do not interfere
- * with the next. This compilation mode dictates any pre-compilation that occurs before repeatedly
- * running the setup / measure blocks of the benchmark.
+ * This compilation mode controls pre-compilation that occurs before running the setup / measure
+ * blocks of the benchmark.
  *
  * On Android N+ (API 24+), there are different levels of compilation supported:
  *
@@ -48,9 +46,12 @@
  * guide pre-compilation to mimic an application's performance after some, and JIT-ing has occurred.
  *
  * * [Full] - the app is fully pre-compiled. This is generally not representative of real user
- * experience, as apps are not fully pre-compiled on user devices, but this can be used to either
- * illustrate ideal performance, or to reduce noise/inconsistency from just-in-time compilation
- * while the benchmark runs.
+ * experience, as apps are not fully pre-compiled on user devices more recent than Android N
+ * (API 24). `Full` can be used to show unrealistic but potentially more stable performance by
+ * removing the noise/inconsistency from just-in-time compilation within benchmark runs. Note that
+ * `Full` compilation will often be slower than [Partial] compilation, as the increased code size
+ * creates more cost for disk loading during startup, and increases pressure in the instruction
+ * cache.
  *
  * * [None] - the app isn't pre-compiled at all, bypassing the default compilation that should
  * generally be done at install time, e.g. by the Play Store. This will illustrate worst case
@@ -58,7 +59,8 @@
  * useful for judging the performance impact of the baseline profiles included in your application.
  *
  * * [Ignore] - the state of compilation will be ignored. The intended use-case is for a developer
- * to customize the compilation state for an app; and then tell Macrobenchmark to leave it unchanged.
+ * to customize the compilation state for an app; and then tell Macrobenchmark to leave it
+ * unchanged.
  *
  * On Android M (API 23), only [Full] is supported, as all apps are always fully compiled.
  *
@@ -71,40 +73,12 @@
 sealed class CompilationMode {
     internal fun resetAndCompile(
         packageName: String,
-        usePackageReset: () -> Boolean = Shell::isSessionRooted,
         killProcessBlock: () -> Unit,
         warmupBlock: () -> Unit
     ) {
         if (Build.VERSION.SDK_INT >= 24) {
             if (Arguments.enableCompilation) {
                 Log.d(TAG, "Resetting $packageName")
-                // The compilation mode chooses whether a reset is required or not.
-                // Currently the only compilation mode that does not perform a reset is
-                // CompilationMode.Ignore.
-                if (shouldReset()) {
-                    // It's not possible to reset the compilation profile on `user` builds.
-                    // The flag `enablePackageReset` can be set to `true` on `userdebug` builds in
-                    // order to speed-up the profile reset. When set to false, reset is performed
-                    // uninstalling and reinstalling the app.
-                    if (usePackageReset()) {
-                        // Package reset enabled
-                        Log.d(TAG, "Re-compiling $packageName")
-                        // cmd package compile --reset returns a "Success" or a "Failure" to stdout.
-                        // Rather than rely on exit codes which are not always correct, we specifically
-                        // look for the work "Success" in stdout to make sure reset actually
-                        // happened.
-                        val output = Shell.executeScriptWithStderr(
-                            "cmd package compile --reset $packageName"
-                        )
-                        check(output.stdout.trim() == "Success") {
-                            "Unable to recompile $packageName ($output)"
-                        }
-                    } else {
-                        // User builds. Kick off a full uninstall-reinstall
-                        Log.d(TAG, "Reinstalling $packageName")
-                        reinstallPackage(packageName)
-                    }
-                }
                 // Write skip file to stop profile installer from interfering with the benchmark
                 writeProfileInstallerSkipFile(packageName, killProcessBlock = killProcessBlock)
                 compileImpl(packageName, killProcessBlock, warmupBlock)
@@ -114,46 +88,6 @@
         }
     }
 
-    // This is a more expensive when compared to `compile --reset`.
-    private fun reinstallPackage(packageName: String) {
-        userspaceTrace("reinstallPackage") {
-            val packagePath = Shell.executeScript("pm path $packageName")
-            // The result looks like: `package: <result>`
-            val apkPath = packagePath.substringAfter("package:").trim()
-            // Copy the APK to /data/local/temp
-            val tempApkPath = "/data/local/tmp/$packageName-${System.currentTimeMillis()}.apk"
-            Log.d(TAG, "Copying APK to $tempApkPath")
-            val result = Shell.executeScriptWithStderr(
-                "cp $apkPath $tempApkPath"
-            )
-            if (result.stderr.isNotBlank()) {
-                Log.w(TAG, "Unable to copy apk ($result)")
-            } else {
-                try {
-                    // Uninstall package
-                    // This is what effectively clears the ART profiles
-                    Log.d(TAG, "Uninstalling $packageName")
-                    var output = Shell.executeScriptWithStderr("pm uninstall $packageName")
-                    check(output.stdout.trim() == "Success") {
-                        "Unable to uninstall $packageName ($result)"
-                    }
-                    // Install the APK from /data/local/tmp
-                    Log.d(TAG, "Installing $packageName")
-                    // Provide a `-t` argument to `pm install` to ensure test packages are
-                    // correctly installed. (b/231294733)
-                    output = Shell.executeScriptWithStderr("pm install -t $tempApkPath")
-                    check(output.stdout.trim() == "Success") {
-                        "Unable to install $packageName ($result)"
-                    }
-                } finally {
-                    // Cleanup the temporary APK
-                    Log.d(TAG, "Deleting $tempApkPath")
-                    Shell.executeCommand("rm $tempApkPath")
-                }
-            }
-        }
-    }
-
     /**
      * Writes a skip file via a [ProfileInstallReceiver] broadcast, so profile installation
      * does not interfere with benchmarks.
@@ -180,9 +114,6 @@
         warmupBlock: () -> Unit
     )
 
-    @RequiresApi(24)
-    internal abstract fun shouldReset(): Boolean
-
     /**
      * No pre-compilation - a compilation profile reset is performed and the entire app will be
      * allowed to Just-In-Time compile as it runs.
@@ -200,10 +131,8 @@
             killProcessBlock: () -> Unit,
             warmupBlock: () -> Unit
         ) {
-            // nothing to do!
+            cmdPackageCompile(packageName, "verify")
         }
-
-        override fun shouldReset(): Boolean = true
     }
 
     /**
@@ -223,8 +152,6 @@
         ) {
             // Do nothing.
         }
-
-        override fun shouldReset(): Boolean = false
     }
 
     /**
@@ -335,8 +262,6 @@
                 cmdPackageCompile(packageName, "speed-profile")
             }
         }
-
-        override fun shouldReset(): Boolean = true
     }
 
     /**
@@ -361,8 +286,6 @@
             }
             // Noop on older versions: apps are fully compiled at install time on API 23 and below
         }
-
-        override fun shouldReset(): Boolean = true
     }
 
     /**
@@ -386,8 +309,6 @@
         ) {
             // Nothing to do - handled externally
         }
-
-        override fun shouldReset(): Boolean = true
     }
 
     companion object {

diff --git a/benchmark/benchmark-macro/src/main/java/androidx/benchmark/macro/Macrobenchmark.kt b/benchmark/benchmark-macro/src/main/java/androidx/benchmark/macro/Macrobenchmark.kt
index 5db44a4..ed2982f 100644
--- a/benchmark/benchmark-macro/src/main/java/androidx/benchmark/macro/Macrobenchmark.kt
+++ b/benchmark/benchmark-macro/src/main/java/androidx/benchmark/macro/Macrobenchmark.kt

@@ -377,13 +377,14 @@
                 // Run setup before killing process
                 setupBlock(this)
 
+                // Shader caches are stored in the code cache directory. Make sure that
+                // they are cleared every iteration. Must be done before kill, since on user builds
+                // this broadcasts to the target app
+                dropShaderCache()
+
                 // Kill - code below must not wake process!
                 killProcess()
 
-                // Shader caches are stored in the code cache directory. Make sure that
-                // they are cleared every iteration.
-                dropShaderCache()
-
                 // Ensure app's pages are not cached in memory for a true _cold_ start.
                 dropKernelPageCache()
 

diff --git a/benchmark/benchmark-macro/src/main/java/androidx/benchmark/macro/MacrobenchmarkScope.kt b/benchmark/benchmark-macro/src/main/java/androidx/benchmark/macro/MacrobenchmarkScope.kt
index 45a220b..7c21891 100644
--- a/benchmark/benchmark-macro/src/main/java/androidx/benchmark/macro/MacrobenchmarkScope.kt
+++ b/benchmark/benchmark-macro/src/main/java/androidx/benchmark/macro/MacrobenchmarkScope.kt

@@ -16,16 +16,19 @@
 
 package androidx.benchmark.macro
 
+import android.content.Context
 import android.content.Intent
 import android.os.Build
 import android.util.Log
 import androidx.annotation.RequiresApi
 import androidx.benchmark.DeviceInfo
 import androidx.benchmark.Shell
+import androidx.benchmark.macro.MacrobenchmarkScope.Companion.Api24Helper.shaderDir
 import androidx.benchmark.macro.perfetto.forceTrace
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.uiautomator.UiDevice
 import androidx.tracing.trace
+import java.io.File
 
 /**
  * Provides access to common operations in app automation, such as killing the app,
@@ -225,19 +228,30 @@
     }
 
     /**
-     * Deletes the Shader cache for an application.
+     * Deletes the shader cache for an application.
      *
-     * Enables measurement of shader-cache startup cost during
-     * [cold starts](androidx.benchmark.macro.StartupMode.COLD).
+     * Used by `measureRepeated(startupMode = StartupMode.COLD)` to remove compiled shaders for each
+     * measurement, to ensure their cost is captured each time.
+     *
+     * Requires `profileinstaller` 1.3.0-alpha02 to be used by the target, or a rooted device.
+     *
+     * @throws IllegalStateException if the device is not rooted, and the target app cannot be
+     * signalled to drop its shader cache.
      */
     public fun dropShaderCache() {
         Log.d(TAG, "Dropping shader cache for $packageName")
-        // Shader cache is stored in the codeCacheDirectory
-        // https://source.corp.google.com/android-internal/frameworks/base/core/java/android/app/ActivityThread.java;l=6410
-        val shaderCachePath = instrumentation.targetContext.codeCacheDir.absolutePath
-        val output = Shell.executeScript("rm -rf $shaderCachePath")
-        check(output.isBlank()) {
-            "Unable to drop shader cache for $packageName ($output)"
+        val dropError = ProfileInstallBroadcast.dropShaderCache(packageName)
+        if (dropError != null) {
+            if (Shell.isSessionRooted()) {
+                // fall back to root approach
+                val path = getShaderCachePath(packageName)
+                val output = Shell.executeScriptWithStderr("find $path -type f | xargs rm")
+                check(output.isBlank()) {
+                    "Failed to delete shader cache directory $path, output $output"
+                }
+            } else {
+                throw IllegalStateException(dropError)
+            }
         }
     }
 
@@ -294,4 +308,27 @@
             }
         }
     }
+
+    internal companion object {
+        fun getShaderCachePath(packageName: String): String {
+            val context = InstrumentationRegistry.getInstrumentation().context
+
+            // Shader paths sourced from ActivityThread.java
+            return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+                context.shaderDir
+            } else {
+                // getCodeCacheDir was added in L, but not used by platform for shaders until M
+                // as M is minApi of this library, that's all we support here
+                context.codeCacheDir
+            }.absolutePath.replace(context.packageName, packageName)
+        }
+
+        @RequiresApi(Build.VERSION_CODES.N)
+        internal object Api24Helper {
+            val Context.shaderDir: File
+                get() =
+                    // shaders started using device protected storage context once it was added in N
+                    createDeviceProtectedStorageContext().codeCacheDir
+        }
+    }
 }

diff --git a/benchmark/benchmark-macro/src/main/java/androidx/benchmark/macro/ProfileInstallBroadcast.kt b/benchmark/benchmark-macro/src/main/java/androidx/benchmark/macro/ProfileInstallBroadcast.kt
index 07215af..1e2eb91 100644
--- a/benchmark/benchmark-macro/src/main/java/androidx/benchmark/macro/ProfileInstallBroadcast.kt
+++ b/benchmark/benchmark-macro/src/main/java/androidx/benchmark/macro/ProfileInstallBroadcast.kt

@@ -171,4 +171,50 @@
             }
         }
     }
+
+    private fun benchmarkOperation(packageName: String, operation: String): String? {
+        Log.d(TAG, "Profile Installer - Benchmark Operation: $operation")
+        // Redefining constants here, because these are only defined in the latest alpha for
+        // ProfileInstaller.
+        // Use an explicit broadcast given the app was force-stopped.
+        val action = "androidx.profileinstaller.action.BENCHMARK_OPERATION"
+        val operationKey = "EXTRA_BENCHMARK_OPERATION"
+        val extras = "$operationKey $operation"
+        val result = Shell.executeCommand(
+            "am broadcast -a $action -e $extras $packageName/$receiverName"
+        )
+            .substringAfter("Broadcast completed: result=")
+            .trim()
+            .toIntOrNull()
+        return when (result) {
+            null, 0, 16 /* BENCHMARK_OPERATION_UNKNOWN */ -> {
+                // 0 is returned by the platform by default, and also if no broadcast receiver
+                // receives the broadcast.
+
+                // NOTE: may need to update this over time for different versions,
+                // based on operation string
+                "The $operation broadcast was not received. " +
+                    "This most likely means that the `androidx.profileinstaller` library " +
+                    "used by the target apk is old. Please use `1.3.0-alpha02` or newer. " +
+                    "For more information refer to the release notes at " +
+                    "https://developer.android.com/jetpack/androidx/releases/profileinstaller."
+            }
+            15 -> { // RESULT_BENCHMARK_OPERATION_FAILURE
+                "The $operation broadcast failed."
+            }
+            14 -> { // RESULT_BENCHMARK_OPERATION_SUCCESS
+                null // success!
+            }
+            else -> {
+                throw RuntimeException(
+                    "unrecognized ProfileInstaller result code: $result"
+                )
+            }
+        }
+    }
+
+    fun dropShaderCache(packageName: String): String? = benchmarkOperation(
+        packageName,
+        "DROP_SHADER_CACHE"
+    )
 }
\ No newline at end of file

diff --git a/benchmark/gradle-plugin/build.gradle b/benchmark/gradle-plugin/build.gradle
index 2ef57d1..9bbf2cc 100644
--- a/benchmark/gradle-plugin/build.gradle
+++ b/benchmark/gradle-plugin/build.gradle

@@ -32,7 +32,6 @@
 
     testImplementation(gradleTestKit())
     testImplementation(project(":internal-testutils-gradle-plugin"))
-    testImplementation(libs.testRunner)
     testImplementation(libs.junit)
     testImplementation(libs.kotlinTest)
 }
@@ -71,4 +70,4 @@
         failOnWarning.set(true)
         enableStricterValidation.set(true)
     }
-}
\ No newline at end of file
+}

diff --git a/buildSrc/private/src/main/kotlin/androidx/build/AndroidXImplPlugin.kt b/buildSrc/private/src/main/kotlin/androidx/build/AndroidXImplPlugin.kt
index 727552a..15d46bf 100644
--- a/buildSrc/private/src/main/kotlin/androidx/build/AndroidXImplPlugin.kt
+++ b/buildSrc/private/src/main/kotlin/androidx/build/AndroidXImplPlugin.kt

@@ -148,6 +148,10 @@
 
         project.configurations.create("samples")
         project.validateMultiplatformPluginHasNotBeenApplied()
+
+        if (!ProjectLayoutType.isPlayground(project)) {
+            project.whenChangingOutputTextValidationMustInvalidateAllTasks()
+        }
     }
 
     private fun Project.registerProjectOrArtifact() {
@@ -1083,6 +1087,17 @@
     }
 }
 
+// If our output message validation configuration changes, invalidate all tasks to make sure
+// all output messages get regenerated and re-validated
+private fun Project.whenChangingOutputTextValidationMustInvalidateAllTasks() {
+    val configFile = project.rootProject.file("development/build_log_simplifier/messages.ignore")
+    if (configFile.exists()) {
+        project.tasks.configureEach { task ->
+            task.inputs.file(configFile)
+        }
+    }
+}
+
 /**
  * Validates the Maven version against Jetpack guidelines.
  */

diff --git a/buildSrc/private/src/main/kotlin/androidx/build/AndroidXRootImplPlugin.kt b/buildSrc/private/src/main/kotlin/androidx/build/AndroidXRootImplPlugin.kt
index 672f99b..963ed8d 100644
--- a/buildSrc/private/src/main/kotlin/androidx/build/AndroidXRootImplPlugin.kt
+++ b/buildSrc/private/src/main/kotlin/androidx/build/AndroidXRootImplPlugin.kt

@@ -220,28 +220,14 @@
 
         registerStudioTask()
 
-        if (!ProjectLayoutType.isPlayground(project)) {
-            whenChangingOutputTextValidationMustInvalidateAllTasks()
-        }
-
         TaskUpToDateValidator.setup(project, registry)
 
         project.tasks.register("listTaskOutputs", ListTaskOutputsTask::class.java) { task ->
             task.setOutput(File(project.getDistributionDirectory(), "task_outputs.txt"))
             task.removePrefix(project.getCheckoutRoot().path)
         }
-    }
-
-    // If our output message validation configuration changes, invalidate all tasks to make sure
-    // all output messages get regenerated and re-validated
-    private fun Project.whenChangingOutputTextValidationMustInvalidateAllTasks() {
-        val configFile = project.file("development/build_log_simplifier/messages.ignore")
-        if (configFile.exists()) {
-            subprojects { subproject ->
-                subproject.tasks.configureEach { task ->
-                    task.inputs.file(configFile)
-                }
-            }
+        tasks.matching { it.name == "commonizeNativeDistribution" }.configureEach {
+            it.notCompatibleWithConfigurationCache("https://youtrack.jetbrains.com/issue/KT-54627")
         }
     }
 

diff --git a/buildSrc/private/src/main/kotlin/androidx/build/ListTaskOutputsTask.kt b/buildSrc/private/src/main/kotlin/androidx/build/ListTaskOutputsTask.kt
index 08aedba..4e9b6b1e 100644
--- a/buildSrc/private/src/main/kotlin/androidx/build/ListTaskOutputsTask.kt
+++ b/buildSrc/private/src/main/kotlin/androidx/build/ListTaskOutputsTask.kt

@@ -22,15 +22,15 @@
 import org.gradle.api.Project
 import org.gradle.api.Task
 import org.gradle.api.provider.Property
+import org.gradle.api.tasks.CacheableTask
 import org.gradle.api.tasks.Input
 import org.gradle.api.tasks.OutputFile
 import org.gradle.api.tasks.TaskAction
-import org.gradle.work.DisableCachingByDefault
 
 /**
  * Finds the outputs of every task and saves this mapping into a file
  */
-@DisableCachingByDefault(because = "Uses too many inputs to be feasible to cache, but runs quickly")
+@CacheableTask
 abstract class ListTaskOutputsTask : DefaultTask() {
     @OutputFile
     val outputFile: Property<File> = project.objects.property(File::class.java)
@@ -39,12 +39,14 @@
     @Input
     val tasks: MutableList<Task> = mutableListOf()
 
+    @get:Input
+    val outputText by lazy { computeOutputText() }
+
     init {
         group = "Help"
-        outputs.upToDateWhen { false }
-        notCompatibleWithConfigurationCache(
-            "This task uses project object to inspect outputs of all tasks"
-        )
+        // compute the output text when the taskgraph is ready so that the output text can be
+        // saved in the configuration cache and not generate a configuration cache violation
+        project.gradle.taskGraph.whenReady({ outputText.toString() })
     }
 
     fun setOutput(f: File) {
@@ -94,14 +96,15 @@
         return components.joinToString("")
     }
 
+    fun computeOutputText(): String {
+        val tasksByOutput = project.rootProject.findAllTasksByOutput()
+        return formatTasks(tasksByOutput)
+    }
+
     @TaskAction
     fun exec() {
-        val tasksByOutput = project.rootProject.findAllTasksByOutput()
-        val text = formatTasks(tasksByOutput)
-
         val outputFile = outputFile.get()
-        outputFile.writeText(text)
-        logger.lifecycle("Wrote ${outputFile.path}")
+        outputFile.writeText(outputText)
     }
 }
 

diff --git a/buildSrc/private/src/main/kotlin/androidx/build/license/CheckExternalDependencyLicensesTask.kt b/buildSrc/private/src/main/kotlin/androidx/build/license/CheckExternalDependencyLicensesTask.kt
index 6ad30d2..844ee8b 100644
--- a/buildSrc/private/src/main/kotlin/androidx/build/license/CheckExternalDependencyLicensesTask.kt
+++ b/buildSrc/private/src/main/kotlin/androidx/build/license/CheckExternalDependencyLicensesTask.kt

@@ -15,7 +15,6 @@
  */
 package androidx.build.license
 
-import androidx.build.enforceKtlintVersion
 import androidx.build.getPrebuiltsRoot
 import java.io.File
 import org.gradle.api.DefaultTask
@@ -115,45 +114,49 @@
 
         task.filesToCheck.from(
             project.provider {
-                val checkerConfig = project.configurations.detachedConfiguration()
-                checkerConfig.isCanBeConsumed = false
-                checkerConfig.attributes {
-                    it.attribute(
-                        Usage.USAGE_ATTRIBUTE,
-                        project.objects.named<Usage>(Usage.JAVA_RUNTIME)
-                    )
-                    it.attribute(
-                        Category.CATEGORY_ATTRIBUTE,
-                        project.objects.named<Category>(Category.LIBRARY)
-                    )
-                    it.attribute(
-                        GradlePluginApiVersion.GRADLE_PLUGIN_API_VERSION_ATTRIBUTE,
-                        project.objects.named<GradlePluginApiVersion>(
-                            GradleVersion.current().getVersion()
-                        )
-                    )
-                }
-                // workaround for b/234884534
-                project.enforceKtlintVersion(checkerConfig)
 
-                project
-                    .configurations
-                    .flatMap {
-                        it.allDependencies
-                            .filterIsInstance(ExternalDependency::class.java)
-                            .filterNot {
-                                it.group?.startsWith("com.android") == true
-                            }
-                            .filterNot {
-                                it.group?.startsWith("android.arch") == true
-                            }
-                            .filterNot {
-                                it.group?.startsWith("androidx") == true
-                            }
+                val configName = "CheckExternalLicences"
+                val container = project.configurations
+                val checkerConfig =
+                container.findByName(configName) ?: container.create(configName) { checkerConfig ->
+
+                    checkerConfig.isCanBeConsumed = false
+                    checkerConfig.attributes {
+                        it.attribute(
+                            Usage.USAGE_ATTRIBUTE,
+                            project.objects.named<Usage>(Usage.JAVA_RUNTIME)
+                        )
+                        it.attribute(
+                            Category.CATEGORY_ATTRIBUTE,
+                            project.objects.named<Category>(Category.LIBRARY)
+                        )
+                        it.attribute(
+                            GradlePluginApiVersion.GRADLE_PLUGIN_API_VERSION_ATTRIBUTE,
+                            project.objects.named<GradlePluginApiVersion>(
+                                GradleVersion.current().getVersion()
+                            )
+                        )
                     }
-                    .forEach {
-                        checkerConfig.dependencies.add(it)
-                    }
+
+                    project
+                        .configurations
+                        .flatMap {
+                            it.allDependencies
+                                .filterIsInstance(ExternalDependency::class.java)
+                                .filterNot {
+                                    it.group?.startsWith("com.android") == true
+                                }
+                                .filterNot {
+                                    it.group?.startsWith("android.arch") == true
+                                }
+                                .filterNot {
+                                    it.group?.startsWith("androidx") == true
+                                }
+                        }
+                        .forEach {
+                            checkerConfig.dependencies.add(it)
+                        }
+                }
 
                 val localArtifactRepositories = project.findLocalMavenRepositories()
                 val dependencyArtifacts = checkerConfig.incoming.artifacts.artifacts.mapNotNull {

diff --git a/buildSrc/private/src/main/kotlin/androidx/build/paparazzi/AndroidXPaparazziImplPlugin.kt b/buildSrc/private/src/main/kotlin/androidx/build/paparazzi/AndroidXPaparazziImplPlugin.kt
index ce578e5..dfb282f 100644
--- a/buildSrc/private/src/main/kotlin/androidx/build/paparazzi/AndroidXPaparazziImplPlugin.kt
+++ b/buildSrc/private/src/main/kotlin/androidx/build/paparazzi/AndroidXPaparazziImplPlugin.kt

@@ -24,11 +24,13 @@
 import androidx.build.getSdkPath
 import androidx.build.getSupportRootFolder
 import com.android.build.gradle.BaseExtension
+import javax.inject.Inject
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.api.artifacts.type.ArtifactTypeDefinition.ARTIFACT_TYPE_ATTRIBUTE
 import org.gradle.api.artifacts.type.ArtifactTypeDefinition.JAR_TYPE
 import org.gradle.api.file.FileCollection
+import org.gradle.api.file.FileSystemOperations
 import org.gradle.api.tasks.PathSensitivity
 import org.gradle.api.tasks.testing.Test
 import org.gradle.kotlin.dsl.the
@@ -38,7 +40,9 @@
 /**
  * Configures screenshot testing using Paparazzi for AndroidX projects.
  */
-class AndroidXPaparazziImplPlugin : Plugin<Project> {
+class AndroidXPaparazziImplPlugin @Inject constructor(
+    private val fileSystemOperations: FileSystemOperations
+) : Plugin<Project> {
     override fun apply(project: Project) {
         val paparazziNative = project.createUnzippedPaparazziNativeDependency()
         project.afterEvaluate {
@@ -53,6 +57,7 @@
     private fun Test.configureTestTask(paparazziNative: FileCollection) {
         val platformDirectory = project.getSdkPath().resolve("platforms/$COMPILE_SDK_VERSION")
         val goldenRootDirectory = project.getSupportRootFolder().resolve("../../golden")
+        val reportDirectory = project.buildDir.resolve("paparazzi").resolve(name)
         val modulePath = project.path.replace(':', '/').trim('/')
         val android = project.the<BaseExtension>()
         val packageName = requireNotNull(android.namespace) {
@@ -69,6 +74,13 @@
             .withPathSensitivity(PathSensitivity.RELATIVE)
             .withPropertyName("goldenDirectory")
 
+        // Mark report directory as an output directory
+        outputs.dir(reportDirectory)
+            .withPropertyName("paparazziReportDir")
+
+        // Clean the contents of the report directory before each test run
+        doFirst { fileSystemOperations.delete { it.delete(reportDirectory.listFiles()) } }
+
         // Set non-path system properties at configuration time, so that changes invalidate caching
         prefixedSystemProperties(
             "gradlePluginApplied" to "true",
@@ -82,10 +94,10 @@
         doFirst {
             systemProperty("paparazzi.platform.data.root", paparazziNative.singleFile.canonicalPath)
             prefixedSystemProperties(
-                "platformDir" to platformDirectory,
+                "platformDir" to platformDirectory.canonicalPath,
                 "assetsDir" to ".", // TODO: Merged assets dirs? (needed for compose?)
                 "resDir" to ".", // TODO: Merged resource dirs? (needed for compose?)
-                "reportDir" to reports.junitXml.outputLocation.get().asFile.canonicalPath,
+                "reportDir" to reportDirectory.canonicalPath,
                 "goldenRootDir" to goldenRootDirectory.canonicalPath,
             )
         }

diff --git a/busytown/androidx_host_tests.sh b/busytown/androidx_host_tests.sh
index bba9e74..00ba171 100755
--- a/busytown/androidx_host_tests.sh
+++ b/busytown/androidx_host_tests.sh

@@ -5,9 +5,10 @@
 
 cd "$(dirname $0)"
 
-impl/build.sh test \
+impl/build.sh test linuxX64Test \
     -Pandroidx.ignoreTestFailures \
     -Pandroidx.displayTestOutput=false \
+    -Pandroidx.enabled.kmp.target.platforms=+native \
     "$@"
 
 echo "Completing $0 at $(date)"

diff --git a/busytown/androidx_host_tests_max_dep_versions.sh b/busytown/androidx_host_tests_max_dep_versions.sh
index 75d276e..a56dbc4 100755
--- a/busytown/androidx_host_tests_max_dep_versions.sh
+++ b/busytown/androidx_host_tests_max_dep_versions.sh

@@ -5,8 +5,9 @@
 
 cd "$(dirname $0)"
 
-impl/build.sh test -Pandroidx.useMaxDepVersions \
+impl/build.sh test linuxX64Test -Pandroidx.useMaxDepVersions \
     -Pandroidx.displayTestOutput=false \
+    -Pandroidx.enabled.kmp.target.platforms=+native \
     -Pandroidx.ignoreTestFailures "$@"
 
 echo "Completing $0 at $(date)"

diff --git a/camera/camera-camera2-pipe-integration/src/androidTest/java/androidx/camera/camera2/pipe/integration/UseCaseSurfaceManagerDeviceTest.kt b/camera/camera-camera2-pipe-integration/src/androidTest/java/androidx/camera/camera2/pipe/integration/UseCaseSurfaceManagerDeviceTest.kt
index 46a29ef9..65e72dc 100644
--- a/camera/camera-camera2-pipe-integration/src/androidTest/java/androidx/camera/camera2/pipe/integration/UseCaseSurfaceManagerDeviceTest.kt
+++ b/camera/camera-camera2-pipe-integration/src/androidTest/java/androidx/camera/camera2/pipe/integration/UseCaseSurfaceManagerDeviceTest.kt

@@ -208,8 +208,7 @@
 
         // Assert, verify the usage count of the DeferrableSurface
         assertThat(cameraOpenedUsageCount).isEqualTo(2)
-        // TODO(lnishan): After aosp/2241588, cameraDisconnectedUsageCount should remain at 2
-        assertThat(cameraDisconnectedUsageCount).isGreaterThan(0)
+        assertThat(cameraDisconnectedUsageCount).isEqualTo(2)
         assertThat(cameraClosedUsageCount).isEqualTo(1)
     }
 

diff --git a/camera/camera-camera2-pipe-integration/src/main/java/androidx/camera/camera2/pipe/integration/adapter/CameraInternalAdapter.kt b/camera/camera-camera2-pipe-integration/src/main/java/androidx/camera/camera2/pipe/integration/adapter/CameraInternalAdapter.kt
index 3043278..b4bcd62 100644
--- a/camera/camera-camera2-pipe-integration/src/main/java/androidx/camera/camera2/pipe/integration/adapter/CameraInternalAdapter.kt
+++ b/camera/camera-camera2-pipe-integration/src/main/java/androidx/camera/camera2/pipe/integration/adapter/CameraInternalAdapter.kt

@@ -26,6 +26,7 @@
 import androidx.camera.camera2.pipe.integration.impl.UseCaseManager
 import androidx.camera.camera2.pipe.integration.impl.UseCaseThreads
 import androidx.camera.core.UseCase
+import androidx.camera.core.impl.CameraConfigs
 import androidx.camera.core.impl.CameraControlInternal
 import androidx.camera.core.impl.CameraInfoInternal
 import androidx.camera.core.impl.CameraInternal
@@ -50,6 +51,8 @@
     private val threads: UseCaseThreads,
 ) : CameraInternal {
     private val cameraId = config.cameraId
+    private var coreCameraConfig: androidx.camera.core.impl.CameraConfig =
+        CameraConfigs.emptyConfig()
     private val debugId = cameraAdapterIds.incrementAndGet()
     private val cameraState = LiveDataObservable<CameraInternal.State>()
 
@@ -104,5 +107,13 @@
         useCaseManager.deactivate(useCase)
     }
 
+    override fun getExtendedConfig(): androidx.camera.core.impl.CameraConfig {
+        return coreCameraConfig
+    }
+
+    override fun setExtendedConfig(cameraConfig: androidx.camera.core.impl.CameraConfig?) {
+        coreCameraConfig = cameraConfig ?: CameraConfigs.emptyConfig()
+    }
+
     override fun toString(): String = "CameraInternalAdapter<$cameraId>"
 }

diff --git a/camera/camera-camera2-pipe-integration/src/test/java/androidx/camera/camera2/pipe/integration/testing/FakeCameraGraph.kt b/camera/camera-camera2-pipe-integration/src/test/java/androidx/camera/camera2/pipe/integration/testing/FakeCameraGraph.kt
index 42550a1..1c6c3c2 100644
--- a/camera/camera-camera2-pipe-integration/src/test/java/androidx/camera/camera2/pipe/integration/testing/FakeCameraGraph.kt
+++ b/camera/camera-camera2-pipe-integration/src/test/java/androidx/camera/camera2/pipe/integration/testing/FakeCameraGraph.kt

@@ -18,8 +18,10 @@
 
 import android.view.Surface
 import androidx.camera.camera2.pipe.CameraGraph
+import androidx.camera.camera2.pipe.GraphState
 import androidx.camera.camera2.pipe.StreamGraph
 import androidx.camera.camera2.pipe.StreamId
+import kotlinx.coroutines.flow.StateFlow
 
 class FakeCameraGraph(
     val fakeCameraGraphSession: FakeCameraGraphSession = FakeCameraGraphSession()
@@ -30,6 +32,9 @@
     override val streams: StreamGraph
         get() = throw NotImplementedError("Not used in testing")
 
+    override val graphState: StateFlow<GraphState>
+        get() = throw NotImplementedError("Not used in testing")
+
     override suspend fun acquireSession(): CameraGraph.Session {
         return fakeCameraGraphSession
     }

diff --git a/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/CameraGraph.kt b/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/CameraGraph.kt
index 6c03ad4..740146a 100644
--- a/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/CameraGraph.kt
+++ b/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/CameraGraph.kt

@@ -28,6 +28,32 @@
 import androidx.camera.camera2.pipe.CameraGraph.Constants3A.DEFAULT_TIME_LIMIT_NS
 import java.io.Closeable
 import kotlinx.coroutines.Deferred
+import kotlinx.coroutines.flow.StateFlow
+
+abstract class GraphState internal constructor() {
+    /**
+     * When the [CameraGraph] is starting. This means we're in the process of opening a (virtual)
+     * camera and creating a capture session.
+     */
+    object GraphStateStarting : GraphState()
+
+    /**
+     * When the [CameraGraph] is started. This means a capture session has been successfully created
+     * for the [CameraGraph].
+     */
+    object GraphStateStarted : GraphState()
+
+    /**
+     * When the [CameraGraph] is stopping. This means we're in the process of stopping the graph.
+     */
+    object GraphStateStopping : GraphState()
+
+    /**
+     * When the [CameraGraph] hasn't been started, or stopped. This does not guarantee the closure
+     * of the capture session or the camera device itself.
+     */
+    object GraphStateStopped : GraphState()
+}
 
 /**
  * A [CameraGraph] represents the combined configuration and state of a camera.
@@ -37,6 +63,12 @@
     public val streams: StreamGraph
 
     /**
+     * Returns the state flow of [GraphState], which emits the current state of the
+     * [CameraGraph], including when a [CameraGraph] is stopped, starting or started.
+     */
+    public val graphState: StateFlow<GraphState>
+
+    /**
      * This will cause the [CameraGraph] to start opening the [CameraDevice] and configuring a
      * [CameraCaptureSession]. While the CameraGraph is alive it will attempt to keep the camera
      * open, active, and in a configured running state.

diff --git a/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/Streams.kt b/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/Streams.kt
index 44e6b3b..69f3df0 100644
--- a/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/Streams.kt
+++ b/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/Streams.kt

@@ -78,10 +78,20 @@
                 camera: CameraId? = null,
                 outputType: OutputStream.OutputType = OutputStream.OutputType.SURFACE,
                 mirrorMode: OutputStream.MirrorMode? = null,
-                timestampBase: OutputStream.TimestampBase? = null
+                timestampBase: OutputStream.TimestampBase? = null,
+                dynamicRangeProfile: OutputStream.DynamicRangeProfile? = null,
+                streamUseCase: OutputStream.StreamUseCase? = null,
             ): Config = create(
-                OutputStream.Config
-                    .create(size, format, camera, outputType, mirrorMode, timestampBase)
+                OutputStream.Config.create(
+                    size,
+                    format,
+                    camera,
+                    outputType,
+                    mirrorMode,
+                    timestampBase,
+                    dynamicRangeProfile,
+                    streamUseCase,
+                )
             )
 
             /**
@@ -124,6 +134,8 @@
     public val camera: CameraId
     public val mirrorMode: MirrorMode?
     public val timestampBase: TimestampBase?
+    public val dynamicRangeProfile: DynamicRangeProfile?
+    public val streamUseCase: StreamUseCase?
     // TODO: Consider adding sensor mode and/or other metadata
 
     /**
@@ -135,6 +147,8 @@
         public val camera: CameraId?,
         public val mirrorMode: MirrorMode?,
         public val timestampBase: TimestampBase?,
+        public val dynamicRangeProfile: DynamicRangeProfile?,
+        public val streamUseCase: StreamUseCase?,
     ) {
         companion object {
             fun create(
@@ -144,15 +158,34 @@
                 outputType: OutputType = OutputType.SURFACE,
                 mirrorMode: MirrorMode? = null,
                 timestampBase: TimestampBase? = null,
+                dynamicRangeProfile: DynamicRangeProfile? = null,
+                streamUseCase: StreamUseCase? = null,
             ): Config =
                 if (
                     outputType == OutputType.SURFACE_TEXTURE ||
                     outputType == OutputType.SURFACE_VIEW
                 ) {
-                    LazyOutputConfig(size, format, camera, outputType, mirrorMode, timestampBase)
+                    LazyOutputConfig(
+                        size,
+                        format,
+                        camera,
+                        outputType,
+                        mirrorMode,
+                        timestampBase,
+                        dynamicRangeProfile,
+                        streamUseCase
+                    )
                 } else {
                     check(outputType == OutputType.SURFACE)
-                    SimpleOutputConfig(size, format, camera, mirrorMode, timestampBase)
+                    SimpleOutputConfig(
+                        size,
+                        format,
+                        camera,
+                        mirrorMode,
+                        timestampBase,
+                        dynamicRangeProfile,
+                        streamUseCase,
+                    )
                 }
 
             /** Create a stream configuration from an externally created [OutputConfiguration] */
@@ -176,7 +209,17 @@
             camera: CameraId?,
             mirrorMode: MirrorMode?,
             timestampBase: TimestampBase?,
-        ) : Config(size, format, camera, mirrorMode, timestampBase)
+            dynamicRangeProfile: DynamicRangeProfile?,
+            streamUseCase: StreamUseCase?,
+        ) : Config(
+                size,
+                format,
+                camera,
+                mirrorMode,
+                timestampBase,
+                dynamicRangeProfile,
+                streamUseCase
+            )
 
         /**
          * Used to configure an output with a surface that may be provided after the camera is running.
@@ -193,7 +236,17 @@
             internal val outputType: OutputType,
             mirrorMode: MirrorMode?,
             timestampBase: TimestampBase?,
-        ) : Config(size, format, camera, mirrorMode, timestampBase)
+            dynamicRangeProfile: DynamicRangeProfile?,
+            streamUseCase: StreamUseCase?,
+        ) : Config(
+                size,
+                format,
+                camera,
+                mirrorMode,
+                timestampBase,
+                dynamicRangeProfile,
+                streamUseCase,
+            )
 
         /**
          * Used to define an output that comes from an externally managed OutputConfiguration object.
@@ -209,8 +262,15 @@
             format: StreamFormat,
             camera: CameraId?,
             val output: OutputConfiguration,
-        ) : Config(size, format, camera, MirrorMode(Api33Compat.getMirrorMode(output)),
-            TimestampBase(Api33Compat.getTimestampBase(output)))
+        ) : Config(
+                size,
+                format,
+                camera,
+                MirrorMode(Api33Compat.getMirrorMode(output)),
+                TimestampBase(Api33Compat.getTimestampBase(output)),
+                DynamicRangeProfile(Api33Compat.getDynamicRangeProfile(output)),
+                StreamUseCase(Api33Compat.getStreamUseCase(output)),
+            )
     }
 
     enum class OutputType {
@@ -254,6 +314,52 @@
             val TIMESTAMP_BASE_CHOREOGRAPHER_SYNCED = TimestampBase(4)
         }
     }
+
+    /**
+     * Adds the ability to define the dynamic range profile of the OutputStream.
+     * [STANDARD] is the default dynamic range profile for the camera device, with which
+     * the camera device uses an 8-bit standard profile.
+     *
+     * See the documentation on [OutputConfiguration.setDynamicRangeProfile] for more details.
+     */
+    @JvmInline
+    value class DynamicRangeProfile(val value: Long) {
+        companion object {
+            val STANDARD = DynamicRangeProfile(1)
+            val HLG10 = DynamicRangeProfile(2)
+            val HDR10 = DynamicRangeProfile(4)
+            val HDR10_PLUS = DynamicRangeProfile(8)
+            val DOLBY_VISION_10B_HDR_REF = DynamicRangeProfile(16)
+            val DOLBY_VISION_10B_HDR_REF_PO = DynamicRangeProfile(32)
+            val DOLBY_VISION_10B_HDR_OEM = DynamicRangeProfile(64)
+            val DOLBY_VISION_10B_HDR_OEM_PO = DynamicRangeProfile(128)
+            val DOLBY_VISION_8B_HDR_REF = DynamicRangeProfile(256)
+            val DOLBY_VISION_8B_HDR_REF_PO = DynamicRangeProfile(512)
+            val DOLBY_VISION_8B_HDR_OEM = DynamicRangeProfile(1024)
+            val DOLBY_VISION_8B_HDR_OEM_PO = DynamicRangeProfile(2048)
+            val PUBLIC_MAX = DynamicRangeProfile(4096)
+        }
+    }
+
+    /**
+     * Adds the ability to define the stream specific use case of the OutputStream.
+     * [DEFAULT] is the default stream use case, with which
+     * the camera device uses the properties of the output target, such as format, dataSpace,
+     * or surface class type, to optimize the image processing pipeline.
+     *
+     * See the documentation on [OutputConfiguration.setStreamUseCase] for more details.
+     */
+    @JvmInline
+    value class StreamUseCase(val value: Long) {
+        companion object {
+            val DEFAULT = StreamUseCase(0)
+            val PREVIEW = StreamUseCase(1)
+            val STILL_CAPTURE = StreamUseCase(2)
+            val VIDEO_RECORD = StreamUseCase(3)
+            val PREVIEW_VIDEO_STILL = StreamUseCase(4)
+            val VIDEO_CALL = StreamUseCase(5)
+        }
+    }
 }
 
 /**

diff --git a/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/compat/ApiCompat.kt b/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/compat/ApiCompat.kt
index 7ae56e8..8d8bec7 100644
--- a/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/compat/ApiCompat.kt
+++ b/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/compat/ApiCompat.kt

@@ -308,6 +308,18 @@
 internal object Api33Compat {
     @JvmStatic
     @DoNotInline
+    fun setDynamicRangeProfile(outputConfig: OutputConfiguration, dynamicRangeProfile: Long) {
+        outputConfig.dynamicRangeProfile = dynamicRangeProfile
+    }
+
+    @JvmStatic
+    @DoNotInline
+    fun getDynamicRangeProfile(outputConfig: OutputConfiguration): Long {
+        return outputConfig.dynamicRangeProfile
+    }
+
+    @JvmStatic
+    @DoNotInline
     fun setMirrorMode(outputConfig: OutputConfiguration, mirrorMode: Int) {
         outputConfig.mirrorMode = mirrorMode
     }
@@ -317,6 +329,19 @@
     fun getMirrorMode(outputConfig: OutputConfiguration): Int {
         return outputConfig.mirrorMode
     }
+
+    @JvmStatic
+    @DoNotInline
+    fun setStreamUseCase(outputConfig: OutputConfiguration, streamUseCase: Long) {
+        outputConfig.streamUseCase = streamUseCase
+    }
+
+    @JvmStatic
+    @DoNotInline
+    fun getStreamUseCase(outputConfig: OutputConfiguration): Long {
+        return outputConfig.streamUseCase
+    }
+
     @JvmStatic
     @DoNotInline
     fun setTimestampBase(outputConfig: OutputConfiguration, timestampBase: Int) {

diff --git a/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/compat/CaptureSessionFactory.kt b/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/compat/CaptureSessionFactory.kt
index f781b609..6d4b953 100644
--- a/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/compat/CaptureSessionFactory.kt
+++ b/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/compat/CaptureSessionFactory.kt

@@ -325,6 +325,8 @@
                 outputType = outputConfig.deferredOutputType!!,
                 mirrorMode = outputConfig.mirrorMode,
                 timestampBase = outputConfig.timestampBase,
+                dynamicRangeProfile = outputConfig.dynamicRangeProfile,
+                streamUseCase = outputConfig.streamUseCase,
                 surfaceSharing = outputConfig.surfaceSharing,
                 surfaceGroupId = outputConfig.groupNumber ?: SURFACE_GROUP_ID_NONE,
                 physicalCameraId = if (outputConfig.camera != graphConfig.camera) {
@@ -354,6 +356,8 @@
             outputSurfaces.first(),
             mirrorMode = outputConfig.mirrorMode,
             timestampBase = outputConfig.timestampBase,
+            dynamicRangeProfile = outputConfig.dynamicRangeProfile,
+            streamUseCase = outputConfig.streamUseCase,
             size = outputConfig.size,
             surfaceSharing = outputConfig.surfaceSharing,
             surfaceGroupId = outputConfig.groupNumber ?: SURFACE_GROUP_ID_NONE,

diff --git a/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/compat/Configuration.kt b/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/compat/Configuration.kt
index c7243bd..3079060 100644
--- a/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/compat/Configuration.kt
+++ b/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/compat/Configuration.kt

@@ -26,8 +26,10 @@
 import android.view.SurfaceHolder
 import androidx.annotation.RequiresApi
 import androidx.camera.camera2.pipe.CameraId
-import androidx.camera.camera2.pipe.OutputStream.OutputType
+import androidx.camera.camera2.pipe.OutputStream.DynamicRangeProfile
 import androidx.camera.camera2.pipe.OutputStream.MirrorMode
+import androidx.camera.camera2.pipe.OutputStream.OutputType
+import androidx.camera.camera2.pipe.OutputStream.StreamUseCase
 import androidx.camera.camera2.pipe.OutputStream.TimestampBase
 import androidx.camera.camera2.pipe.UnsafeWrapper
 import androidx.camera.camera2.pipe.compat.OutputConfigurationWrapper.Companion.SURFACE_GROUP_ID_NONE
@@ -139,6 +141,8 @@
             outputType: OutputType = OutputType.SURFACE,
             mirrorMode: MirrorMode? = null,
             timestampBase: TimestampBase? = null,
+            dynamicRangeProfile: DynamicRangeProfile? = null,
+            streamUseCase: StreamUseCase? = null,
             size: Size? = null,
             surfaceSharing: Boolean = false,
             surfaceGroupId: Int = SURFACE_GROUP_ID_NONE,
@@ -224,6 +228,26 @@
                 }
             }
 
+            if (dynamicRangeProfile != null) {
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+                    Api33Compat.setDynamicRangeProfile(configuration, dynamicRangeProfile.value)
+                } else {
+                    if (dynamicRangeProfile != DynamicRangeProfile.STANDARD) {
+                        Log.warn {
+                            "Cannot set dynamicRangeProfile to a non-default value on API " +
+                                "${Build.VERSION.SDK_INT}. This may result in unexpected " +
+                                "behavior. Requested $dynamicRangeProfile"
+                        }
+                    }
+                }
+            }
+
+            if (streamUseCase != null) {
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+                    Api33Compat.setStreamUseCase(configuration, streamUseCase.value)
+                }
+            }
+
             // Create and return the Android
             return AndroidOutputConfiguration(
                 configuration,

diff --git a/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/graph/CameraGraphImpl.kt b/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/graph/CameraGraphImpl.kt
index 3a6eee4..76f5753 100644
--- a/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/graph/CameraGraphImpl.kt
+++ b/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/graph/CameraGraphImpl.kt

@@ -21,6 +21,7 @@
 import androidx.camera.camera2.pipe.CameraController
 import androidx.camera.camera2.pipe.CameraGraph
 import androidx.camera.camera2.pipe.CameraMetadata
+import androidx.camera.camera2.pipe.GraphState
 import androidx.camera.camera2.pipe.StreamGraph
 import androidx.camera.camera2.pipe.StreamId
 import androidx.camera.camera2.pipe.config.CameraGraphScope
@@ -31,6 +32,7 @@
 import androidx.camera.camera2.pipe.core.acquireOrNull
 import javax.inject.Inject
 import kotlinx.atomicfu.atomic
+import kotlinx.coroutines.flow.StateFlow
 
 internal val cameraGraphIds = atomic(0)
 
@@ -40,6 +42,7 @@
     graphConfig: CameraGraph.Config,
     metadata: CameraMetadata,
     private val graphProcessor: GraphProcessor,
+    private val graphListener: GraphListener,
     private val streamGraph: StreamGraphImpl,
     private val surfaceGraph: SurfaceGraph,
     private val cameraController: CameraController,
@@ -63,9 +66,13 @@
     override val streams: StreamGraph
         get() = streamGraph
 
+    override val graphState: StateFlow<GraphState>
+        get() = graphProcessor.graphState
+
     override fun start() {
         Debug.traceStart { "$this#start" }
         Log.info { "Starting $this" }
+        graphListener.onGraphStarting()
         cameraController.start()
         Debug.traceStop()
     }
@@ -73,6 +80,7 @@
     override fun stop() {
         Debug.traceStart { "$this#stop" }
         Log.info { "Stopping $this" }
+        graphListener.onGraphStopping()
         cameraController.stop()
         Debug.traceStop()
     }

diff --git a/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/graph/GraphListener.kt b/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/graph/GraphListener.kt
index 598657f..89ea72b 100644
--- a/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/graph/GraphListener.kt
+++ b/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/graph/GraphListener.kt

@@ -17,16 +17,29 @@
 package androidx.camera.camera2.pipe.graph
 
 import androidx.annotation.RequiresApi
+import androidx.camera.camera2.pipe.CameraGraph
 
 @RequiresApi(21) // TODO(b/200306659): Remove and replace with annotation on package-info.java
 interface GraphListener {
     /**
+     * Used to indicate that the graph is starting. This is called immediately when a [CameraGraph]
+     * is being started.
+     */
+    fun onGraphStarting() {}
+
+    /**
      * Used to indicate that the graph has been initialized and is ready to actively process
      * requests using the provided [GraphRequestProcessor] interface.
      */
     fun onGraphStarted(requestProcessor: GraphRequestProcessor)
 
     /**
+     * Used to indicate that the graph is stopping. This is called immediately when a [CameraGraph]
+     * is being stopped.
+     */
+    fun onGraphStopping() {}
+
+    /**
      * Used to indicate that a previously initialized [GraphRequestProcessor] is no longer
      * available.
      */

diff --git a/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/graph/GraphProcessor.kt b/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/graph/GraphProcessor.kt
index 598e8bf..4b23fbc 100644
--- a/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/graph/GraphProcessor.kt
+++ b/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/graph/GraphProcessor.kt

@@ -21,6 +21,10 @@
 import androidx.annotation.GuardedBy
 import androidx.annotation.RequiresApi
 import androidx.camera.camera2.pipe.CameraGraph
+import androidx.camera.camera2.pipe.GraphState
+import androidx.camera.camera2.pipe.GraphState.GraphStateStopped
+import androidx.camera.camera2.pipe.GraphState.GraphStateStarting
+import androidx.camera.camera2.pipe.GraphState.GraphStateStarted
 import androidx.camera.camera2.pipe.CaptureSequenceProcessor
 import androidx.camera.camera2.pipe.Request
 import androidx.camera.camera2.pipe.config.CameraGraphScope
@@ -35,6 +39,8 @@
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
 
 /**
  * The [GraphProcessor] is responsible for queuing and then submitting them to a
@@ -42,6 +48,8 @@
  * and submitted before the camera is available.
  */
 internal interface GraphProcessor {
+    val graphState: StateFlow<GraphState>
+
     fun submit(request: Request)
     fun submit(requests: List<Request>)
     suspend fun submit(parameters: Map<*, Any?>): Boolean
@@ -102,7 +110,19 @@
     @GuardedBy("lock")
     private var closed = false
 
+    private val _graphState = MutableStateFlow<GraphState>(GraphStateStopped)
+
+    override val graphState: StateFlow<GraphState>
+        get() = _graphState
+
+    override fun onGraphStarting() {
+        debug { "$this onGraphStarting" }
+        _graphState.value = GraphStateStarting
+    }
+
     override fun onGraphStarted(requestProcessor: GraphRequestProcessor) {
+        debug { "$this onGraphStarted" }
+        _graphState.value = GraphStateStarted
         var old: GraphRequestProcessor? = null
         synchronized(lock) {
             if (closed) {
@@ -126,6 +146,8 @@
     }
 
     override fun onGraphStopped(requestProcessor: GraphRequestProcessor) {
+        debug { "$this onGraphStopped" }
+        _graphState.value = GraphStateStopped
         var old: GraphRequestProcessor? = null
         synchronized(lock) {
             if (closed) {

diff --git a/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/graph/StreamGraphImpl.kt b/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/graph/StreamGraphImpl.kt
index dc857da..d03ed3b 100644
--- a/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/graph/StreamGraphImpl.kt
+++ b/camera/camera-camera2-pipe/src/main/java/androidx/camera/camera2/pipe/graph/StreamGraphImpl.kt

@@ -121,6 +121,8 @@
                     },
                     mirrorMode = output.mirrorMode,
                     timestampBase = output.timestampBase,
+                    dynamicRangeProfile = output.dynamicRangeProfile,
+                    streamUseCase = output.streamUseCase,
                     externalOutputConfig =
                     (output as? OutputStream.Config.ExternalOutputConfig)?.output
                 )
@@ -143,7 +145,9 @@
                     outputConfig.format,
                     outputConfig.camera,
                     outputConfig.mirrorMode,
-                    outputConfig.timestampBase
+                    outputConfig.timestampBase,
+                    outputConfig.dynamicRangeProfile,
+                    outputConfig.streamUseCase,
                 )
                 outputStream
             }
@@ -181,6 +185,8 @@
         val deferredOutputType: OutputStream.OutputType?,
         val mirrorMode: OutputStream.MirrorMode?,
         val timestampBase: OutputStream.TimestampBase?,
+        val dynamicRangeProfile: OutputStream.DynamicRangeProfile?,
+        val streamUseCase: OutputStream.StreamUseCase?,
     ) {
         internal val streamBuilder = mutableListOf<CameraStream>()
         val streams: List<CameraStream>
@@ -199,6 +205,8 @@
         override val camera: CameraId,
         override val mirrorMode: OutputStream.MirrorMode?,
         override val timestampBase: OutputStream.TimestampBase?,
+        override val dynamicRangeProfile: OutputStream.DynamicRangeProfile?,
+        override val streamUseCase: OutputStream.StreamUseCase?,
     ) : OutputStream {
         override lateinit var stream: CameraStream
         override fun toString(): String = id.toString()

diff --git a/camera/camera-camera2-pipe/src/test/java/androidx/camera/camera2/pipe/graph/CameraGraphImplTest.kt b/camera/camera-camera2-pipe/src/test/java/androidx/camera/camera2/pipe/graph/CameraGraphImplTest.kt
index 23e8bd6..5b1200b 100644
--- a/camera/camera-camera2-pipe/src/test/java/androidx/camera/camera2/pipe/graph/CameraGraphImplTest.kt
+++ b/camera/camera-camera2-pipe/src/test/java/androidx/camera/camera2/pipe/graph/CameraGraphImplTest.kt

@@ -118,6 +118,7 @@
             graphConfig,
             metadata,
             fakeGraphProcessor,
+            fakeGraphProcessor,
             streamGraph,
             surfaceGraph,
             cameraController,

diff --git a/camera/camera-camera2-pipe/src/test/java/androidx/camera/camera2/pipe/graph/StreamGraphImplTest.kt b/camera/camera-camera2-pipe/src/test/java/androidx/camera/camera2/pipe/graph/StreamGraphImplTest.kt
index 2ceaefc..83ecdba 100644
--- a/camera/camera-camera2-pipe/src/test/java/androidx/camera/camera2/pipe/graph/StreamGraphImplTest.kt
+++ b/camera/camera-camera2-pipe/src/test/java/androidx/camera/camera2/pipe/graph/StreamGraphImplTest.kt

@@ -41,9 +41,9 @@
     fun testPrecomputedTestData() {
         val streamGraph = StreamGraphImpl(config.fakeMetadata, config.graphConfig)
 
-        assertThat(streamGraph.streams).hasSize(7)
-        assertThat(streamGraph.streams).hasSize(7)
-        assertThat(streamGraph.outputConfigs).hasSize(6)
+        assertThat(streamGraph.streams).hasSize(9)
+        assertThat(streamGraph.streams).hasSize(9)
+        assertThat(streamGraph.outputConfigs).hasSize(8)
 
         val stream1 = streamGraph[config.streamConfig1]!!
         val outputStream1 = stream1.outputs.single()
@@ -52,6 +52,8 @@
         assertThat(outputStream1.size.height).isEqualTo(100)
         assertThat(outputStream1.mirrorMode).isNull()
         assertThat(outputStream1.timestampBase).isNull()
+        assertThat(outputStream1.dynamicRangeProfile).isNull()
+        assertThat(outputStream1.streamUseCase).isNull()
 
         val stream2 = streamGraph[config.streamConfig2]!!
         val outputStream2 = stream2.outputs.single()
@@ -61,6 +63,8 @@
         assertThat(outputStream2.size.height).isEqualTo(321)
         assertThat(outputStream2.mirrorMode).isNull()
         assertThat(outputStream2.timestampBase).isNull()
+        assertThat(outputStream2.dynamicRangeProfile).isNull()
+        assertThat(outputStream2.streamUseCase).isNull()
     }
 
     @Test
@@ -202,4 +206,26 @@
         assertThat(stream2.outputs.single().timestampBase)
             .isEqualTo(OutputStream.TimestampBase.TIMESTAMP_BASE_MONOTONIC)
     }
+
+    @Test
+    fun testDefaultAndPropagatedDynamicRangeProfiles() {
+        val streamGraph = StreamGraphImpl(config.fakeMetadata, config.graphConfig)
+        val stream1 = streamGraph[config.streamConfig1]!!
+        assertThat(stream1.outputs.single().dynamicRangeProfile).isNull()
+
+        val stream2 = streamGraph[config.streamConfig6]!!
+        assertThat(stream2.outputs.single().dynamicRangeProfile)
+            .isEqualTo(OutputStream.DynamicRangeProfile.PUBLIC_MAX)
+    }
+
+    @Test
+    fun testDefaultAndPropagatedStreamUseCases() {
+        val streamGraph = StreamGraphImpl(config.fakeMetadata, config.graphConfig)
+        val stream1 = streamGraph[config.streamConfig1]!!
+        assertThat(stream1.outputs.single().streamUseCase).isNull()
+
+        val stream2 = streamGraph[config.streamConfig7]!!
+        assertThat(stream2.outputs.single().streamUseCase)
+            .isEqualTo(OutputStream.StreamUseCase.VIDEO_RECORD)
+    }
 }
\ No newline at end of file

diff --git a/camera/camera-camera2-pipe/src/test/java/androidx/camera/camera2/pipe/graph/SurfaceGraphTest.kt b/camera/camera-camera2-pipe/src/test/java/androidx/camera/camera2/pipe/graph/SurfaceGraphTest.kt
index f5ed8ec..57809dd 100644
--- a/camera/camera-camera2-pipe/src/test/java/androidx/camera/camera2/pipe/graph/SurfaceGraphTest.kt
+++ b/camera/camera-camera2-pipe/src/test/java/androidx/camera/camera2/pipe/graph/SurfaceGraphTest.kt

@@ -55,8 +55,10 @@
     private val stream3 = streamMap[config.streamConfig3]!!
     private val stream4 = streamMap[config.streamConfig4]!!
     private val stream5 = streamMap[config.streamConfig5]!!
-    private val stream6 = streamMap[config.sharedStreamConfig1]!!
-    private val stream7 = streamMap[config.sharedStreamConfig2]!!
+    private val stream6 = streamMap[config.streamConfig6]!!
+    private val stream7 = streamMap[config.streamConfig7]!!
+    private val stream8 = streamMap[config.sharedStreamConfig1]!!
+    private val stream9 = streamMap[config.sharedStreamConfig2]!!
 
     private val fakeSurface1 = Surface(SurfaceTexture(1))
     private val fakeSurface2 = Surface(SurfaceTexture(2))
@@ -65,6 +67,8 @@
     private val fakeSurface5 = Surface(SurfaceTexture(5))
     private val fakeSurface6 = Surface(SurfaceTexture(6))
     private val fakeSurface7 = Surface(SurfaceTexture(7))
+    private val fakeSurface8 = Surface(SurfaceTexture(8))
+    private val fakeSurface9 = Surface(SurfaceTexture(9))
 
     @After
     fun teardown() {
@@ -75,6 +79,8 @@
         fakeSurface5.release()
         fakeSurface6.release()
         fakeSurface7.release()
+        fakeSurface8.release()
+        fakeSurface9.release()
     }
 
     @Test
@@ -86,6 +92,8 @@
         surfaceGraph[stream5.id] = fakeSurface5
         surfaceGraph[stream6.id] = fakeSurface6
         surfaceGraph[stream7.id] = fakeSurface7
+        surfaceGraph[stream8.id] = fakeSurface8
+        surfaceGraph[stream9.id] = fakeSurface9
 
         assertThat(controller.surfaceMap).isNotNull()
         assertThat(controller.surfaceMap?.get(stream1.id)).isEqualTo(fakeSurface1)
@@ -93,6 +101,8 @@
         assertThat(controller.surfaceMap?.get(stream3.id)).isEqualTo(fakeSurface3)
         assertThat(controller.surfaceMap?.get(stream4.id)).isEqualTo(fakeSurface4)
         assertThat(controller.surfaceMap?.get(stream5.id)).isEqualTo(fakeSurface5)
+        assertThat(controller.surfaceMap?.get(stream6.id)).isEqualTo(fakeSurface6)
+        assertThat(controller.surfaceMap?.get(stream7.id)).isEqualTo(fakeSurface7)
     }
 
     @Test
@@ -104,10 +114,12 @@
         surfaceGraph[stream3.id] = fakeSurface3
         surfaceGraph[stream4.id] = fakeSurface4
         surfaceGraph[stream5.id] = fakeSurface5
-        assertThat(controller.surfaceMap).isNull()
-
         surfaceGraph[stream6.id] = fakeSurface6
         surfaceGraph[stream7.id] = fakeSurface7
+        assertThat(controller.surfaceMap).isNull()
+
+        surfaceGraph[stream8.id] = fakeSurface8
+        surfaceGraph[stream9.id] = fakeSurface9
 
         assertThat(controller.surfaceMap).isNotNull()
         assertThat(controller.surfaceMap?.get(stream1.id)).isEqualTo(fakeSurface1)
@@ -117,6 +129,8 @@
         assertThat(controller.surfaceMap?.get(stream5.id)).isEqualTo(fakeSurface5)
         assertThat(controller.surfaceMap?.get(stream6.id)).isEqualTo(fakeSurface6)
         assertThat(controller.surfaceMap?.get(stream7.id)).isEqualTo(fakeSurface7)
+        assertThat(controller.surfaceMap?.get(stream8.id)).isEqualTo(fakeSurface8)
+        assertThat(controller.surfaceMap?.get(stream9.id)).isEqualTo(fakeSurface9)
     }
 
     @Test
@@ -134,6 +148,8 @@
         surfaceGraph[stream5.id] = fakeSurface5
         surfaceGraph[stream6.id] = fakeSurface6
         surfaceGraph[stream7.id] = fakeSurface7
+        surfaceGraph[stream8.id] = fakeSurface8
+        surfaceGraph[stream9.id] = fakeSurface9
 
         assertThat(controller.surfaceMap).isNotNull()
         assertThat(controller.surfaceMap?.get(stream1.id)).isEqualTo(fakeSurface1B)
@@ -143,6 +159,8 @@
         assertThat(controller.surfaceMap?.get(stream5.id)).isEqualTo(fakeSurface5)
         assertThat(controller.surfaceMap?.get(stream6.id)).isEqualTo(fakeSurface6)
         assertThat(controller.surfaceMap?.get(stream7.id)).isEqualTo(fakeSurface7)
+        assertThat(controller.surfaceMap?.get(stream8.id)).isEqualTo(fakeSurface8)
+        assertThat(controller.surfaceMap?.get(stream9.id)).isEqualTo(fakeSurface9)
 
         fakeSurface1A.release()
         fakeSurface1B.release()

diff --git a/camera/camera-camera2-pipe/src/test/java/androidx/camera/camera2/pipe/testing/FakeGraphConfigs.kt b/camera/camera-camera2-pipe/src/test/java/androidx/camera/camera2/pipe/testing/FakeGraphConfigs.kt
index fce96de..862313f 100644
--- a/camera/camera-camera2-pipe/src/test/java/androidx/camera/camera2/pipe/testing/FakeGraphConfigs.kt
+++ b/camera/camera-camera2-pipe/src/test/java/androidx/camera/camera2/pipe/testing/FakeGraphConfigs.kt

@@ -88,6 +88,27 @@
         mirrorMode = OutputStream.MirrorMode.MIRROR_MODE_AUTO,
         timestampBase = OutputStream.TimestampBase.TIMESTAMP_BASE_MONOTONIC
     )
+    val streamConfig6 = CameraStream.Config.create(
+        size = Size(200, 200),
+        format = StreamFormat.YUV_420_888,
+        camera = camera2,
+        outputType = OutputStream.OutputType.SURFACE_TEXTURE,
+        mirrorMode = OutputStream.MirrorMode.MIRROR_MODE_AUTO,
+        timestampBase = OutputStream.TimestampBase.TIMESTAMP_BASE_DEFAULT,
+        dynamicRangeProfile = OutputStream.DynamicRangeProfile.PUBLIC_MAX
+    )
+
+    val streamConfig7 = CameraStream.Config.create(
+        size = Size(200, 200),
+        format = StreamFormat.YUV_420_888,
+        camera = camera2,
+        outputType = OutputStream.OutputType.SURFACE_TEXTURE,
+        mirrorMode = OutputStream.MirrorMode.MIRROR_MODE_AUTO,
+        timestampBase = OutputStream.TimestampBase.TIMESTAMP_BASE_DEFAULT,
+        dynamicRangeProfile = OutputStream.DynamicRangeProfile.STANDARD,
+        streamUseCase = OutputStream.StreamUseCase.VIDEO_RECORD
+    )
+
     val sharedOutputConfig = OutputStream.Config.create(
         size = Size(200, 200),
         format = StreamFormat.YUV_420_888,
@@ -104,6 +125,8 @@
             streamConfig3,
             streamConfig4,
             streamConfig5,
+            streamConfig6,
+            streamConfig7,
             sharedStreamConfig1,
             sharedStreamConfig2
         ),

diff --git a/camera/camera-camera2-pipe/src/test/java/androidx/camera/camera2/pipe/testing/FakeGraphProcessor.kt b/camera/camera-camera2-pipe/src/test/java/androidx/camera/camera2/pipe/testing/FakeGraphProcessor.kt
index 1c9b2d0..725316b 100644
--- a/camera/camera-camera2-pipe/src/test/java/androidx/camera/camera2/pipe/testing/FakeGraphProcessor.kt
+++ b/camera/camera-camera2-pipe/src/test/java/androidx/camera/camera2/pipe/testing/FakeGraphProcessor.kt

@@ -16,12 +16,15 @@
 
 package androidx.camera.camera2.pipe.testing
 
+import androidx.camera.camera2.pipe.GraphState
 import androidx.camera.camera2.pipe.Request
 import androidx.camera.camera2.pipe.graph.GraphListener
 import androidx.camera.camera2.pipe.graph.GraphProcessor
 import androidx.camera.camera2.pipe.graph.GraphRequestProcessor
 import androidx.camera.camera2.pipe.graph.GraphState3A
 import androidx.camera.camera2.pipe.putAllMetadata
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
 
 /**
  * Fake implementation of a [GraphProcessor] for tests.
@@ -43,6 +46,11 @@
     private val _requestQueue = mutableListOf<List<Request>>()
     private var processor: GraphRequestProcessor? = null
 
+    private val _graphState = MutableStateFlow<GraphState>(GraphState.GraphStateStopped)
+
+    override val graphState: StateFlow<GraphState>
+        get() = _graphState
+
     override fun startRepeating(request: Request) {
         repeatingRequest = request
     }
@@ -58,6 +66,7 @@
     override fun submit(requests: List<Request>) {
         _requestQueue.add(requests)
     }
+
     override suspend fun submit(parameters: Map<*, Any?>): Boolean {
         if (closed) {
             return false

diff --git a/camera/camera-camera2/src/androidTest/java/androidx/camera/camera2/internal/Camera2CameraImplTest.java b/camera/camera-camera2/src/androidTest/java/androidx/camera/camera2/internal/Camera2CameraImplTest.java
index 325da4f..6ebf92f 100644
--- a/camera/camera-camera2/src/androidTest/java/androidx/camera/camera2/internal/Camera2CameraImplTest.java
+++ b/camera/camera-camera2/src/androidTest/java/androidx/camera/camera2/internal/Camera2CameraImplTest.java

@@ -69,6 +69,9 @@
 import androidx.camera.testing.fakes.FakeCameraInfoInternal;
 import androidx.camera.testing.fakes.FakeUseCase;
 import androidx.camera.testing.fakes.FakeUseCaseConfig;
+import androidx.camera.testing.mocks.MockObserver;
+import androidx.camera.testing.mocks.helpers.CallTimes;
+import androidx.camera.testing.mocks.helpers.CallTimesAtLeast;
 import androidx.core.os.HandlerCompat;
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
@@ -91,12 +94,9 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
-import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Semaphore;
@@ -534,10 +534,11 @@
 
     @Test
     public void cameraTransitionsThroughPendingState_whenNoCamerasAvailable() {
-        CameraInternalStateMockObserver mockObserver = new CameraInternalStateMockObserver();
+        MockObserver<CameraInternal.State> mockObserver = new MockObserver<>();
 
         // Ensure real camera can't open due to max cameras being open
         Camera mockCamera = mock(Camera.class);
+
         mCameraStateRegistry.registerCamera(mockCamera, CameraXExecutors.directExecutor(),
                 () -> {
                 });
@@ -550,7 +551,7 @@
 
         // Ensure that the camera gets to a PENDING_OPEN state
         mockObserver.verifyOnNewDataCall(CameraInternal.State.PENDING_OPEN, 3000,
-                times -> times > 0);
+                new CallTimesAtLeast(1));
 
         // Allow camera to be opened
         mCameraStateRegistry.markCameraState(mockCamera, CameraInternal.State.CLOSED);
@@ -593,7 +594,7 @@
         // Wait for the secondary capture session is configured.
         assertTrue(mSessionStateCallback.waitForOnConfigured(1));
 
-        CameraInternalStateMockObserver mockObserver = new CameraInternalStateMockObserver();
+        MockObserver<CameraInternal.State> mockObserver = new MockObserver<>();
 
         mCamera2CameraImpl.getCameraState().addObserver(CameraXExecutors.directExecutor(),
                 mockObserver);
@@ -602,7 +603,8 @@
 
         // Wait for the CLOSED state. If the test fail, the CameraX might in wrong internal state,
         // and the Camera2CameraImpl#release() might stuck.
-        mockObserver.verifyOnNewDataCall(CameraInternal.State.CLOSED, 4000, times -> times == 1);
+        mockObserver.verifyOnNewDataCall(CameraInternal.State.CLOSED, 4000,
+                new CallTimes(1));
     }
 
     @Test
@@ -1044,64 +1046,4 @@
             return suggestedResolution;
         }
     }
-
-    static class CameraInternalStateMockObserver
-            implements Observable.Observer<CameraInternal.State> {
-        public interface CallTimesCondition {
-            boolean check(int times);
-        }
-
-        private final Map<CameraInternal.State, Integer> mNewDataCount = new HashMap<>();
-
-        private CallTimesCondition mCallTimesCondition;
-        private CameraInternal.State mValueToVerify;
-        private CountDownLatch mLatch;
-
-        private boolean isVerified() {
-            int count = mNewDataCount.get(mValueToVerify) == null
-                    ? 0 : mNewDataCount.get(mValueToVerify);
-            return mCallTimesCondition.check(count);
-        }
-
-        public void verifyOnNewDataCall(@Nullable CameraInternal.State value,
-                long timeoutInMillis) {
-            verifyOnNewDataCall(value, timeoutInMillis, times -> times == 1);
-        }
-
-        public void verifyOnNewDataCall(@Nullable CameraInternal.State value,
-                long timeoutInMillis, CallTimesCondition callTimesCondition) {
-            mValueToVerify = value;
-            mCallTimesCondition = callTimesCondition;
-
-            if (!isVerified()) {
-                mLatch = new CountDownLatch(1);
-
-                try {
-                    assertTrue("Test failed for a timeout of " + timeoutInMillis + " ms",
-                            mLatch.await(timeoutInMillis, TimeUnit.MILLISECONDS));
-                } catch (InterruptedException e) {
-                    throw new RuntimeException(e);
-                }
-
-                assertTrue("onNewData called "
-                                + mNewDataCount.get(value) + " time(s) with " + value,
-                        isVerified());
-
-                mLatch = null;
-            }
-        }
-
-        @Override
-        public void onNewData(@Nullable CameraInternal.State value) {
-            Integer prevCount = mNewDataCount.get(value);
-            mNewDataCount.put(value, (prevCount == null ? 0 : prevCount) + 1);
-
-            if (mLatch != null && isVerified()) {
-                mLatch.countDown();
-            }
-        }
-
-        @Override
-        public void onError(@NonNull Throwable t) {}
-    };
 }

diff --git a/camera/camera-camera2/src/main/java/androidx/camera/camera2/internal/DisplayInfoManager.java b/camera/camera-camera2/src/main/java/androidx/camera/camera2/internal/DisplayInfoManager.java
index 748e0c5..8be1ac2 100644
--- a/camera/camera-camera2/src/main/java/androidx/camera/camera2/internal/DisplayInfoManager.java
+++ b/camera/camera-camera2/src/main/java/androidx/camera/camera2/internal/DisplayInfoManager.java

@@ -32,6 +32,8 @@
  */
 @RequiresApi(21) // TODO(b/200306659): Remove and replace with annotation on package-info.java
 public class DisplayInfoManager {
+
+    private static final String TAG = "DisplayInfoManager";
     private static final Size MAX_PREVIEW_SIZE = new Size(1920, 1080);
     private static final Object INSTANCE_LOCK = new Object();
     private static volatile DisplayInfoManager sInstance;
@@ -85,24 +87,41 @@
             return displays[0];
         }
 
-        Display maxDisplay = null;
-        int maxDisplaySize = -1;
+        Display maxDisplayWhenStateOn = null;
+        int maxDisplaySizeWhenStateOn = -1;
         for (Display display : displays) {
             if (display.getState() != Display.STATE_OFF) {
                 Point displaySize = new Point();
                 display.getRealSize(displaySize);
+                if (displaySize.x * displaySize.y > maxDisplaySizeWhenStateOn) {
+                    maxDisplaySizeWhenStateOn = displaySize.x * displaySize.y;
+                    maxDisplayWhenStateOn = display;
+                }
+            }
+        }
+
+        if (maxDisplayWhenStateOn == null) {
+            // If there is no display found with state on, search display with state off as well.
+            // If still no display found, throw IllegalArgumentException.
+            Display maxDisplay = null;
+            int maxDisplaySize = -1;
+            for (Display display : displays) {
+                Point displaySize = new Point();
+                display.getRealSize(displaySize);
                 if (displaySize.x * displaySize.y > maxDisplaySize) {
                     maxDisplaySize = displaySize.x * displaySize.y;
                     maxDisplay = display;
                 }
             }
-        }
 
-        if (maxDisplay == null) {
-            throw new IllegalArgumentException("No display can be found from the input display "
-                    + "manager!");
+            if (maxDisplay == null) {
+                throw new IllegalArgumentException("No display can be found from the input display "
+                        + "manager!");
+            }
+
+            return maxDisplay;
         }
-        return maxDisplay;
+        return maxDisplayWhenStateOn;
     }
 
     /**

diff --git a/camera/camera-camera2/src/test/java/androidx/camera/camera2/internal/DisplayInfoManagerTest.kt b/camera/camera-camera2/src/test/java/androidx/camera/camera2/internal/DisplayInfoManagerTest.kt
index fafca66..8fff586 100644
--- a/camera/camera-camera2/src/test/java/androidx/camera/camera2/internal/DisplayInfoManagerTest.kt
+++ b/camera/camera-camera2/src/test/java/androidx/camera/camera2/internal/DisplayInfoManagerTest.kt

@@ -34,8 +34,9 @@
 import org.robolectric.annotation.Config
 import org.robolectric.annotation.internal.DoNotInstrument
 import org.robolectric.shadow.api.Shadow
-import org.robolectric.shadows.ShadowDisplayManager
 import org.robolectric.shadows.ShadowDisplay
+import org.robolectric.shadows.ShadowDisplayManager
+import org.robolectric.shadows.ShadowDisplayManager.removeDisplay
 
 @RunWith(RobolectricTestRunner::class)
 @DoNotInstrument
@@ -109,6 +110,36 @@
         assertThat(size).isEqualTo(Point(480, 640))
     }
 
+    @Test(expected = IllegalArgumentException::class)
+    fun canReturnMaxSizeDisplay_noDisplay() {
+        // Arrange
+        removeDisplay(0)
+
+        // Act
+        val displayInfoManager = DisplayInfoManager
+            .getInstance(ApplicationProvider.getApplicationContext())
+        val size = Point()
+        displayInfoManager.maxSizeDisplay.getRealSize(size)
+    }
+
+    @Test
+    fun canReturnMaxSizeDisplay_allOffState() {
+        // Arrange
+        addDisplay(480, 640, Display.STATE_OFF)
+        addDisplay(200, 300, Display.STATE_OFF)
+        addDisplay(2000, 3000, Display.STATE_OFF)
+        removeDisplay(0)
+
+        // Act
+        val displayInfoManager = DisplayInfoManager
+            .getInstance(ApplicationProvider.getApplicationContext())
+        val size = Point()
+        displayInfoManager.maxSizeDisplay.getRealSize(size)
+
+        // Assert
+        assertThat(size).isEqualTo(Point(2000, 3000))
+    }
+
     @Test
     fun canReturnPreviewSize_displaySmallerThan1080P() {
         // Arrange

diff --git a/camera/camera-core/src/androidTest/java/androidx/camera/core/SurfaceRequestTest.kt b/camera/camera-core/src/androidTest/java/androidx/camera/core/SurfaceRequestTest.kt
index 6ff346a..24f4e72 100644
--- a/camera/camera-core/src/androidTest/java/androidx/camera/core/SurfaceRequestTest.kt
+++ b/camera/camera-core/src/androidTest/java/androidx/camera/core/SurfaceRequestTest.kt

@@ -171,6 +171,23 @@
     }
 
     @Test
+    fun handleInvalidate_runWhenInvalidateCalled() {
+        // Arrange.
+        var isCalled = false
+        val request = createNewRequest(FAKE_SIZE) {
+            isCalled = true
+        }
+        Truth.assertThat(isCalled).isFalse()
+
+        // Act.
+        request.willNotProvideSurface()
+        request.invalidate()
+
+        // Assert.
+        Truth.assertThat(isCalled).isTrue()
+    }
+
+    @Test
     @Suppress("UNCHECKED_CAST")
     fun cancelledRequest_resultsInREQUEST_CANCELLED() {
         val request = createNewRequest(FAKE_SIZE)
@@ -331,9 +348,10 @@
     private fun createNewRequest(
         size: Size,
         expectedFrameRate: Range<Int>? = null,
-        autoCleanup: Boolean = true
+        autoCleanup: Boolean = true,
+        onInvalidated: () -> Unit = {},
     ): SurfaceRequest {
-        val request = SurfaceRequest(size, FakeCamera(), false, expectedFrameRate)
+        val request = SurfaceRequest(size, FakeCamera(), false, expectedFrameRate, onInvalidated)
         if (autoCleanup) {
             surfaceRequests.add(request)
         }

diff --git a/camera/camera-core/src/androidTest/java/androidx/camera/core/imagecapture/FakeTakePictureCallback.kt b/camera/camera-core/src/androidTest/java/androidx/camera/core/imagecapture/FakeTakePictureCallback.kt
index 76601d7..706d6ec 100644
--- a/camera/camera-core/src/androidTest/java/androidx/camera/core/imagecapture/FakeTakePictureCallback.kt
+++ b/camera/camera-core/src/androidTest/java/androidx/camera/core/imagecapture/FakeTakePictureCallback.kt

@@ -28,19 +28,33 @@
  */
 class FakeTakePictureCallback : TakePictureCallback {
 
-    private lateinit var inMemoryResultCont: Continuation<ImageProxy>
-    private lateinit var onDiskResultCont: Continuation<OutputFileResults>
+    private var inMemoryResult: ImageProxy? = null
+    private var inMemoryResultCont: Continuation<ImageProxy>? = null
+    private var onDiskResult: OutputFileResults? = null
+    private var onDiskResultCont: Continuation<OutputFileResults>? = null
 
     override fun onImageCaptured() {
         TODO("Not yet implemented")
     }
 
     override fun onFinalResult(outputFileResults: OutputFileResults) {
-        onDiskResultCont.resume(outputFileResults)
+        val cont = onDiskResultCont
+        if (cont != null) {
+            cont.resume(outputFileResults)
+            >
+        } else {
+            >
+        }
     }
 
     override fun onFinalResult(imageProxy: ImageProxy) {
-        inMemoryResultCont.resume(imageProxy)
+        val cont = inMemoryResultCont
+        if (cont != null) {
+            cont.resume(imageProxy)
+            inMemoryResultCont = null
+        } else {
+            inMemoryResult = imageProxy
+        }
     }
 
     override fun onCaptureFailure(imageCaptureException: ImageCaptureException) {
@@ -56,10 +70,18 @@
     }
 
     internal suspend fun getInMemoryResult() = suspendCoroutine { cont ->
-        inMemoryResultCont = cont
+        if (inMemoryResult != null) {
+            cont.resume(inMemoryResult!!)
+        } else {
+            inMemoryResultCont = cont
+        }
     }
 
     internal suspend fun getOnDiskResult() = suspendCoroutine { cont ->
-        >
+        if (onDiskResult != null) {
+            cont.resume(onDiskResult!!)
+        } else {
+            >
+        }
     }
 }
\ No newline at end of file

diff --git a/camera/camera-core/src/androidTest/java/androidx/camera/core/imagecapture/FakeTakePictureCallbackDeviceTest.kt b/camera/camera-core/src/androidTest/java/androidx/camera/core/imagecapture/FakeTakePictureCallbackDeviceTest.kt
new file mode 100644
index 0000000..e7cb20b
--- /dev/null
+++ b/camera/camera-core/src/androidTest/java/androidx/camera/core/imagecapture/FakeTakePictureCallbackDeviceTest.kt

@@ -0,0 +1,56 @@
+/*
+ * Copyright 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.camera.core.imagecapture
+
+import androidx.annotation.RequiresApi
+import androidx.camera.core.ImageCapture.OutputFileResults
+import androidx.camera.testing.fakes.FakeImageInfo
+import androidx.camera.testing.fakes.FakeImageProxy
+import androidx.test.filters.SdkSuppress
+import com.google.common.truth.Truth.assertThat
+import kotlinx.coroutines.runBlocking
+import org.junit.Test
+
+/**
+ * Unit tests for [FakeTakePictureCallbackDeviceTest]
+ */
+@RequiresApi(21)
+@SdkSuppress(minSdkVersion = 21)
+class FakeTakePictureCallbackDeviceTest {
+
+    private val fakeTakePictureCallback = FakeTakePictureCallback()
+
+    @Test
+    fun onDiskResultArrivesBeforeGet_canGetResult() = runBlocking {
+        // Arrange.
+        val >
+        // Assert.
+        fakeTakePictureCallback.onFinalResult(onDiskResult)
+        // Act.
+        assertThat(fakeTakePictureCallback.getOnDiskResult()).isEqualTo(onDiskResult)
+    }
+
+    @Test
+    fun inMemoryResultArrivesBeforeGet_canGetResult() = runBlocking {
+        // Arrange.
+        val inMemoryResult = FakeImageProxy(FakeImageInfo())
+        // Assert.
+        fakeTakePictureCallback.onFinalResult(inMemoryResult)
+        // Act.
+        assertThat(fakeTakePictureCallback.getInMemoryResult()).isEqualTo(inMemoryResult)
+    }
+}
\ No newline at end of file

diff --git a/camera/camera-core/src/androidTest/java/androidx/camera/core/processing/DefaultSurfaceProcessorTest.kt b/camera/camera-core/src/androidTest/java/androidx/camera/core/processing/DefaultSurfaceProcessorTest.kt
index 05fdc22..3f88ffa 100644
--- a/camera/camera-core/src/androidTest/java/androidx/camera/core/processing/DefaultSurfaceProcessorTest.kt
+++ b/camera/camera-core/src/androidTest/java/androidx/camera/core/processing/DefaultSurfaceProcessorTest.kt

@@ -304,7 +304,7 @@
     }
 
     private fun createInputSurfaceRequest(): SurfaceRequest {
-        return SurfaceRequest(Size(WIDTH, HEIGHT), fakeCamera, false).apply {
+        return SurfaceRequest(Size(WIDTH, HEIGHT), fakeCamera, false) {}.apply {
             inputSurfaceRequestsToClose.add(this)
         }
     }

diff --git a/camera/camera-core/src/main/java/androidx/camera/core/ImageCapture.java b/camera/camera-core/src/main/java/androidx/camera/core/ImageCapture.java
index a13c3ca..a689360 100644
--- a/camera/camera-core/src/main/java/androidx/camera/core/ImageCapture.java
+++ b/camera/camera-core/src/main/java/androidx/camera/core/ImageCapture.java

@@ -279,7 +279,7 @@
     @FlashMode
     private static final int DEFAULT_FLASH_MODE = FLASH_MODE_OFF;
 
-    boolean mUseProcessingPipeline = false;
+    boolean mUseProcessingPipeline = true;
 
     @SuppressWarnings("WeakerAccess") /* synthetic accessor */
     static final ExifRotationAvailability EXIF_ROTATION_AVAILABILITY =
@@ -1939,10 +1939,15 @@
         checkMainThread();
         Log.d(TAG, String.format("createPipelineWithNode(cameraId: %s, resolution: %s)",
                 cameraId, resolution));
+
         checkState(mImagePipeline == null);
         mImagePipeline = new ImagePipeline(config, resolution, mCameraEffect);
-        checkState(mTakePictureManager == null);
-        mTakePictureManager = new TakePictureManager(mImageCaptureControl, mImagePipeline);
+
+        if (mTakePictureManager == null) {
+            // mTakePictureManager is reused when the Surface is reset.
+            mTakePictureManager = new TakePictureManager(mImageCaptureControl);
+        }
+        mTakePictureManager.setImagePipeline(mImagePipeline);
 
         SessionConfig.Builder sessionConfigBuilder = mImagePipeline.createSessionConfigBuilder();
         if (Build.VERSION.SDK_INT >= 23 && getCaptureMode() == CAPTURE_MODE_ZERO_SHUTTER_LAG) {
@@ -1953,7 +1958,8 @@
             //  to this use case so we don't need to do this check.
             if (isCurrentCamera(cameraId)) {
                 mTakePictureManager.pause();
-                // TODO: we might need to ask mImagePipeline to recreate camera Surface.
+                clearPipelineWithNode(/*keepTakePictureManager=*/ true);
+                mSessionConfigBuilder = createPipeline(cameraId, config, resolution);
                 updateSessionConfig(mSessionConfigBuilder.build());
                 notifyReset();
                 mTakePictureManager.resume();
@@ -2028,6 +2034,15 @@
         return new Rect(0, 0, resolution.getWidth(), resolution.getHeight());
     }
 
+
+    /**
+     * Clears the pipeline without keeping the {@link TakePictureManager}.
+     */
+    @MainThread
+    private void clearPipelineWithNode() {
+        clearPipelineWithNode(/*keepTakePictureManager=*/false);
+    }
+
     /**
      * Clears the pipeline.
      *
@@ -2035,13 +2050,15 @@
      * resources.
      */
     @MainThread
-    private void clearPipelineWithNode() {
+    private void clearPipelineWithNode(boolean keepTakePictureManager) {
         Log.d(TAG, "clearPipelineWithNode");
         checkMainThread();
         mImagePipeline.close();
         mImagePipeline = null;
-        mTakePictureManager.abortRequests();
-        mTakePictureManager = null;
+        if (!keepTakePictureManager) {
+            mTakePictureManager.abortRequests();
+            mTakePictureManager = null;
+        }
     }
 
     /**
@@ -2082,6 +2099,12 @@
         return mCameraEffect;
     }
 
+    @VisibleForTesting
+    @NonNull
+    TakePictureManager getTakePictureManager() {
+        return mTakePictureManager;
+    }
+
     // ===== New architecture end =====
 
     /**
@@ -3081,7 +3104,8 @@
          * will be finally selected will depend on the camera device's hardware level and the
          * bound use cases combination. For more details see the guaranteed supported
          * configurations tables in {@link android.hardware.camera2.CameraDevice}'s
-         * <a href="https://developer.android.com/reference/android/hardware/camera2/CameraDevice#regular-capture">Regular capture</a> section.
+         * href="https://developer.android.com/reference/android/hardware/camera2/CameraDevice
+         * #regular-capture">Regular capture</a> section.
          *
          * @param resolution The target resolution to choose from supported output sizes list.
          * @return The current Builder.

diff --git a/camera/camera-core/src/main/java/androidx/camera/core/Preview.java b/camera/camera-core/src/main/java/androidx/camera/core/Preview.java
index dab5cfd..8eff18d 100644
--- a/camera/camera-core/src/main/java/androidx/camera/core/Preview.java
+++ b/camera/camera-core/src/main/java/androidx/camera/core/Preview.java

@@ -228,8 +228,12 @@
         clearPipeline();
 
         boolean isRGBA8888SurfaceRequired = config.isRgba8888SurfaceRequired(false);
+
+        // TODO: Can be improved by only restarting part of the pipeline when using the
+        //  CaptureProcessor. e.g. only update the output Surface (between Processor/App), and
+        //  still use the same input Surface (between Camera/Processor). It's just simpler for now.
         final SurfaceRequest surfaceRequest = new SurfaceRequest(resolution, getCamera(),
-                isRGBA8888SurfaceRequired);
+                isRGBA8888SurfaceRequired, this::notifyReset);
         mCurrentSurfaceRequest = surfaceRequest;
 
         if (mSurfaceProvider != null) {
@@ -319,7 +323,8 @@
                 /*hasEmbeddedTransform=*/true,
                 requireNonNull(getCropRect(resolution)),
                 getRelativeRotation(camera),
-                /*mirroring=*/false);
+                /*mirroring=*/false,
+                this::notifyReset);
         SurfaceEdge inputEdge = SurfaceEdge.create(singletonList(cameraSurface));
         SurfaceEdge outputEdge = mNode.transform(inputEdge);
         SettableSurface appSurface = outputEdge.getSurfaces().get(0);

diff --git a/camera/camera-core/src/main/java/androidx/camera/core/SafeCloseImageReaderProxy.java b/camera/camera-core/src/main/java/androidx/camera/core/SafeCloseImageReaderProxy.java
index 159949c..f7bdce3 100644
--- a/camera/camera-core/src/main/java/androidx/camera/core/SafeCloseImageReaderProxy.java
+++ b/camera/camera-core/src/main/java/androidx/camera/core/SafeCloseImageReaderProxy.java

@@ -23,6 +23,7 @@
 import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
 import androidx.annotation.RestrictTo;
+import androidx.annotation.VisibleForTesting;
 import androidx.camera.core.ForwardingImageProxy.OnImageCloseListener;
 import androidx.camera.core.impl.ImageReaderProxy;
 
@@ -140,6 +141,16 @@
     }
 
     /**
+     * Check if the {@link SafeCloseImageReaderProxy} is closed for testing.
+     */
+    @VisibleForTesting
+    public boolean isClosed() {
+        synchronized (mLock) {
+            return mIsClosed;
+        }
+    }
+
+    /**
      * Returns the number of empty slots in the queue.
      */
     public int getCapacity() {
@@ -150,6 +161,7 @@
 
     /**
      * Sets a listener for close calls on this image.
+     *
      * @param listener to set
      */
     public void setOnImageCloseListener(@NonNull OnImageCloseListener listener) {

diff --git a/camera/camera-core/src/main/java/androidx/camera/core/SurfaceRequest.java b/camera/camera-core/src/main/java/androidx/camera/core/SurfaceRequest.java
index 374f3a2..523ad9d 100644
--- a/camera/camera-core/src/main/java/androidx/camera/core/SurfaceRequest.java
+++ b/camera/camera-core/src/main/java/androidx/camera/core/SurfaceRequest.java

@@ -84,6 +84,10 @@
     // from the camera.
     private final ListenableFuture<Void> mSessionStatusFuture;
 
+    // For notification of surface recreated.
+    @NonNull
+    private final CallbackToFutureAdapter.Completer<Void> mSurfaceRecreationCompleter;
+
     // For notification of surface request cancellation. Should only be used to register
     // cancellation listeners.
     private final CallbackToFutureAdapter.Completer<Void> mRequestCancellationCompleter;
@@ -110,13 +114,15 @@
     public SurfaceRequest(
             @NonNull Size resolution,
             @NonNull CameraInternal camera,
-            boolean isRGBA8888Required) {
-        this(resolution, camera, isRGBA8888Required, /*expectedFrameRate=*/null);
+            boolean isRGBA8888Required,
+            @NonNull Runnable onInvalidated) {
+        this(resolution, camera, isRGBA8888Required, /*expectedFrameRate=*/null, onInvalidated);
     }
 
     /**
      * Creates a new surface request with the given resolution, {@link Camera}, and an optional
      * expected frame rate.
+     *
      * @hide
      */
     @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
@@ -124,7 +130,8 @@
             @NonNull Size resolution,
             @NonNull CameraInternal camera,
             boolean isRGBA8888Required,
-            @Nullable Range<Integer> expectedFrameRate) {
+            @Nullable Range<Integer> expectedFrameRate,
+            @NonNull Runnable onInvalidated) {
         super();
         mResolution = resolution;
         mCamera = camera;
@@ -244,6 +251,9 @@
         //    finished with the surface, so cancelling the surface future below will be a no-op.
         terminationFuture.addListener(() -> mSurfaceFuture.cancel(true),
                 CameraXExecutors.directExecutor());
+
+        mSurfaceRecreationCompleter = initialSurfaceRecreationCompleter(
+                CameraXExecutors.directExecutor(), onInvalidated);
     }
 
     /**
@@ -420,6 +430,72 @@
     }
 
     /**
+     * Sets a {@link Runnable} that handles the situation where {@link Surface} is no longer valid
+     * and triggers the process to request a new {@link Surface}.
+     *
+     * @param executor Executor used to execute the {@code runnable}.
+     * @param runnable The code which will be run when {@link Surface} is no longer valid.
+     */
+    private CallbackToFutureAdapter.Completer<Void> initialSurfaceRecreationCompleter(
+            @NonNull Executor executor, @NonNull Runnable runnable) {
+        AtomicReference<CallbackToFutureAdapter.Completer<Void>> completerRef =
+                new AtomicReference<>(null);
+        final ListenableFuture<Void> future = CallbackToFutureAdapter.getFuture(completer -> {
+            completerRef.set(completer);
+            return "SurfaceRequest-surface-recreation(" + SurfaceRequest.this.hashCode() + ")";
+        });
+
+        Futures.addCallback(future, new FutureCallback<Void>() {
+            @Override
+            public void onSuccess(@Nullable Void result) {
+                runnable.run();
+            }
+
+            @Override
+            public void onFailure(@NonNull Throwable t) {
+                // Do nothing
+            }
+        }, executor);
+
+        return Preconditions.checkNotNull(completerRef.get());
+    }
+
+    /**
+     * Invalidate the previously provided {@link Surface} to provide a new {@link Surface}.
+     *
+     * <p>Call this method to inform the surface requester that the previously provided
+     * {@link Surface} is no longer valid (e.g. when the SurfaceView destroys its surface due to
+     * page being slid out in ViewPager2) and should re-send a {@link SurfaceRequest} to obtain a
+     * new {@link Surface}.
+     *
+     * <p>Calling this method will cause the camera to be reconfigured. The app should call this
+     * method when the surface provider is ready to provide a new {@link Surface}. (e.g. a
+     * SurfaceView's surface is created when its window is visible.)
+     *
+     * <p>If the provided {@link Surface} was already invalidated, invoking this method will return
+     * {@code false}, and will have no effect. The surface requester will not be notified again, so
+     * there will not be another {@link SurfaceRequest}.
+     *
+     * <p>Calling this method without {@link #provideSurface(Surface, Executor, Consumer)}
+     * (regardless of whether @link #willNotProvideSurface()} has been called) will still trigger
+     * the surface requester to re-send a {@link SurfaceRequest}.
+     *
+     * <p>Since calling this method also means that the {@link SurfaceRequest} will not be
+     * fulfilled, if the {@link SurfaceRequest} is not completed, it will be completed as if
+     * calling {@link #willNotProvideSurface()}.
+     *
+     * @return true if the provided {@link Surface} is invalidated or false if it was already
+     * invalidated.
+     *
+     * @hide
+     */
+    @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
+    public boolean invalidate() {
+        willNotProvideSurface();
+        return mSurfaceRecreationCompleter.set(null);
+    }
+
+    /**
      * Adds a listener to be informed when the camera cancels the surface request.
      *
      * <p>A surface request may be cancelled by the camera if the surface is no longer required.

diff --git a/camera/camera-core/src/main/java/androidx/camera/core/imagecapture/CaptureNode.java b/camera/camera-core/src/main/java/androidx/camera/core/imagecapture/CaptureNode.java
index 3199bcb..07e2fd7 100644
--- a/camera/camera-core/src/main/java/androidx/camera/core/imagecapture/CaptureNode.java
+++ b/camera/camera-core/src/main/java/androidx/camera/core/imagecapture/CaptureNode.java

@@ -29,6 +29,7 @@
 
 import androidx.annotation.MainThread;
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
 import androidx.annotation.VisibleForTesting;
 import androidx.camera.core.ForwardingImageProxy;
@@ -56,7 +57,6 @@
  *
  * <p>It's also responsible for managing the {@link ImageReaderProxy}. It makes sure that the
  * queue is not overflowed.
- *
  */
 @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
 class CaptureNode implements Node<CaptureNode.In, CaptureNode.Out> {
@@ -72,13 +72,18 @@
     private final Set<ImageProxy> mPendingImages = new HashSet<>();
     private ProcessingRequest mCurrentRequest = null;
 
+    @Nullable
     SafeCloseImageReaderProxy mSafeCloseImageReaderProxy;
+    @Nullable
     private Out mOutputEdge;
+    @Nullable
     private In mInputEdge;
 
     @NonNull
     @Override
     public Out transform(@NonNull In inputEdge) {
+        checkState(mInputEdge == null && mSafeCloseImageReaderProxy == null,
+                "CaptureNode does not support recreation yet.");
         mInputEdge = inputEdge;
         Size size = inputEdge.getSize();
         int format = inputEdge.getFormat();
@@ -127,7 +132,7 @@
         }
 
         // Send the image downstream.
-        mOutputEdge.getImageEdge().accept(imageProxy);
+        requireNonNull(mOutputEdge).getImageEdge().accept(imageProxy);
     }
 
     @VisibleForTesting
@@ -146,7 +151,7 @@
         mPendingStageIds.addAll(request.getStageIds());
 
         // Send the request downstream.
-        mOutputEdge.getRequestEdge().accept(request);
+        requireNonNull(mOutputEdge).getRequestEdge().accept(request);
 
         // Match pending images and send them downstream.
         for (ImageProxy imageProxy : mPendingImages) {
@@ -159,18 +164,23 @@
     @Override
     public void release() {
         checkMainThread();
-        if (mSafeCloseImageReaderProxy != null) {
-            mSafeCloseImageReaderProxy.safeClose();
-        }
-        if (mInputEdge != null) {
-            mInputEdge.closeSurface();
-        }
+        releaseInputResources(requireNonNull(mInputEdge),
+                requireNonNull(mSafeCloseImageReaderProxy));
+    }
+
+    private void releaseInputResources(@NonNull CaptureNode.In inputEdge,
+            @NonNull SafeCloseImageReaderProxy imageReader) {
+        inputEdge.getSurface().close();
+        // Wait for the termination to close the ImageReader or the Surface may be released
+        // prematurely before it can be used by camera2.
+        inputEdge.getSurface().getTerminationFuture().addListener(
+                imageReader::safeClose, mainThreadExecutor());
     }
 
     @VisibleForTesting
     @NonNull
     In getInputEdge() {
-        return mInputEdge;
+        return requireNonNull(mInputEdge);
     }
 
     @MainThread
@@ -230,10 +240,6 @@
             mSurface = new ImmediateSurface(surface);
         }
 
-        void closeSurface() {
-            mSurface.close();
-        }
-
         /**
          * Edge that accepts image metadata.
          *

diff --git a/camera/camera-core/src/main/java/androidx/camera/core/imagecapture/RequestWithCallback.java b/camera/camera-core/src/main/java/androidx/camera/core/imagecapture/RequestWithCallback.java
index e9af56a..c9816f5 100644
--- a/camera/camera-core/src/main/java/androidx/camera/core/imagecapture/RequestWithCallback.java
+++ b/camera/camera-core/src/main/java/androidx/camera/core/imagecapture/RequestWithCallback.java

@@ -42,21 +42,29 @@
 class RequestWithCallback implements TakePictureCallback {
 
     private final TakePictureRequest mTakePictureRequest;
+    private final TakePictureRequest.RetryControl mRetryControl;
     private final ListenableFuture<Void> mCaptureFuture;
+    private final ListenableFuture<Void> mCompleteFuture;
     private CallbackToFutureAdapter.Completer<Void> mCaptureCompleter;
-    // Tombstone flag that indicates that this callback should not be invoked anymore.
-    private boolean mIsComplete = false;
+    private CallbackToFutureAdapter.Completer<Void> mCompleteCompleter;
     // Flag tracks if the request has been aborted by the UseCase. Once aborted, this class stops
     // propagating callbacks to the app.
     private boolean mIsAborted = false;
 
-    RequestWithCallback(@NonNull TakePictureRequest takePictureRequest) {
+    RequestWithCallback(@NonNull TakePictureRequest takePictureRequest,
+            @NonNull TakePictureRequest.RetryControl retryControl) {
         mTakePictureRequest = takePictureRequest;
+        mRetryControl = retryControl;
         mCaptureFuture = CallbackToFutureAdapter.getFuture(
                 completer -> {
                     mCaptureCompleter = completer;
                     return "CaptureCompleteFuture";
                 });
+        mCompleteFuture = CallbackToFutureAdapter.getFuture(
+                completer -> {
+                    mCompleteCompleter = completer;
+                    return "RequestCompleteFuture";
+                });
     }
 
     @MainThread
@@ -98,7 +106,6 @@
         mTakePictureRequest.onResult(imageProxy);
     }
 
-
     @MainThread
     @Override
     public void onProcessFailure(@NonNull ImageCaptureException imageCaptureException) {
@@ -125,19 +132,35 @@
             // Fail silently if the request has been aborted.
             return;
         }
+        if (mTakePictureRequest.decrementRetryCounter()) {
+            mRetryControl.retryRequest(mTakePictureRequest);
+        } else {
+            onFailure(imageCaptureException);
+        }
         markComplete();
         mCaptureCompleter.set(null);
+    }
 
-        // TODO(b/242683221): Add retry logic.
+    @MainThread
+    void abortAndSendErrorToApp(@NonNull ImageCaptureException imageCaptureException) {
+        checkMainThread();
+        abort();
         onFailure(imageCaptureException);
     }
 
     @MainThread
-    void abort(@NonNull ImageCaptureException imageCaptureException) {
+    void abortSilentlyAndRetry() {
+        checkMainThread();
+        abort();
+        mRetryControl.retryRequest(mTakePictureRequest);
+    }
+
+    @MainThread
+    private void abort() {
         checkMainThread();
         mIsAborted = true;
         mCaptureCompleter.set(null);
-        onFailure(imageCaptureException);
+        mCompleteCompleter.set(null);
     }
 
     /**
@@ -152,14 +175,26 @@
         return mCaptureFuture;
     }
 
+    /**
+     * Gets a {@link ListenableFuture} that finishes when the capture is completed.
+     *
+     * <p>A request is completed when it gets either a result or an unrecoverable error.
+     */
+    @MainThread
+    @NonNull
+    ListenableFuture<Void> getCompleteFuture() {
+        checkMainThread();
+        return mCompleteFuture;
+    }
+
     private void checkOnImageCaptured() {
         checkState(mCaptureFuture.isDone(),
                 "onImageCaptured() must be called before onFinalResult()");
     }
 
     private void markComplete() {
-        checkState(!mIsComplete, "The callback can only complete once.");
-        mIsComplete = true;
+        checkState(!mCompleteFuture.isDone(), "The callback can only complete once.");
+        mCompleteCompleter.set(null);
     }
 
     @MainThread

diff --git a/camera/camera-core/src/main/java/androidx/camera/core/imagecapture/TakePictureManager.java b/camera/camera-core/src/main/java/androidx/camera/core/imagecapture/TakePictureManager.java
index 2ecfcd5..49f346b 100644
--- a/camera/camera-core/src/main/java/androidx/camera/core/imagecapture/TakePictureManager.java
+++ b/camera/camera-core/src/main/java/androidx/camera/core/imagecapture/TakePictureManager.java

@@ -44,7 +44,9 @@
 import com.google.common.util.concurrent.ListenableFuture;
 
 import java.util.ArrayDeque;
+import java.util.ArrayList;
 import java.util.Deque;
+import java.util.List;
 
 /**
  * Manages {@link ImageCapture#takePicture} calls.
@@ -61,34 +63,43 @@
  * <p>The thread safety is guaranteed by using the main thread.
  */
 @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
-public class TakePictureManager implements OnImageCloseListener {
+public class TakePictureManager implements OnImageCloseListener, TakePictureRequest.RetryControl {
 
     private static final String TAG = "TakePictureManager";
 
     // Queue of new requests that have not been sent to the pipeline/camera.
     @VisibleForTesting
     final Deque<TakePictureRequest> mNewRequests = new ArrayDeque<>();
-    final ImagePipeline mImagePipeline;
     final ImageCaptureControl mImageCaptureControl;
+    ImagePipeline mImagePipeline;
 
-    // The current request being processed by camera. Null if the camera is idle.
-    @VisibleForTesting
+    // The current request being processed by the camera. Only one request can be processed by
+    // the camera at the same time. Null if the camera is idle.
     @Nullable
-    RequestWithCallback mInFlightRequest;
+    private RequestWithCallback mCapturingRequest;
+    // The current requests that have not received a result or an error.
+    private final List<RequestWithCallback> mIncompleteRequests;
 
     // Once paused, the class waits until the class is resumed to handle new requests.
     boolean mPaused = false;
 
     /**
      * @param imageCaptureControl for controlling {@link ImageCapture}
-     * @param imagePipeline       for building capture requests and post-processing camera output.
      */
     @MainThread
-    public TakePictureManager(
-            @NonNull ImageCaptureControl imageCaptureControl,
-            @NonNull ImagePipeline imagePipeline) {
+    public TakePictureManager(@NonNull ImageCaptureControl imageCaptureControl) {
         checkMainThread();
         mImageCaptureControl = imageCaptureControl;
+        mIncompleteRequests = new ArrayList<>();
+    }
+
+    /**
+     * Sets the {@link ImagePipeline} for building capture requests and post-processing camera
+     * output.
+     */
+    @MainThread
+    public void setImagePipeline(@NonNull ImagePipeline imagePipeline) {
+        checkMainThread();
         mImagePipeline = imagePipeline;
         mImagePipeline.setOnImageCloseListener(this);
     }
@@ -105,6 +116,14 @@
         issueNextRequest();
     }
 
+    @MainThread
+    @Override
+    public void retryRequest(@NonNull TakePictureRequest request) {
+        checkMainThread();
+        // Insert the request to the front of the queue.
+        mNewRequests.addFirst(request);
+    }
+
     /**
      * Pauses sending request to camera.
      */
@@ -112,8 +131,11 @@
     public void pause() {
         checkMainThread();
         mPaused = true;
-        // TODO(b/242683221): increment the retry counter on the in-flight request. The
-        //  mInFlightRequest may fail due to the pausing and need one more retry.
+
+        // Always retry because the camera may not send an error callback during the reset.
+        if (mCapturingRequest != null) {
+            mCapturingRequest.abortSilentlyAndRetry();
+        }
     }
 
     /**
@@ -142,9 +164,11 @@
         mNewRequests.clear();
 
         // Abort the in-flight request after clearing the pending requests.
-        if (mInFlightRequest != null) {
-            // TODO: optimize the performance by aborting early in CaptureNode and BundlingNode
-            mInFlightRequest.abort(exception);
+        // Snapshot to avoid concurrent modification with the removal in getCompleteFuture().
+        List<RequestWithCallback> requestsSnapshot = new ArrayList<>(mIncompleteRequests);
+        for (RequestWithCallback request : requestsSnapshot) {
+            // TODO: optimize the performance by not processing aborted requests.
+            request.abortAndSendErrorToApp(exception);
         }
     }
 
@@ -155,7 +179,7 @@
     void issueNextRequest() {
         checkMainThread();
         Log.d(TAG, "Issue the next TakePictureRequest.");
-        if (hasInFlightRequest()) {
+        if (hasCapturingRequest()) {
             Log.d(TAG, "There is already a request in-flight.");
             return;
         }
@@ -173,8 +197,8 @@
             return;
         }
 
-        RequestWithCallback requestWithCallback = new RequestWithCallback(request);
-        trackCurrentRequest(requestWithCallback);
+        RequestWithCallback requestWithCallback = new RequestWithCallback(request, this);
+        trackCurrentRequests(requestWithCallback);
 
         // Send requests.
         Pair<CameraRequest, ProcessingRequest> requests =
@@ -187,13 +211,21 @@
     /**
      * Waits for the request to finish before issuing the next.
      */
-    private void trackCurrentRequest(@NonNull RequestWithCallback requestWithCallback) {
-        checkState(!hasInFlightRequest());
-        mInFlightRequest = requestWithCallback;
-        mInFlightRequest.getCaptureFuture().addListener(() -> {
-            mInFlightRequest = null;
+    private void trackCurrentRequests(@NonNull RequestWithCallback requestWithCallback) {
+        checkState(!hasCapturingRequest());
+        mCapturingRequest = requestWithCallback;
+
+        // Waits for the capture to finish before issuing the next.
+        mCapturingRequest.getCaptureFuture().addListener(() -> {
+            mCapturingRequest = null;
             issueNextRequest();
         }, directExecutor());
+
+        // Track all incomplete requests so we can abort them when UseCase is detached.
+        mIncompleteRequests.add(requestWithCallback);
+        requestWithCallback.getCompleteFuture().addListener(() -> {
+            mIncompleteRequests.remove(requestWithCallback);
+        }, directExecutor());
     }
 
     /**
@@ -232,8 +264,19 @@
     }
 
     @VisibleForTesting
-    boolean hasInFlightRequest() {
-        return mInFlightRequest != null;
+    boolean hasCapturingRequest() {
+        return mCapturingRequest != null;
+    }
+
+    @VisibleForTesting
+    List<RequestWithCallback> getIncompleteRequests() {
+        return mIncompleteRequests;
+    }
+
+    @VisibleForTesting
+    @NonNull
+    public ImagePipeline getImagePipeline() {
+        return mImagePipeline;
     }
 
     @Override

diff --git a/camera/camera-core/src/main/java/androidx/camera/core/imagecapture/TakePictureRequest.java b/camera/camera-core/src/main/java/androidx/camera/core/imagecapture/TakePictureRequest.java
index f77c182..c8e398c 100644
--- a/camera/camera-core/src/main/java/androidx/camera/core/imagecapture/TakePictureRequest.java
+++ b/camera/camera-core/src/main/java/androidx/camera/core/imagecapture/TakePictureRequest.java

@@ -16,6 +16,7 @@
 
 package androidx.camera.core.imagecapture;
 
+import static androidx.camera.core.impl.utils.Threads.checkMainThread;
 import static androidx.core.util.Preconditions.checkArgument;
 
 import static java.util.Objects.requireNonNull;
@@ -25,9 +26,11 @@
 import android.os.Build;
 
 import androidx.annotation.IntRange;
+import androidx.annotation.MainThread;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
+import androidx.annotation.VisibleForTesting;
 import androidx.camera.core.ImageCapture;
 import androidx.camera.core.ImageCaptureException;
 import androidx.camera.core.ImageProxy;
@@ -35,6 +38,7 @@
 import androidx.camera.core.impl.ImageCaptureConfig;
 import androidx.camera.core.impl.ImageOutputConfig;
 import androidx.camera.core.impl.SessionConfig;
+import androidx.camera.core.internal.compat.workaround.CaptureFailedRetryEnabler;
 
 import com.google.auto.value.AutoValue;
 
@@ -51,7 +55,12 @@
 @AutoValue
 public abstract class TakePictureRequest {
 
-    // TODO(b/242683221): add a retry counter.
+    /**
+     * By default, ImageCapture does not retry requests. For some problematic devices, the
+     * capture request can become success after retrying. The allowed retry count will be
+     * provided by the {@link CaptureFailedRetryEnabler}.
+     */
+    private int mRemainingRetires = new CaptureFailedRetryEnabler().getRetryCount();
 
     /**
      * Gets the callback {@link Executor} provided by the app.
@@ -123,6 +132,43 @@
     abstract List<CameraCaptureCallback> getSessionConfigCameraCaptureCallbacks();
 
     /**
+     * Decrements retry counter.
+     *
+     * @return true if there is still remaining retries at the time of calling. In that case, the
+     * request should be retried. False when there is no retry left. The caller needs to fail the
+     * request.
+     */
+    @MainThread
+    boolean decrementRetryCounter() {
+        checkMainThread();
+        if (mRemainingRetires > 0) {
+            mRemainingRetires--;
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * Increments retry counter.
+     */
+    @MainThread
+    void incrementRetryCounter() {
+        checkMainThread();
+        mRemainingRetires++;
+    }
+
+    /**
+     * Gets the current retry count for testing.
+     */
+    @MainThread
+    @VisibleForTesting
+    int getRemainingRetries() {
+        checkMainThread();
+        return mRemainingRetires;
+    }
+
+    /**
      * Delivers {@link ImageCaptureException} to the app.
      */
     void onError(@NonNull ImageCaptureException imageCaptureException) {
@@ -177,4 +223,17 @@
                 onDiskCallback, outputFileOptions, cropRect, sensorToBufferTransform,
                 rotationDegrees, jpegQuality, captureMode, sessionConfigCameraCaptureCallbacks);
     }
+
+    /**
+     * Interface for retrying a {@link TakePictureRequest}.
+     */
+    interface RetryControl {
+
+        /**
+         * Retries the given {@link TakePictureRequest}.
+         *
+         * <p>The request should be injected to the front of the queue.
+         */
+        void retryRequest(@NonNull TakePictureRequest takePictureRequest);
+    }
 }

diff --git a/camera/camera-core/src/main/java/androidx/camera/core/internal/compat/quirk/CaptureFailedRetryQuirk.java b/camera/camera-core/src/main/java/androidx/camera/core/internal/compat/quirk/CaptureFailedRetryQuirk.java
new file mode 100644
index 0000000..cd4f709
--- /dev/null
+++ b/camera/camera-core/src/main/java/androidx/camera/core/internal/compat/quirk/CaptureFailedRetryQuirk.java

@@ -0,0 +1,61 @@
+/*
+ * Copyright 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.camera.core.internal.compat.quirk;
+
+import android.os.Build;
+import android.util.Pair;
+
+import androidx.annotation.RequiresApi;
+import androidx.camera.core.impl.Quirk;
+import androidx.camera.core.internal.compat.workaround.CaptureFailedRetryEnabler;
+
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Locale;
+import java.util.Set;
+
+/**
+ * <p>QuirkSummary
+ *     Bug Id: 242683221
+ *     Description: Quirk that allows ImageCapture to retry once when encountering capture
+ *     failures. On Samsung sm-g981u1, image capture requests might fail when continuously taking
+ *     multiple pictures. The capture failure might be related to some problems in the CamX
+ *     pipeline. Re-issue the original capture request to retry can workaround the issue.
+ *     Device(s): Samsung sm-g981u1
+ *     @see CaptureFailedRetryEnabler
+ */
+@RequiresApi(21) // TODO(b/200306659): Remove and replace with annotation on package-info.java
+public class CaptureFailedRetryQuirk implements Quirk {
+
+    private static final Set<Pair<String, String>> FAILED_RETRY_ALLOW_LIST = new HashSet<>(
+            Collections.singletonList(Pair.create("SAMSUNG", "SM-G981U1")));
+
+    static boolean load() {
+        String brand = Build.BRAND.toUpperCase(Locale.US);
+        String model = Build.MODEL.toUpperCase(Locale.US);
+
+        return FAILED_RETRY_ALLOW_LIST.contains(Pair.create(brand, model));
+    }
+
+    /**
+     * Returns the count which the image capture request can be retried. Currently returns 1
+     * always if the quirk is loaded.
+     */
+    public int getRetryCount() {
+        return 1;
+    }
+}

diff --git a/camera/camera-core/src/main/java/androidx/camera/core/internal/compat/quirk/DeviceQuirksLoader.java b/camera/camera-core/src/main/java/androidx/camera/core/internal/compat/quirk/DeviceQuirksLoader.java
index 79ddcbb..afcaf8e 100644
--- a/camera/camera-core/src/main/java/androidx/camera/core/internal/compat/quirk/DeviceQuirksLoader.java
+++ b/camera/camera-core/src/main/java/androidx/camera/core/internal/compat/quirk/DeviceQuirksLoader.java

@@ -46,6 +46,9 @@
         if (SurfaceOrderQuirk.load()) {
             quirks.add(new SurfaceOrderQuirk());
         }
+        if (CaptureFailedRetryQuirk.load()) {
+            quirks.add(new CaptureFailedRetryQuirk());
+        }
 
         return quirks;
     }

diff --git a/camera/camera-core/src/main/java/androidx/camera/core/internal/compat/workaround/CaptureFailedRetryEnabler.java b/camera/camera-core/src/main/java/androidx/camera/core/internal/compat/workaround/CaptureFailedRetryEnabler.java
new file mode 100644
index 0000000..e1b88953
--- /dev/null
+++ b/camera/camera-core/src/main/java/androidx/camera/core/internal/compat/workaround/CaptureFailedRetryEnabler.java

@@ -0,0 +1,42 @@
+/*
+ * Copyright 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.camera.core.internal.compat.workaround;
+
+import androidx.annotation.RequiresApi;
+import androidx.camera.core.ImageCapture;
+import androidx.camera.core.internal.compat.quirk.CaptureFailedRetryQuirk;
+import androidx.camera.core.internal.compat.quirk.DeviceQuirks;
+
+/**
+ * Workaround that allows the {@link ImageCapture} to retry the same capture request once when
+ * encountering capture failures.
+ *
+ * @see CaptureFailedRetryQuirk
+ */
+@RequiresApi(21) // TODO(b/200306659): Remove and replace with annotation on package-info.java
+public class CaptureFailedRetryEnabler {
+
+    private final CaptureFailedRetryQuirk mCaptureFailedRetryQuirk = DeviceQuirks.get(
+            CaptureFailedRetryQuirk.class);
+
+    /**
+     * Returns the count which the image capture request can be retried.
+     */
+    public int getRetryCount() {
+        return mCaptureFailedRetryQuirk == null ? 0 : mCaptureFailedRetryQuirk.getRetryCount();
+    }
+}

diff --git a/camera/camera-core/src/main/java/androidx/camera/core/processing/SettableSurface.java b/camera/camera-core/src/main/java/androidx/camera/core/processing/SettableSurface.java
index dad0080..6fae56c 100644
--- a/camera/camera-core/src/main/java/androidx/camera/core/processing/SettableSurface.java
+++ b/camera/camera-core/src/main/java/androidx/camera/core/processing/SettableSurface.java

@@ -94,6 +94,9 @@
     @Nullable
     private SurfaceRequest mProviderSurfaceRequest;
 
+    @NonNull
+    private final Runnable mOnInvalidated;
+
     /**
      * Please see the getters to understand the parameters.
      */
@@ -105,7 +108,8 @@
             boolean hasEmbeddedTransform,
             @NonNull Rect cropRect,
             int rotationDegrees,
-            boolean mirroring) {
+            boolean mirroring,
+            @NonNull Runnable onInvalidated) {
         super(size, format);
         mTargets = targets;
         mSensorToBufferTransform = sensorToBufferTransform;
@@ -113,6 +117,7 @@
         mCropRect = cropRect;
         mRotationDegrees = rotationDegrees;
         mMirroring = mirroring;
+        mOnInvalidated = onInvalidated;
         mSurfaceFuture = CallbackToFutureAdapter.getFuture(
                 completer -> {
                     mCompleter = completer;
@@ -223,8 +228,8 @@
             @Nullable Range<Integer> expectedFpsRange) {
         checkMainThread();
         // TODO(b/238230154) figure out how to support HDR.
-        SurfaceRequest surfaceRequest = new SurfaceRequest(getSize(), cameraInternal, true,
-                expectedFpsRange);
+        SurfaceRequest surfaceRequest = new SurfaceRequest(getSize(), cameraInternal, false,
+                expectedFpsRange, this::invalidate);
         try {
             setProvider(surfaceRequest.getDeferrableSurface());
         } catch (SurfaceClosedException e) {
@@ -282,6 +287,22 @@
     }
 
     /**
+     * Invalidate the previously provided {@link Surface} to provide a new one.
+     *
+     * Calls to inform that the {@link Surface} previously provided via
+     * {@link #createSurfaceRequest(CameraInternal)} or
+     * {@link #createSurfaceRequest(CameraInternal, Range)} is no longer valid and should reacquire
+     * a new {@link Surface}.
+     *
+     * <p>The method <strong>must</strong> be called when the surface provider is ready to provide
+     * a new {@link Surface}. (e.g. SurfaceView's surface is created when its window is visible.)
+     */
+    public void invalidate() {
+        close();
+        mOnInvalidated.run();
+    }
+
+    /**
      * Closes the {@link DeferrableSurface} and notifies linked objects for the closure.
      */
     @Override

diff --git a/camera/camera-core/src/main/java/androidx/camera/core/processing/SurfaceProcessorNode.java b/camera/camera-core/src/main/java/androidx/camera/core/processing/SurfaceProcessorNode.java
index fd1e4bcf8..6007535 100644
--- a/camera/camera-core/src/main/java/androidx/camera/core/processing/SurfaceProcessorNode.java
+++ b/camera/camera-core/src/main/java/androidx/camera/core/processing/SurfaceProcessorNode.java

@@ -106,6 +106,11 @@
 
     @NonNull
     private SettableSurface createOutputSurface(@NonNull SettableSurface inputSurface) {
+        // TODO: Can be improved by only restarting part of the pipeline. e.g. only update the
+        //  output Surface (between Effect/App), and still use the same input Surface (between
+        //  Camera/Effect). It's just simpler for now.
+        final Runnable >
+
         SettableSurface outputSurface;
         switch (mGlTransformOptions) {
             case APPLY_CROP_ROTATE_AND_MIRRORING:
@@ -135,7 +140,8 @@
                         /*hasEmbeddedTransform=*/false,
                         sizeToRect(rotatedCroppedSize),
                         /*rotationDegrees=*/0,
-                        /*mirroring=*/false);
+                        /*mirroring=*/false,
+                        onSurfaceInvalidated);
                 break;
             case USE_SURFACE_TEXTURE_TRANSFORM:
                 // No transform output as placeholder.
@@ -148,7 +154,8 @@
                         /*hasEmbeddedTransform=*/false,
                         inputSurface.getCropRect(),
                         inputSurface.getRotationDegrees(),
-                        inputSurface.getMirroring());
+                        inputSurface.getMirroring(),
+                        onSurfaceInvalidated);
                 break;
             default:
                 throw new AssertionError("Unknown GlTransformOptions: " + mGlTransformOptions);

diff --git a/camera/camera-core/src/test/java/androidx/camera/core/ImageCaptureTest.kt b/camera/camera-core/src/test/java/androidx/camera/core/ImageCaptureTest.kt
index a7f51e4..1ef77cb 100644
--- a/camera/camera-core/src/test/java/androidx/camera/core/ImageCaptureTest.kt
+++ b/camera/camera-core/src/test/java/androidx/camera/core/ImageCaptureTest.kt

@@ -192,13 +192,32 @@
     }
 
     @Test
-    fun processingPipelineOffByDefault() {
-        assertThat(
-            bindImageCapture(
-                useProcessingPipeline = false,
-                bufferFormat = ImageFormat.JPEG,
-            ).isProcessingPipelineEnabled
-        ).isFalse()
+    fun onError_surfaceIsRecreated() {
+        // Arrange: create ImageCapture and get the Surface
+        val imageCapture = bindImageCapture(
+            bufferFormat = ImageFormat.JPEG,
+        )
+        val oldSurface = imageCapture.sessionConfig.surfaces.single().surface.get()
+        assertTakePictureManagerHasTheSameSurface(imageCapture)
+
+        // Act: invoke onError callback.
+        imageCapture.sessionConfig.errorListeners.single().onError(
+            imageCapture.sessionConfig,
+            SessionConfig.SessionError.SESSION_ERROR_SURFACE_NEEDS_RESET
+        )
+
+        // Assert: the surface has been recreated.
+        val newSurface = imageCapture.sessionConfig.surfaces.single().surface.get()
+        assertThat(newSurface).isNotEqualTo(oldSurface)
+        assertTakePictureManagerHasTheSameSurface(imageCapture)
+    }
+
+    private fun assertTakePictureManagerHasTheSameSurface(imageCapture: ImageCapture) {
+        val takePictureManagerSurface =
+            imageCapture.takePictureManager.imagePipeline.createSessionConfigBuilder()
+                .build().surfaces.single().surface.get()
+        val useCaseSurface = imageCapture.sessionConfig.surfaces.single().surface.get()
+        assertThat(takePictureManagerSurface).isEqualTo(useCaseSurface)
     }
 
     @Test

diff --git a/camera/camera-core/src/test/java/androidx/camera/core/imagecapture/CaptureNodeTest.kt b/camera/camera-core/src/test/java/androidx/camera/core/imagecapture/CaptureNodeTest.kt
index 151ab67..c783150 100644
--- a/camera/camera-core/src/test/java/androidx/camera/core/imagecapture/CaptureNodeTest.kt
+++ b/camera/camera-core/src/test/java/androidx/camera/core/imagecapture/CaptureNodeTest.kt

@@ -18,15 +18,18 @@
 
 import android.graphics.ImageFormat
 import android.os.Build
+import android.os.Looper.getMainLooper
 import android.util.Size
 import androidx.camera.core.ImageProxy
 import androidx.camera.core.imagecapture.Utils.createCaptureBundle
 import androidx.camera.core.imagecapture.Utils.createFakeImage
 import com.google.common.truth.Truth.assertThat
+import org.junit.After
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.RobolectricTestRunner
+import org.robolectric.Shadows.shadowOf
 import org.robolectric.annotation.Config
 import org.robolectric.annotation.internal.DoNotInstrument
 
@@ -58,10 +61,32 @@
         }
     }
 
+    @After
+    fun tearDown() {
+        captureNode.release()
+    }
+
+    @Test
+    fun release_imageReaderNotClosedUntilTermination() {
+        // Arrange: increment the DeferrableSurface's use count to prevent it from being terminated.
+        captureNode.inputEdge.surface.incrementUseCount()
+        // Act: release.
+        captureNode.release()
+        shadowOf(getMainLooper()).idle()
+        // Assert: ImageReader is not closed.
+        assertThat(captureNode.mSafeCloseImageReaderProxy!!.isClosed).isFalse()
+
+        // Act: decrease the use count. Now the DeferrableSurface will terminate.
+        captureNode.inputEdge.surface.decrementUseCount()
+        shadowOf(getMainLooper()).idle()
+        // Assert: ImageReader is closed.
+        assertThat(captureNode.mSafeCloseImageReaderProxy!!.isClosed).isTrue()
+    }
+
     @Test
     fun transform_verifyInputSurface() {
         assertThat(captureNodeIn.surface.surface.get())
-            .isEqualTo(captureNode.mSafeCloseImageReaderProxy.surface)
+            .isEqualTo(captureNode.mSafeCloseImageReaderProxy!!.surface)
     }
 
     @Test

diff --git a/camera/camera-core/src/test/java/androidx/camera/core/imagecapture/FakeImageCaptureControl.kt b/camera/camera-core/src/test/java/androidx/camera/core/imagecapture/FakeImageCaptureControl.kt
index b1fe7d6c..26bba9a 100644
--- a/camera/camera-core/src/test/java/androidx/camera/core/imagecapture/FakeImageCaptureControl.kt
+++ b/camera/camera-core/src/test/java/androidx/camera/core/imagecapture/FakeImageCaptureControl.kt

@@ -18,6 +18,7 @@
 
 import androidx.camera.core.impl.CaptureConfig
 import androidx.camera.core.impl.utils.futures.Futures
+import androidx.concurrent.futures.CallbackToFutureAdapter
 import com.google.common.util.concurrent.ListenableFuture
 
 /**
@@ -25,9 +26,21 @@
  */
 class FakeImageCaptureControl : ImageCaptureControl {
 
+    companion object {
+        // By default, this fake object returns an immediate successful result.
+        private val IMMEDIATE_RESULT: ListenableFuture<Void> = Futures.immediateFuture(null)
+    }
+
     val actions = arrayListOf<Action>()
     var latestCaptureConfigs: List<CaptureConfig?> = arrayListOf()
-    var response: ListenableFuture<Void> = Futures.immediateFuture(null)
+
+    // Flip this flag to return a custom result using pendingResultCompleter.
+    var shouldUsePendingResult = false
+    lateinit var pendingResultCompleter: CallbackToFutureAdapter.Completer<Void>
+    var pendingResult = CallbackToFutureAdapter.getFuture { completer ->
+        pendingResultCompleter = completer
+        "FakeImageCaptureControl's pendingResult"
+    }
 
     override fun lockFlashMode() {
         actions.add(Action.LOCK_FLASH)
@@ -42,7 +55,10 @@
     ): ListenableFuture<Void> {
         actions.add(Action.SUBMIT_REQUESTS)
         latestCaptureConfigs = captureConfigs
-        return response
+        if (shouldUsePendingResult) {
+            return pendingResult
+        }
+        return IMMEDIATE_RESULT
     }
 
     enum class Action {

diff --git a/room/room-compiler/src/test/test-data/common/input/RoomDatabaseKt.java b/camera/camera-core/src/test/java/androidx/camera/core/imagecapture/FakeRetryControl.kt
similarity index 60%
copy from room/room-compiler/src/test/test-data/common/input/RoomDatabaseKt.java
copy to camera/camera-core/src/test/java/androidx/camera/core/imagecapture/FakeRetryControl.kt
index 4e95b3d..e58d031 100644
--- a/room/room-compiler/src/test/test-data/common/input/RoomDatabaseKt.java
+++ b/camera/camera-core/src/test/java/androidx/camera/core/imagecapture/FakeRetryControl.kt

@@ -14,15 +14,18 @@
  * limitations under the License.
  */
 
-package androidx.room;
+package androidx.camera.core.imagecapture
 
-import kotlin.coroutines.Continuation;
-import kotlin.jvm.functions.Function1;
+import androidx.camera.core.imagecapture.TakePictureRequest.RetryControl
 
-public class RoomDatabaseKt {
-    public static final <R> Object withTransaction(RoomDatabase db,
-            Function1<? super Continuation<? super R>, ? extends Object> block,
-            Continuation<? super R> cont) {
-        return null;
+/**
+ * Fake [RetryControl] that keeps track of the retried request.
+ */
+class FakeRetryControl : RetryControl {
+
+    var retriedRequest: TakePictureRequest? = null
+
+    override fun retryRequest(takePictureRequest: TakePictureRequest) {
+        retriedRequest = takePictureRequest
     }
 }
\ No newline at end of file

diff --git a/camera/camera-core/src/test/java/androidx/camera/core/imagecapture/ImagePipelineTest.kt b/camera/camera-core/src/test/java/androidx/camera/core/imagecapture/ImagePipelineTest.kt
index a40665a..f2d3f38 100644
--- a/camera/camera-core/src/test/java/androidx/camera/core/imagecapture/ImagePipelineTest.kt
+++ b/camera/camera-core/src/test/java/androidx/camera/core/imagecapture/ImagePipelineTest.kt

@@ -291,7 +291,7 @@
         for (i in 0 until MAX_IMAGES) {
             val imageInfo = FakeImageInfo()
             imageReaderProxy.triggerImageAvailable(imageInfo.tagBundle, 0)
-            imagePipeline.captureNode.mSafeCloseImageReaderProxy.acquireNextImage()
+            imagePipeline.captureNode.mSafeCloseImageReaderProxy!!.acquireNextImage()
                 ?.let { images.add(it) }
         }
 

diff --git a/camera/camera-core/src/test/java/androidx/camera/core/imagecapture/RequestWithCallbackTest.kt b/camera/camera-core/src/test/java/androidx/camera/core/imagecapture/RequestWithCallbackTest.kt
index 8789904..f0b794e 100644
--- a/camera/camera-core/src/test/java/androidx/camera/core/imagecapture/RequestWithCallbackTest.kt
+++ b/camera/camera-core/src/test/java/androidx/camera/core/imagecapture/RequestWithCallbackTest.kt

@@ -46,6 +46,7 @@
     private lateinit var otherError: ImageCaptureException
     private lateinit var imageResult: ImageProxy
     private lateinit var fileResult: ImageCapture.OutputFileResults
+    private lateinit var retryControl: FakeRetryControl
 
     @Before
     fun setUp() {
@@ -53,15 +54,49 @@
         otherError = ImageCaptureException(ERROR_CAPTURE_FAILED, "", null)
         imageResult = FakeImageProxy(FakeImageInfo())
         fileResult = ImageCapture.OutputFileResults(null)
+        retryControl = FakeRetryControl()
+    }
+
+    @Test
+    fun failCaptureWithRemainingRetries_requestIsRetried() {
+        // Arrange: create a request the a retry counter of 1.
+        val request = FakeTakePictureRequest(FakeTakePictureRequest.Type.IN_MEMORY)
+        request.incrementRetryCounter()
+        assertThat(request.remainingRetries).isEqualTo(1)
+        val callback = RequestWithCallback(request, retryControl)
+
+        // Act.
+        callback.onCaptureFailure(otherError)
+        shadowOf(getMainLooper()).idle()
+
+        // Assert.
+        assertThat(retryControl.retriedRequest).isEqualTo(request)
+        assertThat(request.remainingRetries).isEqualTo(0)
+    }
+
+    @Test
+    fun failCaptureWithoutRemainingRetries_requestNotRetried() {
+        // Arrange: create a request the a retry counter of 0.
+        val request = FakeTakePictureRequest(FakeTakePictureRequest.Type.IN_MEMORY)
+        assertThat(request.remainingRetries).isEqualTo(0)
+        val callback = RequestWithCallback(request, retryControl)
+
+        // Act.
+        callback.onCaptureFailure(otherError)
+        shadowOf(getMainLooper()).idle()
+
+        // Assert.
+        assertThat(retryControl.retriedRequest).isNull()
+        assertThat(request.exceptionReceived).isEqualTo(otherError)
     }
 
     @Test
     fun abortRequestThenSendOtherErrors_receiveAbortError() {
         // Arrange.
         val request = FakeTakePictureRequest(FakeTakePictureRequest.Type.IN_MEMORY)
-        val callback = RequestWithCallback(request)
+        val callback = RequestWithCallback(request, retryControl)
         // Act.
-        callback.abort(abortError)
+        callback.abortAndSendErrorToApp(abortError)
         callback.onCaptureFailure(otherError)
         callback.onProcessFailure(otherError)
         shadowOf(getMainLooper()).idle()
@@ -73,7 +108,7 @@
     fun sendInMemoryResult_receiveResult() {
         // Arrange.
         val request = FakeTakePictureRequest(FakeTakePictureRequest.Type.IN_MEMORY)
-        val callback = RequestWithCallback(request)
+        val callback = RequestWithCallback(request, retryControl)
         // Act.
         callback.onImageCaptured()
         callback.onFinalResult(imageResult)
@@ -86,9 +121,9 @@
     fun abortRequestAndSendInMemoryResult_doNotReceiveResult() {
         // Arrange.
         val request = FakeTakePictureRequest(FakeTakePictureRequest.Type.IN_MEMORY)
-        val callback = RequestWithCallback(request)
+        val callback = RequestWithCallback(request, retryControl)
         // Act.
-        callback.abort(abortError)
+        callback.abortAndSendErrorToApp(abortError)
         callback.onFinalResult(imageResult)
         shadowOf(getMainLooper()).idle()
         // Assert.
@@ -99,7 +134,7 @@
     fun sendOnDiskResult_receiveResult() {
         // Arrange.
         val request = FakeTakePictureRequest(FakeTakePictureRequest.Type.ON_DISK)
-        val callback = RequestWithCallback(request)
+        val callback = RequestWithCallback(request, retryControl)
         // Act.
         callback.onImageCaptured()
         callback.onFinalResult(fileResult)
@@ -112,9 +147,9 @@
     fun abortRequestAndSendOnDiskResult_doNotReceiveResult() {
         // Arrange.
         val request = FakeTakePictureRequest(FakeTakePictureRequest.Type.ON_DISK)
-        val callback = RequestWithCallback(request)
+        val callback = RequestWithCallback(request, retryControl)
         // Act.
-        callback.abort(abortError)
+        callback.abortAndSendErrorToApp(abortError)
         callback.onFinalResult(imageResult)
         shadowOf(getMainLooper()).idle()
         // Assert.

diff --git a/camera/camera-core/src/test/java/androidx/camera/core/imagecapture/TakePictureManagerTest.kt b/camera/camera-core/src/test/java/androidx/camera/core/imagecapture/TakePictureManagerTest.kt
index 5335ee6..5ed2782 100644
--- a/camera/camera-core/src/test/java/androidx/camera/core/imagecapture/TakePictureManagerTest.kt
+++ b/camera/camera-core/src/test/java/androidx/camera/core/imagecapture/TakePictureManagerTest.kt

@@ -24,7 +24,6 @@
 import androidx.camera.core.ImageCapture.OutputFileResults
 import androidx.camera.core.ImageCaptureException
 import androidx.camera.core.impl.CaptureConfig
-import androidx.camera.core.impl.utils.futures.Futures
 import androidx.camera.testing.fakes.FakeImageInfo
 import androidx.camera.testing.fakes.FakeImageProxy
 import com.google.common.truth.Truth.assertThat
@@ -46,7 +45,9 @@
 
     private val imagePipeline = FakeImagePipeline()
     private val imageCaptureControl = FakeImageCaptureControl()
-    private val takePictureManager = TakePictureManager(imageCaptureControl, imagePipeline)
+    private val takePictureManager =
+        TakePictureManager(imageCaptureControl).also { it.setImagePipeline(imagePipeline) }
+    private val exception = ImageCaptureException(ImageCapture.ERROR_UNKNOWN, "", null)
 
     @After
     fun tearDown() {
@@ -54,14 +55,55 @@
     }
 
     @Test
-    fun abortRequests_receiveErrorCallback() {
+    fun pause_inFlightRequestRetried() {
+        // Arrange: create 2 requests and offer them to the manager.
+        imageCaptureControl.shouldUsePendingResult = true
+        val request1 = FakeTakePictureRequest(FakeTakePictureRequest.Type.IN_MEMORY)
+        val request2 = FakeTakePictureRequest(FakeTakePictureRequest.Type.IN_MEMORY)
+        takePictureManager.offerRequest(request1)
+        takePictureManager.offerRequest(request2)
+        assertThat(takePictureManager.mNewRequests).containsExactly(request2)
+
+        // Act: pause the manager.
+        takePictureManager.pause()
+        shadowOf(getMainLooper()).idle()
+
+        // Assert: the in-flight request is retried.
+        assertThat(takePictureManager.mNewRequests).containsExactly(request1, request2).inOrder()
+        assertThat(request1.remainingRetries).isEqualTo(0)
+    }
+
+    @Test
+    fun abortPostProcessingRequests_receiveErrorCallback() {
+        // Arrange: setup a request that is captured but not processed.
+        val request = FakeTakePictureRequest(FakeTakePictureRequest.Type.IN_MEMORY)
+        takePictureManager.offerRequest(request)
+        val processingRequest = imagePipeline.getProcessingRequest(request)
+        processingRequest.onImageCaptured()
+        shadowOf(getMainLooper()).idle()
+        // Verify the "captured, not processed" status.
+        assertThat(takePictureManager.hasCapturingRequest()).isFalse()
+        assertThat(takePictureManager.incompleteRequests[0].captureFuture.isDone).isTrue()
+        assertThat(takePictureManager.incompleteRequests[0].completeFuture.isDone).isFalse()
+
+        // Act: abort all requests.
+        takePictureManager.abortRequests()
+        shadowOf(getMainLooper()).idle()
+
+        // Assert: the user has received a CAMERA_CLOSED error.
+        assertThat((request.exceptionReceived as ImageCaptureException).imageCaptureError)
+            .isEqualTo(ERROR_CAMERA_CLOSED)
+    }
+
+    @Test
+    fun abortNewRequests_receiveErrorCallback() {
         // Arrange: send 2 request.
         val request1 = FakeTakePictureRequest(FakeTakePictureRequest.Type.IN_MEMORY)
         val request2 = FakeTakePictureRequest(FakeTakePictureRequest.Type.IN_MEMORY)
         takePictureManager.offerRequest(request1)
         takePictureManager.offerRequest(request2)
 
-        // Act: ab the manage and finish the 1st request.
+        // Act: abort the manager and finish the 1st request.
         takePictureManager.abortRequests()
         // Camera returns the image, but it should be ignored.
         val processingRequest = imagePipeline.getProcessingRequest(request1)
@@ -88,7 +130,6 @@
         // Arrange.
         val request = FakeTakePictureRequest(FakeTakePictureRequest.Type.IN_MEMORY)
         takePictureManager.offerRequest(request)
-        val exception = ImageCaptureException(ImageCapture.ERROR_UNKNOWN, "", null)
         val processingRequest = imagePipeline.getProcessingRequest(request)
         processingRequest.onImageCaptured()
         // Act.
@@ -147,24 +188,25 @@
     fun submitRequestFailsWithImageCaptureException_appGetsTheSameException() {
         // Arrange: configure ImageCaptureControl to always fail.
         val request = FakeTakePictureRequest(FakeTakePictureRequest.Type.IN_MEMORY)
-        val cause = ImageCaptureException(ERROR_CAMERA_CLOSED, "", null)
-        imageCaptureControl.response = Futures.immediateFailedFuture(cause)
+        imageCaptureControl.shouldUsePendingResult = true
+        imageCaptureControl.pendingResultCompleter.setException(exception)
 
         // Act.
         takePictureManager.offerRequest(request)
         shadowOf(getMainLooper()).idle()
 
         // Assert.
-        assertThat(request.exceptionReceived!!).isEqualTo(cause)
-        assertThat(takePictureManager.hasInFlightRequest()).isFalse()
+        assertThat(request.exceptionReceived!!).isEqualTo(exception)
+        assertThat(takePictureManager.hasCapturingRequest()).isFalse()
     }
 
     @Test
     fun submitRequestFailsWithGenericException_appGetsWrappedException() {
         // Arrange: configure ImageCaptureControl to always fail.
         val request = FakeTakePictureRequest(FakeTakePictureRequest.Type.IN_MEMORY)
-        val cause = Exception()
-        imageCaptureControl.response = Futures.immediateFailedFuture(cause)
+        val genericException = Exception()
+        imageCaptureControl.shouldUsePendingResult = true
+        imageCaptureControl.pendingResultCompleter.setException(genericException)
 
         // Act.
         takePictureManager.offerRequest(request)
@@ -172,8 +214,8 @@
 
         // Assert.
         assertThat(request.exceptionReceived!!.imageCaptureError).isEqualTo(ERROR_CAPTURE_FAILED)
-        assertThat(request.exceptionReceived!!.cause).isEqualTo(cause)
-        assertThat(takePictureManager.hasInFlightRequest()).isFalse()
+        assertThat(request.exceptionReceived!!.cause).isEqualTo(genericException)
+        assertThat(takePictureManager.hasCapturingRequest()).isFalse()
     }
 
     @Test
@@ -233,7 +275,7 @@
         takePictureManager.offerRequest(request2)
         takePictureManager.offerRequest(request3)
         shadowOf(getMainLooper()).idle()
-        val response1 = ImageCaptureException(ImageCapture.ERROR_UNKNOWN, "", null)
+        val response1 = exception
         val response2 = OutputFileResults(null)
         val response3 = FakeImageProxy(FakeImageInfo())
         imagePipeline.getProcessingRequest(request1).onImageCaptured()
@@ -259,7 +301,6 @@
         takePictureManager.offerRequest(request)
 
         // Act: send exception via ImagePipeline
-        val exception = ImageCaptureException(ImageCapture.ERROR_UNKNOWN, "", null)
         imagePipeline.getProcessingRequest(request).onImageCaptured()
         imagePipeline.getProcessingRequest(request).onProcessFailure(exception)
         shadowOf(getMainLooper()).idle()

diff --git a/camera/camera-core/src/test/java/androidx/camera/core/internal/compat/workaround/CaptureFailedRetryEnablerTest.kt b/camera/camera-core/src/test/java/androidx/camera/core/internal/compat/workaround/CaptureFailedRetryEnablerTest.kt
new file mode 100644
index 0000000..74b8ffe
--- /dev/null
+++ b/camera/camera-core/src/test/java/androidx/camera/core/internal/compat/workaround/CaptureFailedRetryEnablerTest.kt

@@ -0,0 +1,67 @@
+/*
+ * Copyright 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.camera.core.internal.compat.workaround
+
+import android.os.Build
+import androidx.test.filters.SmallTest
+import com.google.common.truth.Truth.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.ParameterizedRobolectricTestRunner
+import org.robolectric.ParameterizedRobolectricTestRunner.Parameters
+import org.robolectric.annotation.Config
+import org.robolectric.annotation.internal.DoNotInstrument
+import org.robolectric.util.ReflectionHelpers
+
+/**
+ * Unit test for [CaptureFailedRetryEnabler]
+ */
+@SmallTest
+@RunWith(ParameterizedRobolectricTestRunner::class)
+@DoNotInstrument
+@Config(minSdk = Build.VERSION_CODES.LOLLIPOP)
+class CaptureFailedRetryEnablerTest(
+    private val brand: String,
+    private val model: String,
+    private val expectedResult: Int
+) {
+
+    companion object {
+        @JvmStatic
+        @Parameters(name = "brand={0}, model={1}, expectedResult={2}")
+        fun data() = mutableListOf<Array<Any?>>().apply {
+            add(arrayOf("SAMSUNG", "SM-G981U1", 1))
+            add(arrayOf("samsung", "sm-g981u1", 1))
+            add(arrayOf("samsung", "sm-g981u10", 0))
+            add(arrayOf("samsung", "sm-g981u", 0))
+            add(arrayOf("fakeBrand", "sm-g981u1", 0))
+            add(arrayOf("", "", 0))
+        }
+    }
+
+    @Before
+    fun setup() {
+        ReflectionHelpers.setStaticField(Build::class.java, "BRAND", brand)
+        ReflectionHelpers.setStaticField(Build::class.java, "MODEL", model)
+    }
+
+    @Test
+    fun shouldRetry() {
+        assertThat(CaptureFailedRetryEnabler().retryCount).isEqualTo(expectedResult)
+    }
+}
\ No newline at end of file

diff --git a/camera/camera-core/src/test/java/androidx/camera/core/processing/SettableSurfaceTest.kt b/camera/camera-core/src/test/java/androidx/camera/core/processing/SettableSurfaceTest.kt
index 64bebab..96048cd 100644
--- a/camera/camera-core/src/test/java/androidx/camera/core/processing/SettableSurfaceTest.kt
+++ b/camera/camera-core/src/test/java/androidx/camera/core/processing/SettableSurfaceTest.kt

@@ -72,7 +72,7 @@
         settableSurface = SettableSurface(
             CameraEffect.PREVIEW, Size(640, 480), ImageFormat.PRIVATE,
             Matrix(), true, Rect(), 0, false
-        )
+        ) {}
         fakeSurfaceTexture = SurfaceTexture(0)
         fakeSurface = Surface(fakeSurfaceTexture)
     }

diff --git a/camera/camera-core/src/test/java/androidx/camera/core/processing/SurfaceProcessorNodeTest.kt b/camera/camera-core/src/test/java/androidx/camera/core/processing/SurfaceProcessorNodeTest.kt
index 0724a8d..3027eceb 100644
--- a/camera/camera-core/src/test/java/androidx/camera/core/processing/SurfaceProcessorNodeTest.kt
+++ b/camera/camera-core/src/test/java/androidx/camera/core/processing/SurfaceProcessorNodeTest.kt

@@ -265,7 +265,7 @@
             cropRect,
             rotationDegrees,
             mirroring
-        )
+        ) {}
         inputEdge = SurfaceEdge.create(listOf(surface))
     }
 

diff --git a/camera/camera-core/src/test/java/androidx/camera/core/processing/SurfaceProcessorWithExecutorTest.kt b/camera/camera-core/src/test/java/androidx/camera/core/processing/SurfaceProcessorWithExecutorTest.kt
index b07183a..9047555 100644
--- a/camera/camera-core/src/test/java/androidx/camera/core/processing/SurfaceProcessorWithExecutorTest.kt
+++ b/camera/camera-core/src/test/java/androidx/camera/core/processing/SurfaceProcessorWithExecutorTest.kt

@@ -93,7 +93,7 @@
                 }
             }, executor)
         // Act: invoke methods.
-        processorWithExecutor.onInputSurface(SurfaceRequest(SIZE, FakeCamera(), false))
+        processorWithExecutor.onInputSurface(SurfaceRequest(SIZE, FakeCamera(), false) {})
         processorWithExecutor.onOutputSurface(mock(SurfaceOutput::class.java))
         shadowOf(getMainLooper()).idle()
         shadowOf(executorThread.looper).idle()

diff --git a/camera/camera-testing/src/main/java/androidx/camera/testing/mocks/MockConsumer.java b/camera/camera-testing/src/main/java/androidx/camera/testing/mocks/MockConsumer.java
new file mode 100644
index 0000000..7d8d4ae
--- /dev/null
+++ b/camera/camera-testing/src/main/java/androidx/camera/testing/mocks/MockConsumer.java

@@ -0,0 +1,177 @@
+/*
+ * Copyright 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.camera.testing.mocks;
+
+import static junit.framework.TestCase.assertTrue;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.camera.testing.mocks.helpers.ArgumentCaptor;
+import androidx.camera.testing.mocks.helpers.CallTimes;
+import androidx.camera.testing.mocks.helpers.CallTimesAtLeast;
+import androidx.core.util.Consumer;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * A mock implementation of {@link Consumer} to verify proper invocations in tests.
+ *
+ * @param <T> the parameter type to be consumed
+ */
+public class MockConsumer<T> implements Consumer<T> {
+
+    private CountDownLatch mLatch;
+
+    private final List<T> mEventList = new ArrayList<>();
+    private int mIndexLastVerifiedInOrder = -1;
+
+    private Class<?> mClassTypeToVerify;
+    private CallTimes mCallTimes;
+    private boolean mInOrder = false;
+
+    private int getEventCount() {
+        int count = 0;
+        int startIndex = mInOrder ? mIndexLastVerifiedInOrder + 1 : 0;
+        for (int i = startIndex; i < mEventList.size(); i++) {
+            if (mClassTypeToVerify.isInstance(mEventList.get(i))) {
+                count++;
+            }
+        }
+        return count;
+    }
+
+    private int getLastVerifiedEventInOrder() {
+        int count = 0;
+        for (int i = mIndexLastVerifiedInOrder + 1; i < mEventList.size(); i++) {
+            if (mClassTypeToVerify.isInstance(mEventList.get(i))) {
+                count++;
+            }
+
+            if (mCallTimes.isSatisfied(count)) {
+                return i;
+            }
+        }
+
+        return -1;
+    }
+
+    private boolean isVerified() {
+        if (mClassTypeToVerify == null || mCallTimes == null) {
+            return false;
+        }
+
+        return mCallTimes.isSatisfied(getEventCount());
+    }
+
+    /**
+     * Verifies if {@link #accept} method was invoked properly during test.
+     *
+     * @param captor the argument captor to record the arguments passed to {@link #accept} method
+     *               matching the provided {@code classType}
+     * @see #verifyAcceptCall(Class, boolean, long, CallTimes)
+     */
+    public void verifyAcceptCall(@NonNull Class<?> classType, boolean inOrder,
+            @NonNull CallTimes callTimes, @Nullable ArgumentCaptor<T> captor) {
+        mClassTypeToVerify = classType;
+        mCallTimes = callTimes;
+        mInOrder = inOrder;
+
+        assertTrue("accept() called " + getEventCount() + " time(s) with "
+                + classType.getSimpleName() + (inOrder ? " in order" : "") + ", expected "
+                + (callTimes instanceof CallTimesAtLeast ? " at least " : "")
+                + callTimes.getTimes() + " times",
+                isVerified());
+
+        if (inOrder) {
+            mIndexLastVerifiedInOrder = getLastVerifiedEventInOrder();
+        }
+
+        if (captor != null) {
+            captor.setArguments(mEventList);
+        }
+    }
+
+    /**
+     * Verifies if {@link #accept} method was invoked properly during test.
+     *
+     * <p>{@code callTimes} defaults to {@code new CallTimes(1)} which ensures that
+     *      {@link #accept} method was invoked exactly once with given verification parameters.
+     *
+     * @see #verifyAcceptCall(Class, boolean, long, CallTimes)
+     */
+    public void verifyAcceptCall(@NonNull Class<?> classType, boolean inOrder,
+            long timeoutInMillis) {
+        verifyAcceptCall(classType, inOrder, timeoutInMillis, new CallTimes(1));
+    }
+
+    /**
+     * Verifies if {@link #accept} method was invoked properly during test.
+     *
+     * <p>Usually invoked from a method with {@link org.junit.Test} annotation.
+     *
+     * @param classType       the class type to verify for the parameter of {@link #accept(Object)}
+     *                        method, this is checked with {@link Class#isInstance(Object)} method
+     * @param inOrder         the {@link #verifyAcceptCall} method invocations with {@code inOrder =
+     *                        true} are chained together to make sure they were in order
+     * @param timeoutInMillis the time limit to wait for asynchronous operation after which
+     *                        {@link junit.framework.AssertionFailedError} is thrown
+     * @param callTimes       the condition for how many times {@link #accept} method should be
+     *                        called
+     */
+    public void verifyAcceptCall(@NonNull Class<?> classType, boolean inOrder,
+            long timeoutInMillis, @NonNull CallTimes callTimes) {
+        mClassTypeToVerify = classType;
+        mCallTimes = callTimes;
+        mInOrder = inOrder;
+
+        if (!isVerified()) {
+            mLatch = new CountDownLatch(1);
+
+            try {
+                assertTrue("Test failed for a timeout of " + timeoutInMillis + " ms",
+                        mLatch.await(timeoutInMillis, TimeUnit.MILLISECONDS));
+            } catch (InterruptedException e) {
+                throw new RuntimeException(e);
+            }
+
+            assertTrue("accept() called " + getEventCount() + " time(s) with "
+                            + classType.getSimpleName()
+                            + (mInOrder ? " in order" : "") + ", expected "
+                            + (callTimes instanceof CallTimesAtLeast ? " at least " : "")
+                            + callTimes.getTimes() + " times",
+                    isVerified());
+
+            if (inOrder) {
+                mIndexLastVerifiedInOrder = getLastVerifiedEventInOrder();
+            }
+
+            mLatch = null;
+        }
+    }
+
+    @Override
+    public void accept(T event) {
+        mEventList.add(event);
+
+        if (mLatch != null && isVerified()) {
+            mLatch.countDown();
+        }
+    }
+}

diff --git a/camera/camera-testing/src/main/java/androidx/camera/testing/mocks/MockObserver.java b/camera/camera-testing/src/main/java/androidx/camera/testing/mocks/MockObserver.java
new file mode 100644
index 0000000..bb54016
--- /dev/null
+++ b/camera/camera-testing/src/main/java/androidx/camera/testing/mocks/MockObserver.java

@@ -0,0 +1,110 @@
+/*
+ * Copyright 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.camera.testing.mocks;
+
+import static junit.framework.TestCase.assertTrue;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.camera.core.impl.Observable;
+import androidx.camera.testing.mocks.helpers.CallTimes;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * A mock implementation of {@link Observable.Observer} to verify proper invocations in tests.
+ *
+ * @param <T> the parameter type to be observed
+ */
+public class MockObserver<T> implements Observable.Observer<T> {
+    private final Map<T, Integer> mNewDataCount = new HashMap<>();
+
+    private CallTimes mCallTimes;
+    private T mValueToVerify;
+    private CountDownLatch mLatch;
+
+    private boolean isVerified() {
+        if (mCallTimes == null) {
+            return false;
+        }
+
+        int count = mNewDataCount.get(mValueToVerify) == null
+                ? 0 : mNewDataCount.get(mValueToVerify);
+        return mCallTimes.isSatisfied(count);
+    }
+
+    /**
+     * Verifies if {@link #onNewData} method was invoked properly during test.
+     *
+     * <p>{@code callTimes} defaults to {@code new CallTimes(1)} which ensures that
+     * {@link #onNewData(Object)} method was invoked exactly once with given verification
+     * parameters.
+     *
+     * @see #verifyOnNewDataCall(Object, long, CallTimes)
+     */
+    public void verifyOnNewDataCall(@Nullable T value,
+            long timeoutInMillis) {
+        verifyOnNewDataCall(value, timeoutInMillis, new CallTimes(1));
+    }
+
+    /**
+     * Verifies if {@link #onNewData} method was invoked properly during test.
+     *
+     * @param value the value to match with the value parameter of {@link #onNewData(Object)}
+     * @param timeoutInMillis the time limit to wait for asynchronous operation after which
+     *                       {@link junit.framework.AssertionFailedError} is thrown
+     * @param callTimes the condition for how many times {@link #onNewData} method should be called
+     */
+    public void verifyOnNewDataCall(@Nullable T value,
+            long timeoutInMillis, @NonNull CallTimes callTimes) {
+        mValueToVerify = value;
+        mCallTimes = callTimes;
+
+        if (!isVerified()) {
+            mLatch = new CountDownLatch(1);
+
+            try {
+                assertTrue("Test failed for a timeout of " + timeoutInMillis + " ms",
+                        mLatch.await(timeoutInMillis, TimeUnit.MILLISECONDS));
+            } catch (InterruptedException e) {
+                throw new RuntimeException(e);
+            }
+
+            assertTrue("onNewData() called "
+                            + mNewDataCount.get(value) + " time(s) with " + value,
+                    isVerified());
+
+            mLatch = null;
+        }
+    }
+
+    @Override
+    public void onNewData(@Nullable T value) {
+        Integer prevCount = mNewDataCount.get(value);
+        mNewDataCount.put(value, (prevCount == null ? 0 : prevCount) + 1);
+
+        if (mLatch != null && isVerified()) {
+            mLatch.countDown();
+        }
+    }
+
+    @Override
+    public void onError(@NonNull Throwable t) {}
+}

diff --git a/camera/camera-testing/src/main/java/androidx/camera/testing/mocks/helpers/ArgumentCaptor.java b/camera/camera-testing/src/main/java/androidx/camera/testing/mocks/helpers/ArgumentCaptor.java
new file mode 100644
index 0000000..59b71ba
--- /dev/null
+++ b/camera/camera-testing/src/main/java/androidx/camera/testing/mocks/helpers/ArgumentCaptor.java

@@ -0,0 +1,72 @@
+/*
+ * Copyright 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.camera.testing.mocks.helpers;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Utility for capturing arguments, usually in fake class method invocations for testing.
+ *
+ * @param <T> the type of the arguments to capture
+ */
+public class ArgumentCaptor<T> {
+    private final List<T> mArguments = new ArrayList<>();
+    private ArgumentMatcher<T> mArgumentMatcher;
+
+    /**
+     * Creates a new instance of {@link ArgumentCaptor}.
+     */
+    public ArgumentCaptor() {}
+
+    /**
+     * Creates a new instance of {@link ArgumentCaptor} with the given parameter.
+     *
+     * @param argumentMatcher specifies the matching criteria for capturing
+     */
+    public ArgumentCaptor(@NonNull ArgumentMatcher<T> argumentMatcher) {
+        mArgumentMatcher = argumentMatcher;
+    }
+
+    /**
+     * Returns the last value captured, {@code null} if no value has been captured yet
+     */
+    @Nullable
+    public T getValue() {
+        if (mArguments.size() == 0) {
+            return null;
+        }
+
+        return mArguments.get(mArguments.size() - 1);
+    }
+
+    /**
+     * Adds arguments to capture list according to argument matching rule (if exists).
+     *
+     * @param argumentList the list of arguments to capture
+     */
+    public void setArguments(@NonNull List<T> argumentList) {
+        for (T argument : argumentList) {
+            if (mArgumentMatcher == null || mArgumentMatcher.matches(argument)) {
+                mArguments.add(argument);
+            }
+        }
+    }
+}

diff --git a/camera/camera-testing/src/main/java/androidx/camera/testing/mocks/helpers/ArgumentMatcher.java b/camera/camera-testing/src/main/java/androidx/camera/testing/mocks/helpers/ArgumentMatcher.java
new file mode 100644
index 0000000..c95163a
--- /dev/null
+++ b/camera/camera-testing/src/main/java/androidx/camera/testing/mocks/helpers/ArgumentMatcher.java

@@ -0,0 +1,34 @@
+/*
+ * Copyright 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.camera.testing.mocks.helpers;
+
+/**
+ * An interface for matching arguments in {@link ArgumentCaptor} class.
+ *
+ * @param <T> the type of the arguments to capture
+ */
+public interface ArgumentMatcher<T> {
+
+    /**
+     * Matches an argument according to matching criteria and returns if it is matched or not.
+     *
+     * @param argument the argument to match according to criteria
+     * @return  {@code true} if argument is matched according desired criteria,
+     *          {@code false} otherwise
+     */
+    boolean matches(T argument);
+}

diff --git a/camera/camera-testing/src/main/java/androidx/camera/testing/mocks/helpers/CallTimes.java b/camera/camera-testing/src/main/java/androidx/camera/testing/mocks/helpers/CallTimes.java
new file mode 100644
index 0000000..8601807
--- /dev/null
+++ b/camera/camera-testing/src/main/java/androidx/camera/testing/mocks/helpers/CallTimes.java

@@ -0,0 +1,49 @@
+/*
+ * Copyright 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.camera.testing.mocks.helpers;
+
+/**
+ * Utility for defining the number of invocations allowed while testing fake class methods.
+ */
+public class CallTimes {
+    protected int mTimes;
+
+    /**
+     * Creates a new instance of {@link CallTimes} with the given parameter.
+     *
+     * @param times the number of invocations allowed
+     */
+    public CallTimes(int times) {
+        mTimes = times;
+    }
+
+    public int getTimes() {
+        return mTimes;
+    }
+
+    /**
+     * Checks if the number of invocation is exactly the same as specified.
+     *
+     * @param actualCallCount the occurred number of invocations
+     *
+     * @return {@code true} if the number of invocations is exactly the same as specified,
+     *          {@code false} otherwise
+     */
+    public boolean isSatisfied(int actualCallCount) {
+        return actualCallCount == mTimes;
+    }
+}

diff --git a/camera/camera-testing/src/main/java/androidx/camera/testing/mocks/helpers/CallTimesAtLeast.java b/camera/camera-testing/src/main/java/androidx/camera/testing/mocks/helpers/CallTimesAtLeast.java
new file mode 100644
index 0000000..5b78740
--- /dev/null
+++ b/camera/camera-testing/src/main/java/androidx/camera/testing/mocks/helpers/CallTimesAtLeast.java

@@ -0,0 +1,43 @@
+/*
+ * Copyright 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.camera.testing.mocks.helpers;
+
+/**
+ * Utility for defining the number of invocations allowed while testing fake class methods.
+ */
+public class CallTimesAtLeast extends CallTimes {
+    /**
+     * Creates a new instance of {@link CallTimesAtLeast} with the given parameter.
+     *
+     * @param times the minimum number of invocations that should be occurring
+     */
+    public CallTimesAtLeast(int times) {
+        super(times);
+    }
+
+    /**
+     * Checks if the number of invocation is at least {@link #mTimes}.
+     *
+     * @param actualCallCount the occurred number of invocations
+     * @return {@code true} if the number of invocations is at least the times specified,
+     *          {@code false} otherwise
+     */
+    @Override
+    public boolean isSatisfied(int actualCallCount) {
+        return actualCallCount >= mTimes;
+    }
+}

diff --git a/camera/camera-testing/src/test/java/androidx/camera/testing/mocks/MockConsumerTest.java b/camera/camera-testing/src/test/java/androidx/camera/testing/mocks/MockConsumerTest.java
new file mode 100644
index 0000000..fc01c74
--- /dev/null
+++ b/camera/camera-testing/src/test/java/androidx/camera/testing/mocks/MockConsumerTest.java

@@ -0,0 +1,127 @@
+/*
+ * Copyright 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.camera.testing.mocks;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThrows;
+
+import androidx.camera.testing.mocks.helpers.ArgumentCaptor;
+import androidx.camera.testing.mocks.helpers.CallTimes;
+
+import junit.framework.AssertionFailedError;
+
+import org.junit.Before;
+import org.junit.Test;
+
+public class MockConsumerTest {
+    public static final String DUMMY_STRING_1 = "dummy1";
+    public static final String DUMMY_STRING_2 = "dummy2";
+
+    public static final int DUMMY_INT_1 = 1;
+
+    private MockConsumer<Object> mMockConsumer;
+
+    @Before
+    public void setUp() {
+        mMockConsumer = new MockConsumer<>();
+    }
+
+    @Test
+    public void callTimesMatches_verifyAcceptCallPasses() {
+        mMockConsumer.accept(new Object());
+        mMockConsumer.accept(new Object());
+        mMockConsumer.verifyAcceptCall(Object.class, false, new CallTimes(2), null);
+    }
+
+    @Test
+    public void callTimesMismatched_verifyAcceptCallFailsWithProperMessage() {
+        mMockConsumer.accept(new Object());
+        mMockConsumer.accept(new Object());
+
+        AssertionFailedError error = assertThrows(AssertionFailedError.class,
+                () -> mMockConsumer.verifyAcceptCall(Object.class, false, new CallTimes(1), null));
+        assertEquals("accept() called 2 time(s) with Object, expected 1 times", error.getMessage());
+    }
+
+    @Test
+    public void verifiedInOrder_verifyAcceptCallSucceeds() {
+        mMockConsumer.accept(DUMMY_STRING_1);
+        mMockConsumer.accept(DUMMY_STRING_1);
+        mMockConsumer.accept(DUMMY_INT_1);
+        mMockConsumer.accept(DUMMY_INT_1);
+        mMockConsumer.accept(DUMMY_INT_1);
+
+        mMockConsumer.verifyAcceptCall(String.class, true, new CallTimes(2), null);
+        mMockConsumer.verifyAcceptCall(Integer.class, true, new CallTimes(3), null);
+    }
+
+    @Test
+    public void verifiedInOrderWithoutConsecutiveness_verifyAcceptCallSucceeds() {
+        mMockConsumer.accept(DUMMY_STRING_1);
+        mMockConsumer.accept(DUMMY_INT_1);
+        mMockConsumer.accept(DUMMY_STRING_1);
+
+        mMockConsumer.verifyAcceptCall(String.class, true, new CallTimes(2), null);
+    }
+
+    @Test
+    public void verifiedWithArgumentCaptor_captorHasCorrectValue() {
+        ArgumentCaptor<Object> captor = new ArgumentCaptor<>();
+
+        mMockConsumer.accept(DUMMY_STRING_1);
+        mMockConsumer.accept(DUMMY_STRING_2);
+
+        mMockConsumer.verifyAcceptCall(String.class, false, new CallTimes(2), captor);
+
+        assertEquals(DUMMY_STRING_2, captor.getValue());
+    }
+
+    @Test
+    public void acceptCalledWithinTimeout_verifyAcceptCallPasses() {
+        new Thread(() -> {
+            try {
+                Thread.sleep(100);
+            } catch (InterruptedException e) {
+                throw new RuntimeException(e);
+            }
+
+            mMockConsumer.accept(DUMMY_STRING_1);
+        }, "test thread").start();
+
+        mMockConsumer.verifyAcceptCall(String.class, false, 500);
+    }
+
+    @Test
+    public void acceptCalledAfterTimeout_verifyAcceptCallFailsWithProperMessage() {
+        new Thread(() -> {
+            try {
+                Thread.sleep(1000);
+            } catch (InterruptedException e) {
+                throw new RuntimeException(e);
+            }
+
+            mMockConsumer.accept(DUMMY_STRING_1);
+        }, "test thread").start();
+
+        AssertionFailedError error = assertThrows(AssertionFailedError.class,
+                () -> {
+                    mMockConsumer.verifyAcceptCall(String.class, false, 500);
+                });
+
+        assertEquals("Test failed for a timeout of 500 ms", error.getMessage());
+    }
+}

diff --git a/camera/camera-testing/src/test/java/androidx/camera/testing/mocks/MockObserverTest.java b/camera/camera-testing/src/test/java/androidx/camera/testing/mocks/MockObserverTest.java
new file mode 100644
index 0000000..4653944
--- /dev/null
+++ b/camera/camera-testing/src/test/java/androidx/camera/testing/mocks/MockObserverTest.java

@@ -0,0 +1,74 @@
+/*
+ * Copyright 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.camera.testing.mocks;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThrows;
+
+import androidx.camera.testing.mocks.helpers.CallTimes;
+
+import junit.framework.AssertionFailedError;
+
+import org.junit.Before;
+import org.junit.Test;
+
+public class MockObserverTest {
+    private static final Object DUMMY_NEW_DATA = new Object();
+    private static final Object DUMMY_NEW_DATA_2 = new Object();
+
+    private MockObserver<Object> mMockObserver;
+
+    @Before
+    public void setUp() {
+        mMockObserver = new MockObserver<>();
+    }
+
+    @Test
+    public void callTimesMatches_verifyOnNewDataCallPasses() {
+        mMockObserver.onNewData(DUMMY_NEW_DATA);
+        mMockObserver.onNewData(DUMMY_NEW_DATA);
+        mMockObserver.onNewData(DUMMY_NEW_DATA_2);
+
+        mMockObserver.verifyOnNewDataCall(DUMMY_NEW_DATA, 100, new CallTimes(2));
+    }
+
+    @Test
+    public void verifiedWithinTimeout_verifyAcceptCallPasses() {
+        new Thread(() -> {
+            try {
+                Thread.sleep(100);
+            } catch (InterruptedException e) {
+                throw new RuntimeException(e);
+            }
+
+            mMockObserver.onNewData(DUMMY_NEW_DATA);
+        }, "test thread").start();
+
+        mMockObserver.verifyOnNewDataCall(DUMMY_NEW_DATA, 500);
+    }
+
+
+    @Test
+    public void notVerifiedWithinTimeout_verifyOnNewDataCallFailsWithProperMessage() {
+        mMockObserver.onNewData(DUMMY_NEW_DATA);
+
+        AssertionFailedError error = assertThrows(AssertionFailedError.class,
+                () -> mMockObserver.verifyOnNewDataCall(DUMMY_NEW_DATA, 100, new CallTimes(2)));
+        assertEquals("Test failed for a timeout of 100 ms",
+                error.getMessage());
+    }
+}

diff --git a/camera/camera-testing/src/test/java/androidx/camera/testing/mocks/helpers/ArgumentCaptorTest.java b/camera/camera-testing/src/test/java/androidx/camera/testing/mocks/helpers/ArgumentCaptorTest.java
new file mode 100644
index 0000000..5ef9c2b
--- /dev/null
+++ b/camera/camera-testing/src/test/java/androidx/camera/testing/mocks/helpers/ArgumentCaptorTest.java

@@ -0,0 +1,84 @@
+/*
+ * Copyright 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.camera.testing.mocks.helpers;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.Arrays;
+import java.util.List;
+
+public class ArgumentCaptorTest {
+    private static final Object DUMMY_ARGUMENT_1 = new Object();
+    private static final Object DUMMY_ARGUMENT_2 = new Object();
+
+    private static final List<Object> DUMMY_ARGUMENTS_1 = Arrays.asList(DUMMY_ARGUMENT_1,
+            new Object(), DUMMY_ARGUMENT_2, new Object());
+    private static final List<Object> DUMMY_ARGUMENTS_2 = Arrays.asList(new Object(), new Object());
+
+    private ArgumentCaptor<Object> mArgumentCaptor;
+
+    @Before
+    public void setUp() {
+        mArgumentCaptor = new ArgumentCaptor<>();
+    }
+
+    @Test
+    public void noArgumentProvided_getValueReturnsNull() {
+        assertNull(mArgumentCaptor.getValue());
+    }
+
+    @Test
+    public void argumentsProvided_getValueReturnsLastValue() {
+        mArgumentCaptor.setArguments(DUMMY_ARGUMENTS_1);
+
+        assertEquals(DUMMY_ARGUMENTS_1.get(DUMMY_ARGUMENTS_1.size() - 1),
+                mArgumentCaptor.getValue());
+    }
+
+    @Test
+    public void argumentsProvidedTwice_getValueReturnsLastValue() {
+        mArgumentCaptor.setArguments(DUMMY_ARGUMENTS_1);
+        mArgumentCaptor.setArguments(DUMMY_ARGUMENTS_2);
+
+        assertEquals(DUMMY_ARGUMENTS_2.get(DUMMY_ARGUMENTS_2.size() - 1),
+                mArgumentCaptor.getValue());
+    }
+
+
+    @Test
+    public void argumentsProvidedWithMatcher_getValueReturnsLastMatchedValue() {
+        mArgumentCaptor = new ArgumentCaptor<>(argument -> argument.equals(DUMMY_ARGUMENT_1)
+                        || argument.equals(DUMMY_ARGUMENT_2));
+
+        mArgumentCaptor.setArguments(DUMMY_ARGUMENTS_1);
+
+        assertEquals(DUMMY_ARGUMENT_2, mArgumentCaptor.getValue());
+    }
+
+    @Test
+    public void argumentsProvidedWithMatcher_getValueReturnsNullForNoMatch() {
+        mArgumentCaptor = new ArgumentCaptor<>(argument -> false);
+
+        mArgumentCaptor.setArguments(DUMMY_ARGUMENTS_1);
+
+        assertNull(mArgumentCaptor.getValue());
+    }
+}

diff --git a/camera/camera-testing/src/test/java/androidx/camera/testing/mocks/helpers/CallTimesAtLeastTest.java b/camera/camera-testing/src/test/java/androidx/camera/testing/mocks/helpers/CallTimesAtLeastTest.java
new file mode 100644
index 0000000..d4bbd0c
--- /dev/null
+++ b/camera/camera-testing/src/test/java/androidx/camera/testing/mocks/helpers/CallTimesAtLeastTest.java

@@ -0,0 +1,41 @@
+/*
+ * Copyright 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.camera.testing.mocks.helpers;
+
+import static org.junit.Assert.*;
+
+import org.junit.Test;
+
+public class CallTimesAtLeastTest {
+    private final CallTimesAtLeast mCallTimes = new CallTimesAtLeast(5);
+
+    @Test
+    public void actualCallCountMatchesExactly_isSatisfiedReturnsTrue() {
+        assertTrue(mCallTimes.isSatisfied(5));
+    }
+
+    @Test
+    public void actualCallCountIsLess_isSatisfiedReturnsFalse() {
+        assertFalse(mCallTimes.isSatisfied(2));
+    }
+
+    @Test
+    public void actualCallCountIsMore_isSatisfiedReturnsTrue() {
+        assertTrue(mCallTimes.isSatisfied(8));
+    }
+
+}

diff --git a/camera/camera-testing/src/test/java/androidx/camera/testing/mocks/helpers/CallTimesTest.java b/camera/camera-testing/src/test/java/androidx/camera/testing/mocks/helpers/CallTimesTest.java
new file mode 100644
index 0000000..659bec8
--- /dev/null
+++ b/camera/camera-testing/src/test/java/androidx/camera/testing/mocks/helpers/CallTimesTest.java

@@ -0,0 +1,47 @@
+/*
+ * Copyright 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.camera.testing.mocks.helpers;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+public class CallTimesTest {
+    private final CallTimes mCallTimes = new CallTimes(5);
+
+    @Test
+    public void getTimesReturnsCorrectly() {
+        assertEquals(5, mCallTimes.getTimes());
+    }
+
+    @Test
+    public void actualCallCountMatchesExactly_isSatisfiedReturnsTrue() {
+        assertTrue(mCallTimes.isSatisfied(5));
+    }
+
+    @Test
+    public void actualCallCountIsLess_isSatisfiedReturnsFalse() {
+        assertFalse(mCallTimes.isSatisfied(2));
+    }
+
+    @Test
+    public void actualCallCountIsMore_isSatisfiedReturnsFalse() {
+        assertFalse(mCallTimes.isSatisfied(8));
+    }
+}

diff --git a/camera/camera-video/src/androidTest/java/androidx/camera/video/RecorderTest.kt b/camera/camera-video/src/androidTest/java/androidx/camera/video/RecorderTest.kt
index 2f0af13..2f648b8 100644
--- a/camera/camera-video/src/androidTest/java/androidx/camera/video/RecorderTest.kt
+++ b/camera/camera-video/src/androidTest/java/androidx/camera/video/RecorderTest.kt

@@ -16,6 +16,7 @@
 
 package androidx.camera.video
 
+import androidx.camera.testing.mocks.helpers.ArgumentCaptor as ArgumentCaptorCameraX
 import android.Manifest
 import android.annotation.SuppressLint
 import android.app.AppOpsManager
@@ -52,6 +53,8 @@
 import androidx.camera.testing.LabTestRule
 import androidx.camera.testing.SurfaceTextureProvider
 import androidx.camera.testing.asFlow
+import androidx.camera.testing.mocks.MockConsumer
+import androidx.camera.testing.mocks.helpers.CallTimesAtLeast
 import androidx.camera.video.VideoRecordEvent.Finalize.ERROR_DURATION_LIMIT_REACHED
 import androidx.camera.video.VideoRecordEvent.Finalize.ERROR_FILE_SIZE_LIMIT_REACHED
 import androidx.camera.video.VideoRecordEvent.Finalize.ERROR_INVALID_OUTPUT_OPTIONS
@@ -87,7 +90,6 @@
 import org.junit.Assume.assumeFalse
 import org.junit.Assume.assumeTrue
 import org.junit.Before
-import org.junit.Ignore
 import org.junit.Rule
 import org.junit.Test
 import org.junit.rules.TestName
@@ -259,7 +261,8 @@
 
     @Test
     fun canRecordToFile() {
-        clearInvocations(videoRecordEventListener)
+        val videoRecordEventListener = MockConsumer<VideoRecordEvent>()
+
         invokeSurfaceRequest()
         val file = File.createTempFile("CameraX", ".tmp").apply { deleteOnExit() }
 
@@ -268,23 +271,30 @@
                 .withAudioEnabled()
                 .start(CameraXExecutors.directExecutor(), videoRecordEventListener)
 
-        val inOrder = inOrder(videoRecordEventListener)
-        inOrder.verify(videoRecordEventListener, timeout(5000L))
-            .accept(any(VideoRecordEvent.Start::class.java))
-        inOrder.verify(videoRecordEventListener, timeout(15000L).atLeast(5))
-            .accept(any(VideoRecordEvent.Status::class.java))
+        videoRecordEventListener.verifyAcceptCall(VideoRecordEvent.Start::class.java,
+            true, 5000L)
+
+        videoRecordEventListener.verifyAcceptCall(VideoRecordEvent.Status::class.java,
+            true, 15000L, CallTimesAtLeast(5))
 
         recording.stopSafely()
 
-        inOrder.verify(videoRecordEventListener, timeout(FINALIZE_TIMEOUT))
-            .accept(any(VideoRecordEvent.Finalize::class.java))
+        videoRecordEventListener.verifyAcceptCall(VideoRecordEvent.Finalize::class.java,
+            true, FINALIZE_TIMEOUT)
 
         val uri = Uri.fromFile(file)
         checkFileHasAudioAndVideo(uri)
 
         // Check the output Uri from the finalize event match the Uri from the given file.
-        val captor = ArgumentCaptor.forClass(VideoRecordEvent::class.java)
-        verify(videoRecordEventListener, atLeastOnce()).accept(captor.capture())
+        val captor = ArgumentCaptorCameraX<VideoRecordEvent> { argument ->
+            VideoRecordEvent::class.java.isInstance(
+                argument
+            )
+        }
+
+        videoRecordEventListener.verifyAcceptCall(VideoRecordEvent::class.java, false,
+            CallTimesAtLeast(1), captor)
+
         val finalize = captor.value as VideoRecordEvent.Finalize
         assertThat(finalize.outputResults.outputUri).isEqualTo(uri)
 
@@ -415,9 +425,10 @@
     }
 
     @Test
-    @Ignore("b/239752223")
     fun canPauseResume() {
-        clearInvocations(videoRecordEventListener)
+        val videoRecordEventListener =
+            MockConsumer<VideoRecordEvent>()
+
         invokeSurfaceRequest()
 
         val file = File.createTempFile("CameraX", ".tmp").apply { deleteOnExit() }
@@ -429,23 +440,23 @@
 
         recording.pause()
 
-        val inOrder = inOrder(videoRecordEventListener)
-        inOrder.verify(videoRecordEventListener, timeout(5000L))
-            .accept(any(VideoRecordEvent.Pause::class.java))
+        videoRecordEventListener.verifyAcceptCall(VideoRecordEvent.Pause::class.java,
+            true, 5000L)
 
         recording.resume()
 
-        inOrder.verify(videoRecordEventListener, timeout(5000L))
-            .accept(any(VideoRecordEvent.Resume::class.java))
+        videoRecordEventListener.verifyAcceptCall(VideoRecordEvent.Resume::class.java,
+            true, 5000L)
+
         // Check there are data being encoded after resuming.
-        inOrder.verify(videoRecordEventListener, timeout(15000L).atLeast(5))
-            .accept(any(VideoRecordEvent.Status::class.java))
+        videoRecordEventListener.verifyAcceptCall(VideoRecordEvent.Status::class.java,
+            true, 15000L, CallTimesAtLeast(5))
 
         recording.stopSafely()
 
         // Wait for the recording to be finalized.
-        inOrder.verify(videoRecordEventListener, timeout(FINALIZE_TIMEOUT))
-            .accept(any(VideoRecordEvent.Finalize::class.java))
+        videoRecordEventListener.verifyAcceptCall(VideoRecordEvent.Finalize::class.java,
+            true, FINALIZE_TIMEOUT)
 
         checkFileHasAudioAndVideo(Uri.fromFile(file))
 
@@ -555,7 +566,6 @@
     }
 
     @Test
-    @Ignore("b/239752223")
     fun setFileSizeLimit() {
         val fileSizeLimit = 500L * 1024L // 500 KB
         runFileSizeLimitTest(fileSizeLimit)
@@ -565,7 +575,6 @@
     // the encoder. This will ensure that the recording will be finalized even if it has no data
     // written to it.
     @Test
-    @Ignore("b/239752223")
     fun setFileSizeLimitLowerThanInitialDataSize() {
         val fileSizeLimit = 1L // 1 byte
         runFileSizeLimitTest(fileSizeLimit)
@@ -1039,9 +1048,10 @@
     }
 
     @Test
-    @Ignore("b/239752223")
     fun canRecordWithoutAudio() {
-        clearInvocations(videoRecordEventListener)
+        val videoRecordEventListener =
+            MockConsumer<VideoRecordEvent>()
+
         invokeSurfaceRequest()
         val file = File.createTempFile("CameraX", ".tmp").apply { deleteOnExit() }
 
@@ -1049,15 +1059,22 @@
             recorder.prepareRecording(context, FileOutputOptions.Builder(file).build())
                 .start(CameraXExecutors.directExecutor(), videoRecordEventListener)
 
-        val inOrder = inOrder(videoRecordEventListener)
-        inOrder.verify(videoRecordEventListener, timeout(5000L))
-            .accept(any(VideoRecordEvent.Start::class.java))
-        inOrder.verify(videoRecordEventListener, timeout(15000L).atLeast(5))
-            .accept(any(VideoRecordEvent.Status::class.java))
+        videoRecordEventListener.verifyAcceptCall(VideoRecordEvent.Start::class.java,
+            true, 5000L)
+
+        videoRecordEventListener.verifyAcceptCall(VideoRecordEvent.Status::class.java,
+            true, 15000L, CallTimesAtLeast(5))
 
         // Check the audio information reports state as disabled.
-        val captor = ArgumentCaptor.forClass(VideoRecordEvent::class.java)
-        verify(videoRecordEventListener, atLeastOnce()).accept(captor.capture())
+        val captor = ArgumentCaptorCameraX<VideoRecordEvent> { argument ->
+            VideoRecordEvent::class.java.isInstance(
+                argument
+            )
+        }
+
+        videoRecordEventListener.verifyAcceptCall(VideoRecordEvent::class.java,
+            false, CallTimesAtLeast(1), captor)
+
         assertThat(captor.value).isInstanceOf(VideoRecordEvent.Status::class.java)
         val status = captor.value as VideoRecordEvent.Status
         assertThat(status.recordingStats.audioStats.audioState)
@@ -1065,8 +1082,8 @@
 
         recording.stopSafely()
 
-        verify(videoRecordEventListener, timeout(FINALIZE_TIMEOUT))
-            .accept(any(VideoRecordEvent.Finalize::class.java))
+        videoRecordEventListener.verifyAcceptCall(VideoRecordEvent.Finalize::class.java,
+            false, FINALIZE_TIMEOUT)
 
         checkFileAudio(Uri.fromFile(file), false)
         checkFileVideo(Uri.fromFile(file), true)
@@ -1324,18 +1341,23 @@
             .setFileSizeLimit(fileSizeLimit)
             .build()
 
+        val videoRecordEventListener =
+            MockConsumer<VideoRecordEvent>()
+
         val recording = recorder
             .prepareRecording(context, outputOptions)
             .withAudioEnabled()
             .start(CameraXExecutors.directExecutor(), videoRecordEventListener)
 
-        verify(
-            videoRecordEventListener,
-            timeout(60000L)
-        ).accept(any(VideoRecordEvent.Finalize::class.java))
+        videoRecordEventListener.verifyAcceptCall(VideoRecordEvent.Finalize::class.java,
+            false, 60000L)
 
-        val captor = ArgumentCaptor.forClass(VideoRecordEvent::class.java)
-        verify(videoRecordEventListener, atLeastOnce()).accept(captor.capture())
+        val captor = ArgumentCaptorCameraX<VideoRecordEvent> {
+                argument -> VideoRecordEvent::class.java.isInstance(argument)
+        }
+
+        videoRecordEventListener.verifyAcceptCall(VideoRecordEvent::class.java,
+            false, CallTimesAtLeast(1), captor)
 
         assertThat(captor.value).isInstanceOf(VideoRecordEvent.Finalize::class.java)
         val finalize = captor.value as VideoRecordEvent.Finalize

diff --git a/camera/camera-video/src/androidTest/java/androidx/camera/video/SupportedQualitiesVerificationTest.kt b/camera/camera-video/src/androidTest/java/androidx/camera/video/SupportedQualitiesVerificationTest.kt
index d0eea0a..e3f640c 100644
--- a/camera/camera-video/src/androidTest/java/androidx/camera/video/SupportedQualitiesVerificationTest.kt
+++ b/camera/camera-video/src/androidTest/java/androidx/camera/video/SupportedQualitiesVerificationTest.kt

@@ -41,6 +41,8 @@
 import androidx.camera.core.CameraSelector
 import androidx.camera.core.CameraXConfig
 import androidx.camera.core.impl.utils.executor.CameraXExecutors
+import androidx.camera.core.processing.DefaultSurfaceProcessor
+import androidx.camera.core.processing.SurfaceProcessorInternal
 import androidx.camera.lifecycle.ProcessCameraProvider
 import androidx.camera.testing.CameraPipeConfigTestRule
 import androidx.camera.testing.CameraUtil
@@ -50,7 +52,7 @@
 import androidx.test.filters.LargeTest
 import androidx.test.filters.SdkSuppress
 import androidx.test.platform.app.InstrumentationRegistry
-import com.google.common.truth.Truth
+import com.google.common.truth.Truth.assertThat
 import java.io.File
 import java.util.concurrent.CountDownLatch
 import java.util.concurrent.TimeUnit
@@ -130,6 +132,7 @@
 
     private val instrumentation = InstrumentationRegistry.getInstrumentation()
     private val context: Context = ApplicationProvider.getApplicationContext()
+    private val surfaceProcessorsToRelease = mutableListOf<SurfaceProcessorInternal>()
     private lateinit var cameraProvider: ProcessCameraProvider
     private lateinit var lifecycleOwner: FakeLifecycleOwner
     private lateinit var cameraInfo: CameraInfo
@@ -172,20 +175,42 @@
             }
             cameraProvider.shutdown()[10, TimeUnit.SECONDS]
         }
+        for (surfaceProcessor in surfaceProcessorsToRelease) {
+            surfaceProcessor.release()
+        }
+        surfaceProcessorsToRelease.clear()
     }
 
     @Test
     fun qualityOptionCanRecordVideo() {
+        testQualityOptionRecordVideo()
+    }
+
+    @Test
+    fun qualityOptionCanRecordVideo_enableSurfaceProcessor() {
+        assumeSuccessfulSurfaceProcessing()
+
+        testQualityOptionRecordVideo(surfaceProcessor = createSurfaceProcessor())
+    }
+
+    private fun testQualityOptionRecordVideo(surfaceProcessor: SurfaceProcessorInternal? = null) {
         // Arrange.
         val recorder = Recorder.Builder().setQualitySelector(QualitySelector.from(quality)).build()
         val videoCapture = VideoCapture.withOutput(recorder)
+        videoCapture.setProcessor(surfaceProcessor)
         val file = File.createTempFile("CameraX", ".tmp").apply { deleteOnExit() }
-        val latchForVideoRecording = CountDownLatch(5)
-        val eventListener = Consumer<VideoRecordEvent> {
-            when (it) {
+        val latchForRecordingStatus = CountDownLatch(5)
+        val latchForRecordingFinalized = CountDownLatch(1)
+        var finalizedEvent: VideoRecordEvent.Finalize? = null
+        val eventListener = Consumer<VideoRecordEvent> { event ->
+            when (event) {
                 is VideoRecordEvent.Status -> {
                     // Make sure the recording proceed for a while.
-                    latchForVideoRecording.countDown()
+                    latchForRecordingStatus.countDown()
+                }
+                is VideoRecordEvent.Finalize -> {
+                    finalizedEvent = event
+                    latchForRecordingFinalized.countDown()
                 }
                 else -> {
                     // Ignore other events.
@@ -203,20 +228,30 @@
 
         // Act.
         videoCapture.startVideoRecording(file, eventListener).use {
-
             // Verify the recording proceed for a while.
-            Truth.assertThat(
-                latchForVideoRecording.await(
-                    VIDEO_TIMEOUT_SEC,
-                    TimeUnit.SECONDS
-                )
-            ).isTrue()
+            assertThat(latchForRecordingStatus.await(VIDEO_TIMEOUT_SEC, TimeUnit.SECONDS)).isTrue()
         }
 
+        // Verify the recording is finalized without error.
+        assertThat(latchForRecordingFinalized.await(VIDEO_TIMEOUT_SEC, TimeUnit.SECONDS)).isTrue()
+        assertThat(finalizedEvent!!.error).isEqualTo(VideoRecordEvent.Finalize.ERROR_NONE)
+
         // Clean up
         file.delete()
     }
 
+    private fun createSurfaceProcessor(): SurfaceProcessorInternal =
+        DefaultSurfaceProcessor().apply { surfaceProcessorsToRelease.add(this) }
+
+    /** Skips tests which will enable surface processing and encounter device specific issues. */
+    private fun assumeSuccessfulSurfaceProcessing() {
+        // Skip for b/253211491
+        Assume.assumeFalse(
+            "Skip tests for Cuttlefish API 30 eglCreateWindowSurface issue",
+            Build.MODEL.contains("Cuttlefish") && Build.VERSION.SDK_INT == 30
+        )
+    }
+
     private fun VideoCapture<Recorder>.startVideoRecording(
         file: File,
         eventListener: Consumer<VideoRecordEvent>

diff --git a/camera/camera-video/src/main/java/androidx/camera/video/VideoCapture.java b/camera/camera-video/src/main/java/androidx/camera/video/VideoCapture.java
index 4f61481..2df259f 100644
--- a/camera/camera-video/src/main/java/androidx/camera/video/VideoCapture.java
+++ b/camera/camera-video/src/main/java/androidx/camera/video/VideoCapture.java

@@ -497,6 +497,11 @@
         Threads.checkMainThread();
         CameraInternal camera = Preconditions.checkNotNull(getCamera());
 
+        // Currently, VideoCapture uses StreamInfo to handle requests for surface, so
+        // handleInvalidate() is not used. But if a different approach is asked in the future,
+        // handleInvalidate() can be used as an alternative.
+        Runnable >
+
         // TODO(b/229410005): The expected FPS range will need to come from the camera rather
         //  than what is requested in the config. For now we use the default range of (30, 30)
         //  for behavioral consistency.
@@ -520,7 +525,8 @@
                     /*hasEmbeddedTransform=*/true,
                     mCropRect,
                     getRelativeRotation(camera),
-                    /*mirroring=*/false);
+                    /*mirroring=*/false,
+                    onSurfaceInvalidated);
             SurfaceEdge inputEdge = SurfaceEdge.create(singletonList(cameraSurface));
             SurfaceEdge outputEdge = mNode.transform(inputEdge);
             SettableSurface appSurface = outputEdge.getSurfaces().get(0);
@@ -534,7 +540,8 @@
                 }
             }, CameraXExecutors.mainThreadExecutor());
         } else {
-            mSurfaceRequest = new SurfaceRequest(resolution, camera, false, targetFpsRange);
+            mSurfaceRequest = new SurfaceRequest(resolution, camera, false, targetFpsRange,
+                    onSurfaceInvalidated);
             mDeferrableSurface = mSurfaceRequest.getDeferrableSurface();
             // When camera buffers from a REALTIME device are passed directly to a video encoder
             // from the camera, automatic compensation is done to account for differing timebases

diff --git a/camera/camera-video/src/main/java/androidx/camera/video/internal/compat/quirk/DeviceQuirksLoader.java b/camera/camera-video/src/main/java/androidx/camera/video/internal/compat/quirk/DeviceQuirksLoader.java
index 2a9f7f3..41b0c0e 100644
--- a/camera/camera-video/src/main/java/androidx/camera/video/internal/compat/quirk/DeviceQuirksLoader.java
+++ b/camera/camera-video/src/main/java/androidx/camera/video/internal/compat/quirk/DeviceQuirksLoader.java

@@ -89,9 +89,6 @@
         if (ImageCaptureFailedWhenVideoCaptureIsBoundQuirk.load()) {
             quirks.add(new ImageCaptureFailedWhenVideoCaptureIsBoundQuirk());
         }
-        if (MediaCodecDoesNotSendEos.load()) {
-            quirks.add(new MediaCodecDoesNotSendEos());
-        }
 
         return quirks;
     }

diff --git a/camera/camera-video/src/main/java/androidx/camera/video/internal/compat/quirk/MediaCodecDoesNotSendEos.java b/camera/camera-video/src/main/java/androidx/camera/video/internal/compat/quirk/MediaCodecDoesNotSendEos.java
deleted file mode 100644
index 46ccb85..0000000
--- a/camera/camera-video/src/main/java/androidx/camera/video/internal/compat/quirk/MediaCodecDoesNotSendEos.java
+++ /dev/null

@@ -1,44 +0,0 @@
-/*
- * Copyright 2022 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package androidx.camera.video.internal.compat.quirk;
-
-import android.media.MediaCodec;
-import android.os.Build;
-
-import androidx.annotation.RequiresApi;
-import androidx.camera.core.impl.Quirk;
-
-/**
- * <p>QuirkSummary
- * Bug Id: b/248189542
- * Description: When recording video with effect pipeline enabled, calling
- *              {@link MediaCodec#signalEndOfInputStream()} doesn't trigger an EOS buffer to
- *              {@link MediaCodec.Callback}.
- * Device(s): twist 2 pro.
- */
-@RequiresApi(21)
-public class MediaCodecDoesNotSendEos implements Quirk {
-
-    public static boolean isPositivoTwist2Pro() {
-        return "positivo".equalsIgnoreCase(Build.BRAND) && "twist 2 pro".equalsIgnoreCase(
-                Build.MODEL);
-    }
-
-    static boolean load() {
-        return isPositivoTwist2Pro();
-    }
-}

diff --git a/camera/camera-video/src/main/java/androidx/camera/video/internal/encoder/EncoderImpl.java b/camera/camera-video/src/main/java/androidx/camera/video/internal/encoder/EncoderImpl.java
index c5d5bf1..b618ac7 100644
--- a/camera/camera-video/src/main/java/androidx/camera/video/internal/encoder/EncoderImpl.java
+++ b/camera/camera-video/src/main/java/androidx/camera/video/internal/encoder/EncoderImpl.java

@@ -30,6 +30,7 @@
 
 import android.annotation.SuppressLint;
 import android.media.MediaCodec;
+import android.media.MediaCodec.BufferInfo;
 import android.media.MediaCodecInfo;
 import android.media.MediaFormat;
 import android.os.Bundle;
@@ -52,7 +53,6 @@
 import androidx.camera.video.internal.compat.quirk.CameraUseInconsistentTimebaseQuirk;
 import androidx.camera.video.internal.compat.quirk.DeviceQuirks;
 import androidx.camera.video.internal.compat.quirk.EncoderNotUsePersistentInputSurfaceQuirk;
-import androidx.camera.video.internal.compat.quirk.MediaCodecDoesNotSendEos;
 import androidx.camera.video.internal.compat.quirk.VideoEncoderSuspendDoesNotIncludeSuspendTimeQuirk;
 import androidx.camera.video.internal.workaround.EncoderFinder;
 import androidx.camera.video.internal.workaround.VideoTimebaseConverter;
@@ -202,11 +202,10 @@
     Long mLastDataStopTimestamp = null;
     @SuppressWarnings("WeakerAccess") // synthetic accessor
     Future<?> mStopTimeoutFuture = null;
-    @Nullable
-    private MediaCodecCallback mMediaCodecCallback;
 
     private boolean mIsFlushedAfterEndOfStream = false;
     private boolean mSourceStoppedSignalled = false;
+    boolean mMediaCodecEosSignalled = false;
 
     final EncoderFinder mEncoderFinder = new EncoderFinder();
 
@@ -277,13 +276,13 @@
         mMediaCodec.reset();
         mIsFlushedAfterEndOfStream = false;
         mSourceStoppedSignalled = false;
+        mMediaCodecEosSignalled = false;
         mPendingCodecStop = false;
         if (mStopTimeoutFuture != null) {
             mStopTimeoutFuture.cancel(true);
             mStopTimeoutFuture = null;
         }
-        mMediaCodecCallback = new MediaCodecCallback();
-        mMediaCodec.setCallback(mMediaCodecCallback);
+        mMediaCodec.setCallback(new MediaCodecCallback());
         mMediaCodec.configure(mMediaFormat, null, null, MediaCodec.CONFIGURE_FLAG_ENCODE);
 
         if (mEncoderInput instanceof SurfaceInput) {
@@ -516,15 +515,13 @@
             Futures.successfulAsList(futures).addListener(this::signalEndOfInputStream,
                     mEncoderExecutor);
         } else if (mEncoderInput instanceof SurfaceInput) {
-            if (DeviceQuirks.get(MediaCodecDoesNotSendEos.class) != null) {
-                requireNonNull(mMediaCodecCallback).onOutputBufferAvailable(mMediaCodec,
-                        FAKE_BUFFER_INDEX, createFakeEosBufferInfo());
-            } else {
-                try {
-                    mMediaCodec.signalEndOfInputStream();
-                } catch (MediaCodec.CodecException e) {
-                    handleEncodeError(e);
-                }
+            try {
+                mMediaCodec.signalEndOfInputStream();
+                // On some devices, MediaCodec#signalEndOfInputStream() doesn't work.
+                // See b/255209101.
+                mMediaCodecEosSignalled = true;
+            } catch (MediaCodec.CodecException e) {
+                handleEncodeError(e);
             }
         }
     }
@@ -891,7 +888,7 @@
 
     @SuppressWarnings("WeakerAccess") // synthetic accessor
     @ExecutedBy("mEncoderExecutor")
-    long getAdjustedTimeUs(@NonNull MediaCodec.BufferInfo bufferInfo) {
+    long getAdjustedTimeUs(@NonNull BufferInfo bufferInfo) {
         long adjustedTimeUs;
         if (mTotalPausedDurationUs > 0L) {
             adjustedTimeUs = bufferInfo.presentationTimeUs - mTotalPausedDurationUs;
@@ -953,13 +950,6 @@
         }
     }
 
-    @NonNull
-    private MediaCodec.BufferInfo createFakeEosBufferInfo() {
-        MediaCodec.BufferInfo bufferInfo = new MediaCodec.BufferInfo();
-        bufferInfo.set(0, 0, generatePresentationTimeUs(), MediaCodec.BUFFER_FLAG_END_OF_STREAM);
-        return bufferInfo;
-    }
-
     @SuppressWarnings("WeakerAccess") // synthetic accessor
     @ExecutedBy("mEncoderExecutor")
     void matchAcquisitionsAndFreeBufferIndexes() {
@@ -997,12 +987,12 @@
     }
 
     @SuppressWarnings("WeakerAccess") // synthetic accessor
-    static boolean isKeyFrame(@NonNull MediaCodec.BufferInfo bufferInfo) {
+    static boolean isKeyFrame(@NonNull BufferInfo bufferInfo) {
         return (bufferInfo.flags & MediaCodec.BUFFER_FLAG_KEY_FRAME) != 0;
     }
 
     @SuppressWarnings("WeakerAccess") // synthetic accessor
-    static boolean isEndOfStream(@NonNull MediaCodec.BufferInfo bufferInfo) {
+    static boolean hasEndOfStreamFlag(@NonNull BufferInfo bufferInfo) {
         return (bufferInfo.flags & MediaCodec.BUFFER_FLAG_END_OF_STREAM) != 0;
     }
 
@@ -1021,7 +1011,7 @@
          * The last sent presentation time of BufferInfo. The value could be adjusted by total
          * pause duration.
          */
-        private long mLastSentPresentationTimeUs = 0L;
+        private long mLastSentAdjustedTimeUs = 0L;
         private boolean mIsOutputBufferInPauseState = false;
         private boolean mIsKeyFrameRequired = false;
 
@@ -1065,7 +1055,7 @@
 
         @Override
         public void onOutputBufferAvailable(@NonNull MediaCodec mediaCodec, int index,
-                @NonNull MediaCodec.BufferInfo bufferInfo) {
+                @NonNull BufferInfo bufferInfo) {
             mEncoderExecutor.execute(() -> {
                 switch (mState) {
                     case STARTED:
@@ -1099,22 +1089,11 @@
                             if (!mHasFirstData) {
                                 mHasFirstData = true;
                             }
-                            long adjustedTimeUs = getAdjustedTimeUs(bufferInfo);
-                            if (bufferInfo.presentationTimeUs != adjustedTimeUs) {
-                                // If adjusted time <= last sent time, the buffer should have been
-                                // detected and dropped in checkBufferInfo().
-                                Preconditions.checkState(
-                                        adjustedTimeUs > mLastSentPresentationTimeUs);
-                                bufferInfo.presentationTimeUs = adjustedTimeUs;
-                                if (DEBUG) {
-                                    Logger.d(mTag, "Adjust bufferInfo.presentationTimeUs to "
-                                            + DebugUtils.readableUs(adjustedTimeUs));
-                                }
-                            }
-                            mLastSentPresentationTimeUs = bufferInfo.presentationTimeUs;
+                            BufferInfo outBufferInfo = resolveOutputBufferInfo(bufferInfo);
+                            mLastSentAdjustedTimeUs = outBufferInfo.presentationTimeUs;
                             try {
                                 EncodedDataImpl encodedData = new EncodedDataImpl(mediaCodec, index,
-                                        bufferInfo);
+                                        outBufferInfo);
                                 sendEncodedData(encodedData, encoderCallback, executor);
                             } catch (MediaCodec.CodecException e) {
                                 handleEncodeError(e);
@@ -1160,6 +1139,26 @@
         }
 
         @ExecutedBy("mEncoderExecutor")
+        @NonNull
+        private BufferInfo resolveOutputBufferInfo(@NonNull BufferInfo bufferInfo) {
+            long adjustedTimeUs = getAdjustedTimeUs(bufferInfo);
+            if (bufferInfo.presentationTimeUs == adjustedTimeUs) {
+                return bufferInfo;
+            }
+
+            // If adjusted time <= last sent time, the buffer should have been detected and
+            // dropped in checkBufferInfo().
+            Preconditions.checkState(adjustedTimeUs > mLastSentAdjustedTimeUs);
+            if (DEBUG) {
+                Logger.d(mTag, "Adjust bufferInfo.presentationTimeUs to "
+                        + DebugUtils.readableUs(adjustedTimeUs));
+            }
+            BufferInfo newBufferInfo = new BufferInfo();
+            newBufferInfo.set(bufferInfo.offset, bufferInfo.size, adjustedTimeUs, bufferInfo.flags);
+            return newBufferInfo;
+        }
+
+        @ExecutedBy("mEncoderExecutor")
         private void sendEncodedData(@NonNull EncodedDataImpl encodedData,
                 @NonNull EncoderCallback callback, @NonNull Executor executor) {
             mEncodedDataSet.add(encodedData);
@@ -1191,12 +1190,12 @@
         }
 
         /**
-         * Checks the {@link android.media.MediaCodec.BufferInfo} and updates related states.
+         * Checks the {@link BufferInfo} and updates related states.
          *
          * @return {@code true} if the buffer is valid, otherwise {@code false}.
          */
         @ExecutedBy("mEncoderExecutor")
-        private boolean checkBufferInfo(@NonNull MediaCodec.BufferInfo bufferInfo) {
+        private boolean checkBufferInfo(@NonNull BufferInfo bufferInfo) {
             if (mHasEndData) {
                 Logger.d(mTag, "Drop buffer by already reach end of stream.");
                 return false;
@@ -1251,7 +1250,7 @@
             }
 
             // We should check if the adjusted time is valid. see b/189114207.
-            if (getAdjustedTimeUs(bufferInfo) <= mLastSentPresentationTimeUs) {
+            if (getAdjustedTimeUs(bufferInfo) <= mLastSentAdjustedTimeUs) {
                 Logger.d(mTag, "Drop buffer by adjusted time is less than the last sent time.");
                 if (mIsVideoEncoder && isKeyFrame(bufferInfo)) {
                     mIsKeyFrameRequired = true;
@@ -1275,10 +1274,21 @@
             return true;
         }
 
+        @ExecutedBy("mEncoderExecutor")
+        private boolean isEndOfStream(@NonNull BufferInfo bufferInfo) {
+            return hasEndOfStreamFlag(bufferInfo) || isEosSignalledAndStopTimeReached(bufferInfo);
+        }
+
+        @ExecutedBy("mEncoderExecutor")
+        private boolean isEosSignalledAndStopTimeReached(@NonNull BufferInfo bufferInfo) {
+            return mMediaCodecEosSignalled
+                    && bufferInfo.presentationTimeUs > mStartStopTimeRangeUs.getUpper();
+        }
+
         @SuppressWarnings("StatementWithEmptyBody") // to better organize the logic and comments
         @ExecutedBy("mEncoderExecutor")
         private boolean updatePauseRangeStateAndCheckIfBufferPaused(
-                @NonNull MediaCodec.BufferInfo bufferInfo) {
+                @NonNull BufferInfo bufferInfo) {
             updateTotalPausedDuration(bufferInfo.presentationTimeUs);
             boolean isInPauseRange = isInPauseRange(bufferInfo.presentationTimeUs);
             if (!mIsOutputBufferInPauseState && isInPauseRange) {

diff --git a/camera/camera-view/src/androidTest/java/androidx/camera/view/PreviewViewDeviceTest.kt b/camera/camera-view/src/androidTest/java/androidx/camera/view/PreviewViewDeviceTest.kt
index d342afa..c553bc3 100644
--- a/camera/camera-view/src/androidTest/java/androidx/camera/view/PreviewViewDeviceTest.kt
+++ b/camera/camera-view/src/androidTest/java/androidx/camera/view/PreviewViewDeviceTest.kt

@@ -1072,7 +1072,7 @@
         val surfaceRequest = SurfaceRequest(
             DEFAULT_SURFACE_SIZE, fakeCamera,
             isRGBA8888Required
-        )
+        ) {}
         surfaceRequestList.add(surfaceRequest)
         return surfaceRequest
     }

diff --git a/camera/camera-view/src/androidTest/java/androidx/camera/view/SurfaceViewImplementationTest.kt b/camera/camera-view/src/androidTest/java/androidx/camera/view/SurfaceViewImplementationTest.kt
index 0401800..3e0fede 100644
--- a/camera/camera-view/src/androidTest/java/androidx/camera/view/SurfaceViewImplementationTest.kt
+++ b/camera/camera-view/src/androidTest/java/androidx/camera/view/SurfaceViewImplementationTest.kt

@@ -68,7 +68,7 @@
         mParent = FrameLayout(mContext)
         setContentView(mParent)
 
-        mSurfaceRequest = SurfaceRequest(ANY_SIZE, FakeCamera(), false)
+        mSurfaceRequest = SurfaceRequest(ANY_SIZE, FakeCamera(), false) {}
         mImplementation = SurfaceViewImplementation(mParent, PreviewTransformation())
     }
 
@@ -92,7 +92,7 @@
         val previousSurfaceView = mImplementation.mSurfaceView
 
         // Act.
-        val sameResolutionSurfaceRequest = SurfaceRequest(ANY_SIZE, FakeCamera(), false)
+        val sameResolutionSurfaceRequest = SurfaceRequest(ANY_SIZE, FakeCamera(), false) {}
         mImplementation.testSurfaceRequest(sameResolutionSurfaceRequest)
         val newSurfaceView = mImplementation.mSurfaceView
 
@@ -109,7 +109,8 @@
 
         // Act.
         val differentSize: Size by lazy { Size(720, 480) }
-        val differentResolutionSurfaceRequest = SurfaceRequest(differentSize, FakeCamera(), false)
+        val differentResolutionSurfaceRequest =
+            SurfaceRequest(differentSize, FakeCamera(), false) {}
         mImplementation.testSurfaceRequest(differentResolutionSurfaceRequest)
         val newSurfaceView = mImplementation.mSurfaceView
 

diff --git a/camera/camera-view/src/androidTest/java/androidx/camera/view/TextureViewImplementationTest.kt b/camera/camera-view/src/androidTest/java/androidx/camera/view/TextureViewImplementationTest.kt
index f69e55e..c6998bd 100644
--- a/camera/camera-view/src/androidTest/java/androidx/camera/view/TextureViewImplementationTest.kt
+++ b/camera/camera-view/src/androidTest/java/androidx/camera/view/TextureViewImplementationTest.kt

@@ -50,7 +50,7 @@
     private val surfaceRequest: SurfaceRequest
         get() {
             if (_surfaceRequest == null) {
-                _surfaceRequest = SurfaceRequest(ANY_SIZE, FakeCamera(), false)
+                _surfaceRequest = SurfaceRequest(ANY_SIZE, FakeCamera(), false) {}
             }
             return _surfaceRequest!!
         }

diff --git a/camera/camera-view/src/main/java/androidx/camera/view/PreviewView.java b/camera/camera-view/src/main/java/androidx/camera/view/PreviewView.java
index 8963ecc..1d141c6 100644
--- a/camera/camera-view/src/main/java/androidx/camera/view/PreviewView.java
+++ b/camera/camera-view/src/main/java/androidx/camera/view/PreviewView.java

@@ -1006,8 +1006,10 @@
         if (mImplementation instanceof TextureViewImplementation) {
             matrix.postConcat(getMatrix());
         } else {
-            Logger.w(TAG, "PreviewView needs to be in COMPATIBLE mode for the transform"
-                    + " to work correctly.");
+            if (!getMatrix().isIdentity()) {
+                Logger.w(TAG, "PreviewView needs to be in COMPATIBLE mode for the transform"
+                        + " to work correctly.");
+            }
         }
 
         return new OutputTransform(matrix, new Size(surfaceCropRect.width(),

diff --git a/camera/camera-view/src/main/java/androidx/camera/view/SurfaceViewImplementation.java b/camera/camera-view/src/main/java/androidx/camera/view/SurfaceViewImplementation.java
index f2d3255..dcd4fec 100644
--- a/camera/camera-view/src/main/java/androidx/camera/view/SurfaceViewImplementation.java
+++ b/camera/camera-view/src/main/java/androidx/camera/view/SurfaceViewImplementation.java

@@ -77,6 +77,12 @@
                     ContextCompat.getMainExecutor(mSurfaceView.getContext()),
                     onSurfaceNotInUseListener::onSurfaceNotInUse);
         }
+
+        // Note that View.post will add the Runnable to SurfaceView's message queue. This means
+        // that if this line is called while the SurfaceView is detached from window,
+        // "setSurfaceRequest" will be pending til the SurfaceView is attached to window and its
+        // view is prepared. In other words, "setSurfaceRequest" will happen after
+        // "surfaceCreated" is triggered.
         mSurfaceView.post(() -> mSurfaceRequestCallback.setSurfaceRequest(surfaceRequest,
                 onSurfaceNotInUseListener));
     }
@@ -161,6 +167,9 @@
         private SurfaceRequest mSurfaceRequest;
 
         @Nullable
+        private SurfaceRequest mSurfaceRequestToBeInvalidated;
+
+        @Nullable
         private OnSurfaceNotInUseListener mOnSurfaceNotInUseListener;
 
         // The cached size of the current Surface.
@@ -171,6 +180,8 @@
         // Guarded by the UI thread.
         private boolean mWasSurfaceProvided = false;
 
+        private boolean mNeedToInvalidate = false;
+
         /**
          * Sets the completer and the size. The completer will only be set if the current size of
          * the Surface matches the target size.
@@ -181,17 +192,29 @@
             // Cancel the previous request, if any
             cancelPreviousRequest();
 
-            mSurfaceRequest = surfaceRequest;
-            mOnSurfaceNotInUseListener = onSurfaceNotInUseListener;
-            Size targetSize = surfaceRequest.getResolution();
-            mTargetSize = targetSize;
-            mWasSurfaceProvided = false;
+            if (mNeedToInvalidate) {
+                // In some edge cases, the DeferrableSurface behind the SurfaceRequest is timed-out.
+                // Since we can not tell if the timeout happened, we invalidate the
+                // SurfaceRequest to get a new one when the situation is abnormal. (Normally,
+                // invalidate is called when the surface is recreated.)
+                // It's not ideal to track the "timed out" state of the SurfaceRequest this way.
+                // A better way would be making it part of SurfaceRequest. e.g. something like
+                // SurfaceRequest.isTimedOut().
+                mNeedToInvalidate = false;
+                surfaceRequest.invalidate();
+            } else {
+                mSurfaceRequest = surfaceRequest;
+                mOnSurfaceNotInUseListener = onSurfaceNotInUseListener;
+                Size targetSize = surfaceRequest.getResolution();
+                mTargetSize = targetSize;
+                mWasSurfaceProvided = false;
 
-            if (!tryToComplete()) {
-                // The current size is incorrect. Wait for it to change.
-                Logger.d(TAG, "Wait for new Surface creation.");
-                mSurfaceView.getHolder().setFixedSize(targetSize.getWidth(),
-                        targetSize.getHeight());
+                if (!tryToComplete()) {
+                    // The current size is incorrect. Wait for it to change.
+                    Logger.d(TAG, "Wait for new Surface creation.");
+                    mSurfaceView.getHolder().setFixedSize(targetSize.getWidth(),
+                            targetSize.getHeight());
+                }
             }
         }
 
@@ -239,9 +262,9 @@
 
         @UiThread
         @SuppressWarnings("ObjectToString")
-        private void invalidateSurface() {
+        private void closeSurface() {
             if (mSurfaceRequest != null) {
-                Logger.d(TAG, "Surface invalidated " + mSurfaceRequest);
+                Logger.d(TAG, "Surface closed " + mSurfaceRequest);
                 mSurfaceRequest.getDeferrableSurface().close();
             }
         }
@@ -249,7 +272,14 @@
         @Override
         public void surfaceCreated(@NonNull SurfaceHolder surfaceHolder) {
             Logger.d(TAG, "Surface created.");
-            // No-op. Handling surfaceChanged() is enough because it's always called afterwards.
+
+            // Invalidate the surface request so that the requester is notified that the previously
+            // obtained surface is no longer valid and should request a new one.
+            if (mNeedToInvalidate && mSurfaceRequestToBeInvalidated != null) {
+                mSurfaceRequestToBeInvalidated.invalidate();
+                mSurfaceRequestToBeInvalidated = null;
+                mNeedToInvalidate = false;
+            }
         }
 
         @Override
@@ -264,14 +294,21 @@
         public void surfaceDestroyed(@NonNull SurfaceHolder surfaceHolder) {
             Logger.d(TAG, "Surface destroyed.");
 
-            // If a surface was already provided to the camera, invalidate it so that it requests
-            // a new valid one. Otherwise, cancel the surface request.
+            // If a surface was already provided to the camera, close the surface. Otherwise,
+            // cancel the surface request.
             if (mWasSurfaceProvided) {
-                invalidateSurface();
+                closeSurface();
             } else {
                 cancelPreviousRequest();
             }
 
+            // The surface is no longer valid. The surface request will be invalidated when the new
+            // surface is ready so that the requester can get the new one.
+            mNeedToInvalidate = true;
+            if (mSurfaceRequest != null) {
+                mSurfaceRequestToBeInvalidated = mSurfaceRequest;
+            }
+
             // Reset state
             mWasSurfaceProvided = false;
             mSurfaceRequest = null;

diff --git a/camera/camera-view/src/test/java/androidx/camera/view/PreviewViewTest.java b/camera/camera-view/src/test/java/androidx/camera/view/PreviewViewTest.java
index 0ca07ad..804de8a 100644
--- a/camera/camera-view/src/test/java/androidx/camera/view/PreviewViewTest.java
+++ b/camera/camera-view/src/test/java/androidx/camera/view/PreviewViewTest.java

@@ -140,6 +140,6 @@
         cameraInfoInternal.setImplementationType(CameraInfo.IMPLEMENTATION_TYPE_CAMERA2);
         return new SurfaceRequest(new Size(800, 600),
                 new FakeCamera(null, cameraInfoInternal),
-                /*isRGB8888Required*/ false);
+                /*isRGB8888Required*/ false, () -> {});
     }
 }

diff --git a/camera/integration-tests/uiwidgetstestapp/src/androidTest/java/androidx/camera/integration/uiwidgets/viewpager/ViewPager2ActivityTest.kt b/camera/integration-tests/uiwidgetstestapp/src/androidTest/java/androidx/camera/integration/uiwidgets/viewpager/ViewPager2ActivityTest.kt
index 9f5d0e3..4930577 100644
--- a/camera/integration-tests/uiwidgetstestapp/src/androidTest/java/androidx/camera/integration/uiwidgets/viewpager/ViewPager2ActivityTest.kt
+++ b/camera/integration-tests/uiwidgetstestapp/src/androidTest/java/androidx/camera/integration/uiwidgets/viewpager/ViewPager2ActivityTest.kt

@@ -25,6 +25,8 @@
 import androidx.camera.camera2.pipe.integration.CameraPipeConfig
 import androidx.camera.core.CameraSelector
 import androidx.camera.integration.uiwidgets.R
+import androidx.camera.integration.uiwidgets.viewpager.BaseActivity.Companion.COMPATIBLE_MODE
+import androidx.camera.integration.uiwidgets.viewpager.BaseActivity.Companion.PERFORMANCE_MODE
 import androidx.camera.lifecycle.ProcessCameraProvider
 import androidx.camera.testing.CameraPipeConfigTestRule
 import androidx.camera.testing.CameraUtil
@@ -57,27 +59,37 @@
 
 @RunWith(Parameterized::class)
 @LargeTest
-class ViewPager2ActivityTest(private val lensFacing: Int, private val cameraXConfig: String) {
+class ViewPager2ActivityTest(
+    private val lensFacing: Int,
+    private val implementationMode: Int,
+    private val cameraXConfig: String
+) {
 
     companion object {
         private const val ACTION_IDLE_TIMEOUT: Long = 5000
+        private const val PREVIEW_UPDATE_COUNT = 10
 
         @JvmStatic
         private val lensFacingList =
             arrayOf(CameraSelector.LENS_FACING_BACK, CameraSelector.LENS_FACING_FRONT)
 
         @JvmStatic
+        private val implementationModeList = arrayOf(COMPATIBLE_MODE, PERFORMANCE_MODE)
+
+        @JvmStatic
         private val cameraXConfigList = arrayOf(
             CameraFragment.CAMERA2_IMPLEMENTATION_OPTION,
             CameraFragment.CAMERA_PIPE_IMPLEMENTATION_OPTION
         )
 
         @JvmStatic
-        @Parameterized.Parameters(name = "lensFacing={0}, cameraXConfig={1}")
+        @Parameterized.Parameters(name = "lensFacing={0}, mode={1}, cameraXConfig={2}")
         fun data() = mutableListOf<Array<Any?>>().apply {
             lensFacingList.forEach { lens ->
-                cameraXConfigList.forEach { cameraXConfig ->
-                    add(arrayOf(lens, cameraXConfig))
+                implementationModeList.forEach { mode ->
+                    cameraXConfigList.forEach { cameraXConfig ->
+                        add(arrayOf(lens, mode, cameraXConfig))
+                    }
                 }
             }
         }
@@ -139,7 +151,7 @@
 
             assertStreamState(scenario, PreviewView.StreamState.STREAMING)
             // Make sure the surface texture of TextureView continues getting updates.
-            assertSurfaceTextureFramesUpdate(scenario)
+            assertPreviewViewUpdate(scenario)
         }
     }
 
@@ -161,7 +173,7 @@
 
             // For b/149877652, need to check if the surface texture of TextureView continues
             // getting updates after detaching from window and then attaching to window.
-            assertSurfaceTextureFramesUpdate(scenario)
+            assertPreviewViewUpdate(scenario)
         }
     }
 
@@ -188,7 +200,7 @@
 
             // The test covers pause/resume and ViewPager2 switch behaviors. Hence, need to
             // check the surface texture of TextureView continues getting updates for b/149877652.
-            assertSurfaceTextureFramesUpdate(scenario)
+            assertPreviewViewUpdate(scenario)
         }
     }
 
@@ -198,14 +210,15 @@
     ):
         ActivityScenario<ViewPager2Activity> {
             val intent = Intent(
-                ApplicationProvider.getApplicationContext<Context>(),
+                ApplicationProvider.getApplicationContext(),
                 ViewPager2Activity::class.java
             ).apply {
                 putExtra(BaseActivity.INTENT_LENS_FACING, lensFacing)
+                putExtra(BaseActivity.INTENT_IMPLEMENTATION_MODE, implementationMode)
                 putExtra(CameraFragment.KEY_CAMERA_IMPLEMENTATION, cameraXConfig)
                 putExtra(CameraFragment.KEY_CAMERA_IMPLEMENTATION_NO_HISTORY, true)
             }
-            return ActivityScenario.launch<ViewPager2Activity>(intent)
+            return ActivityScenario.launch(intent)
         }
 
     private fun getTextureView(previewView: PreviewView): TextureView? {
@@ -238,6 +251,14 @@
         assertThat(result.await()).isTrue()
     }
 
+    private fun assertPreviewViewUpdate(scenario: ActivityScenario<ViewPager2Activity>) {
+        when (implementationMode) {
+            COMPATIBLE_MODE -> assertSurfaceTextureFramesUpdate(scenario)
+            PERFORMANCE_MODE -> assertPreviewUpdate(scenario)
+            else -> throw IllegalArgumentException()
+        }
+    }
+
     private fun assertSurfaceTextureFramesUpdate(scenario: ActivityScenario<ViewPager2Activity>) {
         var newSurfaceTexture: SurfaceTexture? = null
         lateinit var previewView: PreviewView
@@ -253,4 +274,24 @@
         }
         assertThat(latchForFrameUpdate.await(ACTION_IDLE_TIMEOUT, TimeUnit.MILLISECONDS)).isTrue()
     }
+
+    /**
+     * Checks update from Preview instead of SurfaceView, since the SurfaceView's content can not
+     * be got.
+     */
+    private fun assertPreviewUpdate(scenario: ActivityScenario<ViewPager2Activity>) {
+        val latch = CountDownLatch(PREVIEW_UPDATE_COUNT)
+        getCameraFragment(scenario)?.setPreviewUpdatingLatch(latch)
+        assertThat(latch.await(ACTION_IDLE_TIMEOUT, TimeUnit.MILLISECONDS)).isTrue()
+    }
+
+    private fun getCameraFragment(scenario: ActivityScenario<ViewPager2Activity>): CameraFragment? {
+        var fragment: CameraFragment? = null
+        scenario.onActivity { activity ->
+            val fragments = activity.supportFragmentManager.fragments
+            fragment = fragments.firstOrNull { it is CameraFragment } as? CameraFragment
+        }
+
+        return fragment
+    }
 }

diff --git a/camera/integration-tests/uiwidgetstestapp/src/main/java/androidx/camera/integration/uiwidgets/viewpager/BaseActivity.kt b/camera/integration-tests/uiwidgetstestapp/src/main/java/androidx/camera/integration/uiwidgets/viewpager/BaseActivity.kt
index 32047a0..2a54dfc 100644
--- a/camera/integration-tests/uiwidgetstestapp/src/main/java/androidx/camera/integration/uiwidgets/viewpager/BaseActivity.kt
+++ b/camera/integration-tests/uiwidgetstestapp/src/main/java/androidx/camera/integration/uiwidgets/viewpager/BaseActivity.kt

@@ -31,6 +31,9 @@
         private const val TAG = "BasicActivity"
         private const val LATCH_TIMEOUT: Long = 5000
         internal const val INTENT_LENS_FACING = "lens-facing"
+        internal const val INTENT_IMPLEMENTATION_MODE = "implementation-mode"
+        internal const val PERFORMANCE_MODE = 0
+        internal const val COMPATIBLE_MODE = 1
     }
 
     // The expected final streamState

diff --git a/camera/integration-tests/uiwidgetstestapp/src/main/java/androidx/camera/integration/uiwidgets/viewpager/CameraFragment.kt b/camera/integration-tests/uiwidgetstestapp/src/main/java/androidx/camera/integration/uiwidgets/viewpager/CameraFragment.kt
index 4e6ae5b..964d3d8 100644
--- a/camera/integration-tests/uiwidgetstestapp/src/main/java/androidx/camera/integration/uiwidgets/viewpager/CameraFragment.kt
+++ b/camera/integration-tests/uiwidgetstestapp/src/main/java/androidx/camera/integration/uiwidgets/viewpager/CameraFragment.kt

@@ -18,6 +18,9 @@
 
 import android.content.Context
 import android.content.Intent
+import android.hardware.camera2.CameraCaptureSession
+import android.hardware.camera2.CaptureRequest
+import android.hardware.camera2.TotalCaptureResult
 import android.os.Bundle
 import android.text.TextUtils
 import android.util.Log
@@ -25,18 +28,24 @@
 import android.view.View
 import android.view.ViewGroup
 import androidx.annotation.OptIn
+import androidx.annotation.VisibleForTesting
 import androidx.camera.camera2.Camera2Config
+import androidx.camera.camera2.interop.Camera2Interop
+import androidx.camera.camera2.interop.ExperimentalCamera2Interop
 import androidx.camera.camera2.pipe.integration.CameraPipeConfig
 import androidx.camera.core.CameraSelector
 import androidx.camera.core.Preview
 import androidx.camera.integration.uiwidgets.databinding.FragmentTextureviewBinding
+import androidx.camera.integration.uiwidgets.viewpager.BaseActivity.Companion.COMPATIBLE_MODE
+import androidx.camera.integration.uiwidgets.viewpager.BaseActivity.Companion.PERFORMANCE_MODE
 import androidx.camera.lifecycle.ExperimentalCameraProviderConfiguration
 import androidx.camera.lifecycle.ProcessCameraProvider
-import androidx.camera.view.PreviewView
+import androidx.camera.view.PreviewView.ImplementationMode
 import androidx.core.content.ContextCompat
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.Lifecycle
 import com.google.common.util.concurrent.ListenableFuture
+import java.util.concurrent.CountDownLatch
 
 /** A Fragment that displays a {@link PreviewView} with TextureView mode. */
 class CameraFragment : Fragment() {
@@ -57,6 +66,9 @@
     private lateinit var cameraProviderFuture: ListenableFuture<ProcessCameraProvider>
     private lateinit var cameraProvider: ProcessCameraProvider
 
+    // for testing preview updates
+    private var previewUpdatingLatch: CountDownLatch? = null
+
     @OptIn(ExperimentalCameraProviderConfiguration::class)
     override fun onAttach(context: Context) {
         super.onAttach(context)
@@ -128,13 +140,15 @@
     private fun bindPreview() {
         Log.d(TAG, "bindPreview")
 
-        val preview = Preview.Builder()
+        val previewBuilder = Preview.Builder()
+        previewBuilder.addCaptureCompletedCallback()
+        val preview = previewBuilder
             .setTargetName("Preview")
             .build()
 
         cameraProvider.bindToLifecycle(this, getCameraSelector(), preview)
 
-        binding.previewTextureview.implementationMode = PreviewView.ImplementationMode.COMPATIBLE
+        binding.previewTextureview.implementationMode = getImplementationMode()
         preview.setSurfaceProvider(binding.previewTextureview.surfaceProvider)
     }
 
@@ -148,4 +162,46 @@
             .requireLensFacing(lensFacing)
             .build()
     }
+
+    /**
+     * Returns the implementation mode from the intent, or return the compatibility mode if not set.
+     */
+    private fun getImplementationMode(): ImplementationMode {
+        val mode = (requireActivity() as BaseActivity).intent.getIntExtra(
+            BaseActivity.INTENT_IMPLEMENTATION_MODE, COMPATIBLE_MODE
+        )
+
+        return when (mode) {
+            PERFORMANCE_MODE -> ImplementationMode.PERFORMANCE
+            else -> ImplementationMode.COMPATIBLE
+        }
+    }
+
+    /**
+     * Implements preview updating latch with interop to workaround the situation that SurfaceView's
+     * content can not be got.
+     */
+    @OptIn(ExperimentalCamera2Interop::class)
+    private fun Preview.Builder.addCaptureCompletedCallback() {
+        val captureCallback = object : CameraCaptureSession.CaptureCallback() {
+            override fun onCaptureCompleted(
+                session: CameraCaptureSession,
+                request: CaptureRequest,
+                result: TotalCaptureResult
+            ) {
+                super.onCaptureCompleted(session, request, result)
+
+                if (previewUpdatingLatch != null) {
+                    previewUpdatingLatch!!.countDown()
+                }
+            }
+        }
+
+        Camera2Interop.Extender(this).setSessionCaptureCallback(captureCallback)
+    }
+
+    @VisibleForTesting
+    fun setPreviewUpdatingLatch(latch: CountDownLatch) {
+        previewUpdatingLatch = latch
+    }
 }

diff --git a/car/app/app-automotive/src/main/java/androidx/car/app/hardware/info/AutomotiveCarInfo.java b/car/app/app-automotive/src/main/java/androidx/car/app/hardware/info/AutomotiveCarInfo.java
index eeefe36..b451e89 100644
--- a/car/app/app-automotive/src/main/java/androidx/car/app/hardware/info/AutomotiveCarInfo.java
+++ b/car/app/app-automotive/src/main/java/androidx/car/app/hardware/info/AutomotiveCarInfo.java

@@ -35,6 +35,7 @@
 import static android.car.VehiclePropertyIds.RANGE_REMAINING;
 
 import static androidx.annotation.RestrictTo.Scope.LIBRARY;
+import static androidx.car.app.hardware.common.CarValue.STATUS_UNKNOWN;
 import static androidx.car.app.hardware.common.CarValueUtils.getCarValue;
 
 import static java.util.Objects.requireNonNull;
@@ -97,7 +98,6 @@
     // VEHICLE_SPEED_DISPLAY_UNIT in VehiclePropertyIds. The property is added after Android Q.
     public static final int SPEED_DISPLAY_UNIT_ID = 289408516;
 
-    private static final float UNKNOWN_CAPACITY = Float.NEGATIVE_INFINITY;
     static final ImmutableMap<Integer, List<CarZone>> ENERGY_LEVEL_REQUEST = ImmutableMap.<Integer,
                     List<CarZone>>builder()
             .put(EV_BATTERY_LEVEL, GLOBAL_CAR_ZONE)
@@ -284,14 +284,12 @@
                 return;
             }
             for (CarPropertyResponse<?> carPropertyResponse : carPropertyResponses) {
-                if (carPropertyResponse.getPropertyId() == INFO_EV_BATTERY_CAPACITY
-                        && carPropertyResponse.getValue() != null) {
-                    energyLevelListener.updateEvBatteryCapacity(
-                            (Float) carPropertyResponse.getValue());
+                if (carPropertyResponse.getPropertyId() == INFO_EV_BATTERY_CAPACITY) {
+                    energyLevelListener.updateEvBatteryCapacityPropertyResponse(
+                            carPropertyResponse);
                 }
-                if (carPropertyResponse.getPropertyId() == INFO_FUEL_CAPACITY
-                        && carPropertyResponse.getValue() != null) {
-                    energyLevelListener.updateFuelCapacity((Float) carPropertyResponse.getValue());
+                if (carPropertyResponse.getPropertyId() == INFO_FUEL_CAPACITY) {
+                    energyLevelListener.updateFuelCapacityPropertyResponse(carPropertyResponse);
                 }
             }
         }, executor);
@@ -563,20 +561,25 @@
         private final OnCarDataAvailableListener<EnergyLevel>
                 mEnergyLevelOnCarDataAvailableListener;
         private final Executor mExecutor;
-        private float mEvBatteryCapacity = UNKNOWN_CAPACITY;
-        private float mFuelCapacity = UNKNOWN_CAPACITY;
+        private CarPropertyResponse<?> mEvBatteryCapacityPropertyResponse = CarPropertyResponse
+                .builder().setPropertyId(INFO_EV_BATTERY_CAPACITY).setStatus(STATUS_UNKNOWN)
+                .build();
+        private CarPropertyResponse<?> mFuelCapacityPropertyResponse = CarPropertyResponse.builder()
+                .setPropertyId(INFO_FUEL_CAPACITY).setStatus(STATUS_UNKNOWN).build();
 
         EnergyLevelListener(OnCarDataAvailableListener<EnergyLevel> listener, Executor executor) {
             mEnergyLevelOnCarDataAvailableListener = listener;
             mExecutor = executor;
         }
 
-        void updateEvBatteryCapacity(float evBatteryCapacity) {
-            mEvBatteryCapacity = evBatteryCapacity;
+        void updateEvBatteryCapacityPropertyResponse(
+                CarPropertyResponse<?> evBatteryCapacityPropertyResponse) {
+            mEvBatteryCapacityPropertyResponse = evBatteryCapacityPropertyResponse;
         }
 
-        void updateFuelCapacity(float fuelCapacity) {
-            mFuelCapacity = fuelCapacity;
+        void updateFuelCapacityPropertyResponse(
+                CarPropertyResponse<?> fuelCapacityPropertyResponse) {
+            mFuelCapacityPropertyResponse = fuelCapacityPropertyResponse;
         }
 
         // TODO(b/202303614): Remove this annotation once FuelVolumeDisplayUnit is ready.
@@ -589,29 +592,27 @@
                 for (CarPropertyResponse<?> response : carPropertyResponses) {
                     switch (response.getPropertyId()) {
                         case EV_BATTERY_LEVEL:
-                            if (mEvBatteryCapacity == UNKNOWN_CAPACITY) {
-                                Log.w(LogTags.TAG_CAR_HARDWARE, "EV battery capacity is still "
-                                        + "unknown, skipping EV_BATTERY_LEVEL update");
-                                continue;
-                            }
-                            if (response.getValue() != null) {
-                                energyLevelBuilder.setBatteryPercent(getCarValue(response,
-                                        (Float) response.getValue() / mEvBatteryCapacity * 100));
-                            } else {
+                            if (response.getValue() == null) {
                                 energyLevelBuilder.setBatteryPercent(getCarValue(response));
+                            } else if (mEvBatteryCapacityPropertyResponse.getValue() == null) {
+                                energyLevelBuilder.setBatteryPercent(
+                                        getCarValue(mEvBatteryCapacityPropertyResponse));
+                            } else {
+                                energyLevelBuilder.setBatteryPercent(getCarValue(response,
+                                        (Float) response.getValue() / (Float)
+                                        mEvBatteryCapacityPropertyResponse.getValue() * 100));
                             }
                             break;
                         case FUEL_LEVEL:
-                            if (mFuelCapacity == UNKNOWN_CAPACITY) {
-                                Log.w(LogTags.TAG_CAR_HARDWARE, "Fuel capacity is still unknown, "
-                                        + "skipping FUEL_LEVEL update");
-                                continue;
-                            }
-                            if (response.getValue() != null) {
-                                energyLevelBuilder.setFuelPercent(getCarValue(response,
-                                        (Float) response.getValue() / mFuelCapacity * 100));
-                            } else {
+                            if (response.getValue() == null) {
                                 energyLevelBuilder.setFuelPercent(getCarValue(response));
+                            } else if (mFuelCapacityPropertyResponse.getValue() == null) {
+                                energyLevelBuilder.setFuelPercent(
+                                        getCarValue(mFuelCapacityPropertyResponse));
+                            } else {
+                                energyLevelBuilder.setFuelPercent(getCarValue(response,
+                                        (Float) response.getValue() / (Float)
+                                        mFuelCapacityPropertyResponse.getValue() * 100));
                             }
                             break;
                         case FUEL_LEVEL_LOW:

diff --git a/car/app/app-automotive/src/test/java/androidx/car/app/hardware/info/AutomotiveCarInfoTest.java b/car/app/app-automotive/src/test/java/androidx/car/app/hardware/info/AutomotiveCarInfoTest.java
index e6818f2..55a1dba 100644
--- a/car/app/app-automotive/src/test/java/androidx/car/app/hardware/info/AutomotiveCarInfoTest.java
+++ b/car/app/app-automotive/src/test/java/androidx/car/app/hardware/info/AutomotiveCarInfoTest.java

@@ -36,6 +36,7 @@
 
 import static androidx.car.app.hardware.common.CarValue.STATUS_SUCCESS;
 import static androidx.car.app.hardware.common.CarValue.STATUS_UNAVAILABLE;
+import static androidx.car.app.hardware.common.CarValue.STATUS_UNIMPLEMENTED;
 import static androidx.car.app.hardware.common.CarValue.STATUS_UNKNOWN;
 import static androidx.car.app.hardware.info.AutomotiveCarInfo.DEFAULT_SAMPLE_RATE;
 import static androidx.car.app.hardware.info.AutomotiveCarInfo.SPEED_DISPLAY_UNIT_ID;
@@ -118,6 +119,62 @@
     private static final List<CarZone> GLOBAL_ZONE = Collections.singletonList(
             CarZone.CAR_ZONE_GLOBAL);
 
+    private static final int METER_DISTANCE_UNIT = 0x21;
+    private static final int METER_VOLUME_UNIT = 0x40;
+    private static final float EV_BATTERY_CAPACITY = 100f;
+    private static final float EV_BATTERY_LEVEL_VALUE = 50f;
+    private static final float FUEL_CAPACITY = 120f;
+    private static final float FUEL_LEVEL_VALUE = 50f;
+    private static final long DEFAULT_TIMESTAMP_MILLIS = 1L;
+    private static final boolean FUEL_LEVEL_LOW_VALUE = true;
+    private static final float RANGE_REMAINING_VALUE = 5f;
+    private static final CarPropertyResponse<?> EV_BATTERY_CAPACITY_RESPONSE_SUCCESS =
+            CarPropertyResponse.builder().setPropertyId(INFO_EV_BATTERY_CAPACITY).setStatus(
+                    STATUS_SUCCESS).setTimestampMillis(DEFAULT_TIMESTAMP_MILLIS).setValue(
+                    EV_BATTERY_CAPACITY).build();
+    private static final CarPropertyResponse<?> FUEL_CAPACITY_RESPONSE_SUCCESS =
+            CarPropertyResponse.builder().setPropertyId(INFO_FUEL_CAPACITY).setStatus(
+                    STATUS_SUCCESS).setTimestampMillis(DEFAULT_TIMESTAMP_MILLIS).setValue(
+                    FUEL_CAPACITY).build();
+    private static final CarPropertyResponse<?> EV_BATTERY_LEVEL_RESPONSE_SUCCESS =
+            CarPropertyResponse.builder().setPropertyId(EV_BATTERY_LEVEL).setStatus(
+                    STATUS_SUCCESS).setValue(EV_BATTERY_LEVEL_VALUE).setTimestampMillis(
+                    DEFAULT_TIMESTAMP_MILLIS).build();
+    private static final CarPropertyResponse<?> FUEL_LEVEL_RESPONSE_SUCCESS =
+            CarPropertyResponse.builder().setPropertyId(FUEL_LEVEL).setStatus(
+                    STATUS_SUCCESS).setValue(FUEL_LEVEL_VALUE).setTimestampMillis(
+                    DEFAULT_TIMESTAMP_MILLIS).build();
+    private static final CarPropertyResponse<?> FUEL_LEVEL_LOW_RESPONSE_SUCCESS =
+            CarPropertyResponse.builder().setPropertyId(FUEL_LEVEL_LOW).setStatus(
+                    STATUS_SUCCESS).setValue(FUEL_LEVEL_LOW_VALUE).setTimestampMillis(
+                    DEFAULT_TIMESTAMP_MILLIS).build();
+    private static final CarPropertyResponse<?> RANGE_REMAINING_RESPONSE_SUCCESS =
+            CarPropertyResponse.builder().setPropertyId(RANGE_REMAINING).setStatus(
+                    STATUS_SUCCESS).setValue(RANGE_REMAINING_VALUE).setTimestampMillis(
+                    DEFAULT_TIMESTAMP_MILLIS).build();
+    private static final CarPropertyResponse<?> DISTANCE_DISPLAY_UNITS_RESPONSE_SUCCESS =
+            CarPropertyResponse.builder().setPropertyId(DISTANCE_DISPLAY_UNITS).setStatus(
+                    STATUS_SUCCESS).setValue(METER_DISTANCE_UNIT).setTimestampMillis(
+                    DEFAULT_TIMESTAMP_MILLIS).build();
+    private static final CarPropertyResponse<?> FUEL_VOLUME_DISPLAY_UNITS_RESPONSE_SUCCESS =
+            CarPropertyResponse.builder().setPropertyId(FUEL_VOLUME_DISPLAY_UNITS).setStatus(
+                    STATUS_SUCCESS).setValue(METER_VOLUME_UNIT).setTimestampMillis(
+                    DEFAULT_TIMESTAMP_MILLIS).build();
+    private static final CarValue<Float> EXPECTED_BATTERY_PERCENT_SUCCESS =
+            new CarValue<>(EV_BATTERY_LEVEL_VALUE / EV_BATTERY_CAPACITY * 100,
+                    DEFAULT_TIMESTAMP_MILLIS, STATUS_SUCCESS);
+    private static final CarValue<Float> EXPECTED_FUEL_PERCENT_SUCCESS =
+            new CarValue<>(FUEL_LEVEL_VALUE / FUEL_CAPACITY * 100, DEFAULT_TIMESTAMP_MILLIS,
+                    STATUS_SUCCESS);
+    private static final CarValue<Boolean> EXPECTED_ENERGY_IS_LOW_SUCCESS =
+            new CarValue<>(FUEL_LEVEL_LOW_VALUE, DEFAULT_TIMESTAMP_MILLIS, STATUS_SUCCESS);
+    private static final CarValue<Float> EXPECTED_RANGE_REMAINING_METERS_SUCCESS =
+            new CarValue<>(RANGE_REMAINING_VALUE, DEFAULT_TIMESTAMP_MILLIS, STATUS_SUCCESS);
+    private static final CarValue<Integer> EXPECTED_DISTANCE_DISPLAY_UNIT_SUCCESS =
+            new CarValue<>(2, DEFAULT_TIMESTAMP_MILLIS, STATUS_SUCCESS);
+    private static final CarValue<Integer> EXPECTED_FUEL_VOLUME_DISPLAY_UNIT_SUCCESS =
+            new CarValue<>(201, DEFAULT_TIMESTAMP_MILLIS, STATUS_SUCCESS);
+
     @Before
     public void setUp() {
         ShadowCar.setCar(mCarMock);
@@ -857,27 +914,15 @@
         assertThat(loadedResult.get()).isEqualTo(new Speed.Builder().build());
     }
 
-    @Test
-    public void getEnergyLevel_verifyResponse() throws InterruptedException {
+    private void getEnergyLevelHelperFunction(List<CarPropertyResponse<?>> energyCapacities,
+            List<CarPropertyResponse<?>> energyResponses, EnergyLevel expectedEnergyLevel) throws
+            InterruptedException {
         // Add "INFO_EV_BATTERY_CAPACITY" and "INFO_FUEL_CAPACITY" to the request.
         mGetPropertyRequests.add(GetPropertyRequest.create(INFO_EV_BATTERY_CAPACITY));
         mGetPropertyRequests.add(GetPropertyRequest.create(INFO_FUEL_CAPACITY));
 
-        ArgumentCaptor<OnCarPropertyResponseListener> captor = ArgumentCaptor.forClass(
-                OnCarPropertyResponseListener.class);
-        int meterDistanceUnit = 0x21;
-        int meterVolumeUnit = 0x40;
-        float evBatteryCapacity = 100f;
-        float evBatteryLevelValue = 50f;
-        float fuelCapacity = 120f;
-        float fuelLevelValue = 50f;
-        List<CarPropertyResponse<?>> capacities = new ArrayList<>();
-        capacities.add(CarPropertyResponse.builder().setPropertyId(
-                INFO_EV_BATTERY_CAPACITY).setStatus(STATUS_SUCCESS).setValue(
-                evBatteryCapacity).setTimestampMillis(1L).build());
-        capacities.add(CarPropertyResponse.builder().setPropertyId(INFO_FUEL_CAPACITY).setStatus(
-                STATUS_SUCCESS).setValue(fuelCapacity).setTimestampMillis(1L).build());
-        ListenableFuture<List<CarPropertyResponse<?>>> future = Futures.immediateFuture(capacities);
+        ListenableFuture<List<CarPropertyResponse<?>>> future = Futures.immediateFuture(
+                energyCapacities);
         when(mPropertyManager.submitGetPropertyRequest(eq(mGetPropertyRequests), any())).thenReturn(
                 future);
 
@@ -901,309 +946,273 @@
                         .put(DISTANCE_DISPLAY_UNITS, mCarZones)
                         .put(FUEL_VOLUME_DISPLAY_UNITS, mCarZones)
                         .buildKeepingLast();
+        ArgumentCaptor<OnCarPropertyResponseListener> listenerCaptor = ArgumentCaptor.forClass(
+                OnCarPropertyResponseListener.class);
 
-        verify(mPropertyManager, times(1)).submitGetPropertyRequest(eq(mGetPropertyRequests),
-                eq(mExecutor));
-        verify(mPropertyManager, times(1)).submitRegisterListenerRequest(
-                eq(propertyIdsWithCarZones), eq(DEFAULT_SAMPLE_RATE), captor.capture(),
-                eq(mExecutor));
+        verify(mPropertyManager).submitGetPropertyRequest(mGetPropertyRequests, mExecutor);
+        verify(mPropertyManager).submitRegisterListenerRequest(eq(propertyIdsWithCarZones),
+                eq(DEFAULT_SAMPLE_RATE), listenerCaptor.capture(), eq(mExecutor));
 
-        mResponse.add(CarPropertyResponse.builder().setPropertyId(EV_BATTERY_LEVEL).setStatus(
-                STATUS_SUCCESS).setValue(evBatteryLevelValue).setTimestampMillis(1L).build());
-        mResponse.add(CarPropertyResponse.builder().setPropertyId(FUEL_LEVEL).setStatus(
-                STATUS_SUCCESS).setValue(fuelLevelValue).setTimestampMillis(1L).build());
-        mResponse.add(CarPropertyResponse.builder().setPropertyId(FUEL_LEVEL_LOW).setStatus(
-                STATUS_SUCCESS).setValue(true).setTimestampMillis(1L).build());
-        mResponse.add(CarPropertyResponse.builder().setPropertyId(RANGE_REMAINING).setStatus(
-                STATUS_SUCCESS).setValue(5f).setTimestampMillis(1L).build());
-        mResponse.add(CarPropertyResponse.builder().setPropertyId(DISTANCE_DISPLAY_UNITS).setStatus(
-                STATUS_SUCCESS).setValue(meterDistanceUnit).setTimestampMillis(1L).build());
-        mResponse.add(CarPropertyResponse.builder().setPropertyId(
-                FUEL_VOLUME_DISPLAY_UNITS).setStatus(STATUS_SUCCESS).setValue(
-                meterVolumeUnit).setTimestampMillis(1L).build());
+        mResponse.addAll(energyResponses);
 
-        captor.getValue().onCarPropertyResponses(mResponse);
+        listenerCaptor.getValue().onCarPropertyResponses(mResponse);
         mCountDownLatch.await();
 
-        EnergyLevel energyLevel = loadedResult.get();
-        assertThat(energyLevel.getBatteryPercent().getValue()).isEqualTo(
-                evBatteryLevelValue / evBatteryCapacity * 100);
-        assertThat(energyLevel.getFuelPercent().getValue()).isEqualTo(
-                fuelLevelValue / fuelCapacity * 100);
-        assertThat(energyLevel.getEnergyIsLow().getValue()).isEqualTo(true);
-        assertThat(energyLevel.getRangeRemainingMeters().getValue()).isEqualTo(5f);
-        assertThat(energyLevel.getDistanceDisplayUnit().getValue()).isEqualTo(2);
-        assertThat(energyLevel.getFuelVolumeDisplayUnit().getValue()).isEqualTo(201);
+        assertThat(loadedResult.get()).isEqualTo(expectedEnergyLevel);
+    }
+
+    @Test
+    public void getEnergyLevel_verifyResponse() throws InterruptedException {
+        List<CarPropertyResponse<?>> energyCapacities = Arrays.asList(
+                EV_BATTERY_CAPACITY_RESPONSE_SUCCESS, FUEL_CAPACITY_RESPONSE_SUCCESS);
+
+        List<CarPropertyResponse<?>> energyResponses = Arrays.asList(
+                EV_BATTERY_LEVEL_RESPONSE_SUCCESS, FUEL_LEVEL_RESPONSE_SUCCESS,
+                FUEL_LEVEL_LOW_RESPONSE_SUCCESS, RANGE_REMAINING_RESPONSE_SUCCESS,
+                DISTANCE_DISPLAY_UNITS_RESPONSE_SUCCESS,
+                FUEL_VOLUME_DISPLAY_UNITS_RESPONSE_SUCCESS);
+
+        EnergyLevel expectedEnergyLevel = new EnergyLevel.Builder().setBatteryPercent(
+                EXPECTED_BATTERY_PERCENT_SUCCESS).setFuelPercent(
+                EXPECTED_FUEL_PERCENT_SUCCESS).setEnergyIsLow(
+                EXPECTED_ENERGY_IS_LOW_SUCCESS).setRangeRemainingMeters(
+                EXPECTED_RANGE_REMAINING_METERS_SUCCESS).setDistanceDisplayUnit(
+                EXPECTED_DISTANCE_DISPLAY_UNIT_SUCCESS).setFuelVolumeDisplayUnit(
+                EXPECTED_FUEL_VOLUME_DISPLAY_UNIT_SUCCESS).build();
+
+        getEnergyLevelHelperFunction(energyCapacities, energyResponses, expectedEnergyLevel);
     }
 
     @Test
     public void addEnergyLevelListener_handlesReponsesWithDifferentStatuses()
             throws InterruptedException {
-        // Add "INFO_EV_BATTERY_CAPACITY" and "INFO_FUEL_CAPACITY" to the request.
-        mGetPropertyRequests.add(GetPropertyRequest.create(INFO_EV_BATTERY_CAPACITY));
-        mGetPropertyRequests.add(GetPropertyRequest.create(INFO_FUEL_CAPACITY));
+        List<CarPropertyResponse<?>> energyCapacities = Arrays.asList(
+                EV_BATTERY_CAPACITY_RESPONSE_SUCCESS, FUEL_CAPACITY_RESPONSE_SUCCESS);
 
-        ArgumentCaptor<OnCarPropertyResponseListener> captor = ArgumentCaptor.forClass(
-                OnCarPropertyResponseListener.class);
-        int meterDistanceUnit = 0x21;
-        float evBatteryCapacity = 100f;
-        float fuelCapacity = 120f;
-        List<CarPropertyResponse<?>> capacities = new ArrayList<>();
-        capacities.add(CarPropertyResponse.builder().setPropertyId(
-                INFO_EV_BATTERY_CAPACITY).setStatus(STATUS_SUCCESS).setValue(
-                evBatteryCapacity).setTimestampMillis(1L).build());
-        capacities.add(CarPropertyResponse.builder().setPropertyId(INFO_FUEL_CAPACITY).setStatus(
-                STATUS_SUCCESS).setValue(fuelCapacity).setTimestampMillis(1L).build());
-        ListenableFuture<List<CarPropertyResponse<?>>> future = Futures.immediateFuture(capacities);
-        when(mPropertyManager.submitGetPropertyRequest(eq(mGetPropertyRequests), any())).thenReturn(
-                future);
+        List<CarPropertyResponse<?>> energyResponses = Arrays.asList(
+                CarPropertyResponse.builder().setPropertyId(EV_BATTERY_LEVEL).setStatus(
+                        STATUS_UNKNOWN).setTimestampMillis(DEFAULT_TIMESTAMP_MILLIS).build(),
+                CarPropertyResponse.builder().setPropertyId(FUEL_LEVEL).setStatus(
+                        STATUS_UNAVAILABLE).setTimestampMillis(DEFAULT_TIMESTAMP_MILLIS).build(),
+                FUEL_LEVEL_LOW_RESPONSE_SUCCESS,
+                CarPropertyResponse.builder().setPropertyId(RANGE_REMAINING).setStatus(
+                        STATUS_UNKNOWN).setTimestampMillis(DEFAULT_TIMESTAMP_MILLIS).build(),
+                DISTANCE_DISPLAY_UNITS_RESPONSE_SUCCESS,
+                CarPropertyResponse.builder().setPropertyId(FUEL_VOLUME_DISPLAY_UNITS).setStatus(
+                        STATUS_UNAVAILABLE).setTimestampMillis(DEFAULT_TIMESTAMP_MILLIS).build());
 
-        AtomicReference<EnergyLevel> loadedResult = new AtomicReference<>();
-        OnCarDataAvailableListener<EnergyLevel> listener = (data) -> {
-            loadedResult.set(data);
-            mCountDownLatch.countDown();
-        };
+        EnergyLevel expectedEnergyLevel = new EnergyLevel.Builder().setBatteryPercent(
+                new CarValue<>(null, DEFAULT_TIMESTAMP_MILLIS, STATUS_UNKNOWN)).setFuelPercent(
+                new CarValue<>(null, DEFAULT_TIMESTAMP_MILLIS, STATUS_UNAVAILABLE)).setEnergyIsLow(
+                EXPECTED_ENERGY_IS_LOW_SUCCESS).setRangeRemainingMeters(
+                new CarValue<>(null, DEFAULT_TIMESTAMP_MILLIS,
+                        STATUS_UNKNOWN)).setDistanceDisplayUnit(
+                EXPECTED_DISTANCE_DISPLAY_UNIT_SUCCESS).setFuelVolumeDisplayUnit(
+                new CarValue<>(null, DEFAULT_TIMESTAMP_MILLIS, STATUS_UNAVAILABLE)).build();
 
-        mAutomotiveCarInfo.addEnergyLevelListener(mExecutor, listener);
-
-        // Create "EV_BATTERY_LEVEL", "FUEL_LEVEL", "FUEL_LEVEL_LOW", "RANGE_REMAINING",
-        // "DISTANCE_DISPLAY_UNITS" and "FUEL_VOLUME_DISPLAY_UNITS" property IDs list with car
-        // zones.
-        Map<Integer, List<CarZone>> propertyIdsWithCarZones =
-                ImmutableMap.<Integer, List<CarZone>>builder().put(EV_BATTERY_LEVEL, mCarZones).put(
-                        FUEL_LEVEL, mCarZones).put(FUEL_LEVEL_LOW, mCarZones).put(RANGE_REMAINING,
-                        mCarZones).put(DISTANCE_DISPLAY_UNITS, mCarZones).put(
-                        FUEL_VOLUME_DISPLAY_UNITS, mCarZones).buildKeepingLast();
-
-        verify(mPropertyManager, times(1)).submitGetPropertyRequest(eq(mGetPropertyRequests),
-                eq(mExecutor));
-        verify(mPropertyManager, times(1)).submitRegisterListenerRequest(
-                eq(propertyIdsWithCarZones), eq(DEFAULT_SAMPLE_RATE), captor.capture(),
-                eq(mExecutor));
-
-        mResponse.add(CarPropertyResponse.builder().setPropertyId(EV_BATTERY_LEVEL).setStatus(
-                STATUS_UNKNOWN).setTimestampMillis(1L).build());
-        mResponse.add(CarPropertyResponse.builder().setPropertyId(FUEL_LEVEL).setStatus(
-                STATUS_UNAVAILABLE).setTimestampMillis(2L).build());
-        mResponse.add(CarPropertyResponse.builder().setPropertyId(FUEL_LEVEL_LOW).setStatus(
-                STATUS_SUCCESS).setValue(true).setTimestampMillis(3L).build());
-        mResponse.add(CarPropertyResponse.builder().setPropertyId(RANGE_REMAINING).setStatus(
-                STATUS_UNKNOWN).setTimestampMillis(1L).build());
-        mResponse.add(CarPropertyResponse.builder().setPropertyId(DISTANCE_DISPLAY_UNITS).setStatus(
-                STATUS_SUCCESS).setValue(meterDistanceUnit).setTimestampMillis(4L).build());
-        mResponse.add(CarPropertyResponse.builder().setPropertyId(
-                FUEL_VOLUME_DISPLAY_UNITS).setStatus(STATUS_UNAVAILABLE).setTimestampMillis(
-                6L).build());
-
-        captor.getValue().onCarPropertyResponses(mResponse);
-        mCountDownLatch.await();
-
-        assertThat(loadedResult.get()).isEqualTo(new EnergyLevel.Builder().setBatteryPercent(
-                new CarValue<>(null, 1, STATUS_UNKNOWN)).setFuelPercent(
-                new CarValue<>(null, 2, STATUS_UNAVAILABLE)).setEnergyIsLow(
-                new CarValue<>(true, 3, STATUS_SUCCESS)).setRangeRemainingMeters(
-                new CarValue<>(null, 1, STATUS_UNKNOWN)).setFuelVolumeDisplayUnit(
-                new CarValue<>(null, 6, STATUS_UNAVAILABLE)).setDistanceDisplayUnit(
-                new CarValue<>(CarUnit.METER, 4, STATUS_SUCCESS)).build());
+        getEnergyLevelHelperFunction(energyCapacities, energyResponses, expectedEnergyLevel);
     }
 
     @Test
     public void addEnergyLevelListener_returnsEnergyLevelWithUnknownValuesIfNoResponses()
             throws InterruptedException {
-        // Add "INFO_EV_BATTERY_CAPACITY" and "INFO_FUEL_CAPACITY" to the request.
-        mGetPropertyRequests.add(GetPropertyRequest.create(INFO_EV_BATTERY_CAPACITY));
-        mGetPropertyRequests.add(GetPropertyRequest.create(INFO_FUEL_CAPACITY));
-        List<CarPropertyResponse<?>> capacities = new ArrayList<>();
-        when(mPropertyManager.submitGetPropertyRequest(eq(mGetPropertyRequests), any())).thenReturn(
-                Futures.immediateFuture(capacities));
-        AtomicReference<EnergyLevel> loadedResult = new AtomicReference<>();
-        OnCarDataAvailableListener<EnergyLevel> listener = (data) -> {
-            loadedResult.set(data);
-            mCountDownLatch.countDown();
-        };
+        List<CarPropertyResponse<?>> energyCapacities = new ArrayList<>();
 
-        mAutomotiveCarInfo.addEnergyLevelListener(mExecutor, listener);
+        List<CarPropertyResponse<?>> energyResponses = new ArrayList<>();
 
-        verify(mPropertyManager, times(1)).submitGetPropertyRequest(
-                eq(mGetPropertyRequests), eq(mExecutor));
-        // Create "EV_BATTERY_LEVEL", "FUEL_LEVEL", "FUEL_LEVEL_LOW", "RANGE_REMAINING",
-        // "DISTANCE_DISPLAY_UNITS" and "FUEL_VOLUME_DISPLAY_UNITS" property IDs list with car
-        // zones.
-        Map<Integer, List<CarZone>> propertyIdsWithCarZones =
-                ImmutableMap.<Integer, List<CarZone>>builder()
-                        .put(EV_BATTERY_LEVEL, mCarZones)
-                        .put(FUEL_LEVEL, mCarZones)
-                        .put(FUEL_LEVEL_LOW, mCarZones)
-                        .put(RANGE_REMAINING, mCarZones)
-                        .put(DISTANCE_DISPLAY_UNITS, mCarZones)
-                        .put(FUEL_VOLUME_DISPLAY_UNITS, mCarZones)
-                        .buildKeepingLast();
-        ArgumentCaptor<OnCarPropertyResponseListener> captor = ArgumentCaptor.forClass(
-                OnCarPropertyResponseListener.class);
-        verify(mPropertyManager, times(1)).submitRegisterListenerRequest(
-                eq(propertyIdsWithCarZones), eq(DEFAULT_SAMPLE_RATE), captor.capture(),
-                eq(mExecutor));
-        captor.getValue().onCarPropertyResponses(mResponse);
-        mCountDownLatch.await();
+        EnergyLevel expectedEnergyLevel = new EnergyLevel.Builder().build();
 
-        assertThat(loadedResult.get()).isEqualTo(new EnergyLevel.Builder().build());
+        getEnergyLevelHelperFunction(energyCapacities, energyResponses, expectedEnergyLevel);
     }
 
     @Test
     public void getEnergyLevel_withUnavailableCapacityValues() throws InterruptedException {
-        // Add "INFO_EV_BATTERY_CAPACITY" and "INFO_FUEL_CAPACITY" to the request.
-        mGetPropertyRequests.add(GetPropertyRequest.create(INFO_EV_BATTERY_CAPACITY));
-        mGetPropertyRequests.add(GetPropertyRequest.create(INFO_FUEL_CAPACITY));
+        List<CarPropertyResponse<?>> energyCapacities = Arrays.asList(
+                CarPropertyResponse.builder().setPropertyId(INFO_EV_BATTERY_CAPACITY).setStatus(
+                        STATUS_UNAVAILABLE).setTimestampMillis(DEFAULT_TIMESTAMP_MILLIS).build(),
+                CarPropertyResponse.builder().setPropertyId(INFO_FUEL_CAPACITY).setStatus(
+                        STATUS_UNAVAILABLE).setTimestampMillis(DEFAULT_TIMESTAMP_MILLIS).build());
 
-        ArgumentCaptor<OnCarPropertyResponseListener> captor = ArgumentCaptor.forClass(
-                OnCarPropertyResponseListener.class);
-        int meterDistanceUnit = 0x21;
-        int meterVolumeUnit = 0x40;
-        float evBatteryLevelValue = 50f;
-        float fuelLevelValue = 50f;
-        List<CarPropertyResponse<?>> capacities = new ArrayList<>();
-        capacities.add(CarPropertyResponse.builder().setPropertyId(
-                INFO_EV_BATTERY_CAPACITY).setStatus(STATUS_UNAVAILABLE).setTimestampMillis(
-                1L).build());
-        capacities.add(CarPropertyResponse.builder().setPropertyId(INFO_FUEL_CAPACITY).setStatus(
-                STATUS_UNAVAILABLE).setTimestampMillis(1L).build());
-        ListenableFuture<List<CarPropertyResponse<?>>> future = Futures.immediateFuture(capacities);
-        when(mPropertyManager.submitGetPropertyRequest(eq(mGetPropertyRequests), any())).thenReturn(
-                future);
+        List<CarPropertyResponse<?>> energyResponses = Arrays.asList(
+                EV_BATTERY_LEVEL_RESPONSE_SUCCESS, FUEL_LEVEL_RESPONSE_SUCCESS,
+                FUEL_LEVEL_LOW_RESPONSE_SUCCESS, RANGE_REMAINING_RESPONSE_SUCCESS,
+                DISTANCE_DISPLAY_UNITS_RESPONSE_SUCCESS,
+                FUEL_VOLUME_DISPLAY_UNITS_RESPONSE_SUCCESS);
 
-        AtomicReference<EnergyLevel> loadedResult = new AtomicReference<>();
-        OnCarDataAvailableListener<EnergyLevel> listener = (data) -> {
-            loadedResult.set(data);
-            mCountDownLatch.countDown();
-        };
+        // Battery percent and fuel percent should be null since we can not get the capacity of
+        // battery and fuel property. The other properties should still work without capacity
+        // values.
+        EnergyLevel expectedEnergyLevel = new EnergyLevel.Builder().setBatteryPercent(
+                new CarValue<>(null, DEFAULT_TIMESTAMP_MILLIS, STATUS_UNAVAILABLE)).setFuelPercent(
+                new CarValue<>(null, DEFAULT_TIMESTAMP_MILLIS, STATUS_UNAVAILABLE)).setEnergyIsLow(
+                EXPECTED_ENERGY_IS_LOW_SUCCESS).setRangeRemainingMeters(
+                EXPECTED_RANGE_REMAINING_METERS_SUCCESS).setDistanceDisplayUnit(
+                EXPECTED_DISTANCE_DISPLAY_UNIT_SUCCESS).setFuelVolumeDisplayUnit(
+                EXPECTED_FUEL_VOLUME_DISPLAY_UNIT_SUCCESS).build();
 
-        mAutomotiveCarInfo.addEnergyLevelListener(mExecutor, listener);
+        getEnergyLevelHelperFunction(energyCapacities, energyResponses, expectedEnergyLevel);
+    }
 
-        // Create "EV_BATTERY_LEVEL", "FUEL_LEVEL", "FUEL_LEVEL_LOW", "RANGE_REMAINING",
-        // "DISTANCE_DISPLAY_UNITS" and "FUEL_VOLUME_DISPLAY_UNITS" property IDs list with car
-        // zones.
-        Map<Integer, List<CarZone>> propertyIdsWithCarZones =
-                ImmutableMap.<Integer, List<CarZone>>builder()
-                        .put(EV_BATTERY_LEVEL, mCarZones)
-                        .put(FUEL_LEVEL, mCarZones)
-                        .put(FUEL_LEVEL_LOW, mCarZones)
-                        .put(RANGE_REMAINING, mCarZones)
-                        .put(DISTANCE_DISPLAY_UNITS, mCarZones)
-                        .put(FUEL_VOLUME_DISPLAY_UNITS, mCarZones)
-                        .buildKeepingLast();
+    @Test
+    public void getEnergyLevel_withUnimplementedEvBatteryCapacity() throws InterruptedException {
+        List<CarPropertyResponse<?>> energyCapacities = Arrays.asList(
+                CarPropertyResponse.builder().setPropertyId(INFO_EV_BATTERY_CAPACITY).setStatus(
+                        STATUS_UNIMPLEMENTED).setTimestampMillis(DEFAULT_TIMESTAMP_MILLIS).build(),
+                FUEL_CAPACITY_RESPONSE_SUCCESS);
 
-        verify(mPropertyManager, times(1)).submitGetPropertyRequest(
-                eq(mGetPropertyRequests),
-                eq(mExecutor));
-        verify(mPropertyManager, times(1)).submitRegisterListenerRequest(
-                eq(propertyIdsWithCarZones), eq(DEFAULT_SAMPLE_RATE), captor.capture(),
-                eq(mExecutor));
+        List<CarPropertyResponse<?>> energyResponses = Arrays.asList(
+                EV_BATTERY_LEVEL_RESPONSE_SUCCESS, FUEL_LEVEL_RESPONSE_SUCCESS,
+                FUEL_LEVEL_LOW_RESPONSE_SUCCESS, RANGE_REMAINING_RESPONSE_SUCCESS,
+                DISTANCE_DISPLAY_UNITS_RESPONSE_SUCCESS,
+                FUEL_VOLUME_DISPLAY_UNITS_RESPONSE_SUCCESS);
 
-        mResponse.add(CarPropertyResponse.builder().setPropertyId(EV_BATTERY_LEVEL).setStatus(
-                STATUS_SUCCESS).setValue(evBatteryLevelValue).setTimestampMillis(1L).build());
-        mResponse.add(CarPropertyResponse.builder().setPropertyId(FUEL_LEVEL).setStatus(
-                STATUS_SUCCESS).setValue(fuelLevelValue).setTimestampMillis(1L).build());
-        mResponse.add(CarPropertyResponse.builder().setPropertyId(FUEL_LEVEL_LOW).setStatus(
-                STATUS_SUCCESS).setValue(true).setTimestampMillis(1L).build());
-        mResponse.add(CarPropertyResponse.builder().setPropertyId(RANGE_REMAINING).setStatus(
-                STATUS_SUCCESS).setValue(5f).setTimestampMillis(1L).build());
-        mResponse.add(CarPropertyResponse.builder().setPropertyId(DISTANCE_DISPLAY_UNITS).setStatus(
-                STATUS_SUCCESS).setValue(meterDistanceUnit).setTimestampMillis(1L).build());
-        mResponse.add(CarPropertyResponse.builder().setPropertyId(
-                FUEL_VOLUME_DISPLAY_UNITS).setStatus(STATUS_SUCCESS).setValue(
-                meterVolumeUnit).setTimestampMillis(1L).build());
-        captor.getValue().onCarPropertyResponses(mResponse);
-        mCountDownLatch.await();
+        EnergyLevel expectedEnergyLevel = new EnergyLevel.Builder().setBatteryPercent(
+                new CarValue<>(null, DEFAULT_TIMESTAMP_MILLIS,
+                        STATUS_UNIMPLEMENTED)).setFuelPercent(
+                EXPECTED_FUEL_PERCENT_SUCCESS).setEnergyIsLow(
+                EXPECTED_ENERGY_IS_LOW_SUCCESS).setRangeRemainingMeters(
+                EXPECTED_RANGE_REMAINING_METERS_SUCCESS).setDistanceDisplayUnit(
+                EXPECTED_DISTANCE_DISPLAY_UNIT_SUCCESS).setFuelVolumeDisplayUnit(
+                EXPECTED_FUEL_VOLUME_DISPLAY_UNIT_SUCCESS).build();
 
-        EnergyLevel energyLevel = loadedResult.get();
+        getEnergyLevelHelperFunction(energyCapacities, energyResponses, expectedEnergyLevel);
+    }
 
-        // Battery percent and fuel percent should be UNKNOWN_FLOAT since we can not get
-        // the capacity of battery and fuel property.
-        assertThat(energyLevel.getBatteryPercent().getValue()).isEqualTo(
-                CarValue.UNKNOWN_FLOAT.getValue());
-        assertThat(energyLevel.getFuelPercent().getValue()).isEqualTo(
-                CarValue.UNKNOWN_FLOAT.getValue());
+    @Test
+    public void getEnergyLevel_withUnimplementedFuelCapacity() throws
+            InterruptedException {
+        List<CarPropertyResponse<?>> energyCapacities = Arrays.asList(
+                EV_BATTERY_CAPACITY_RESPONSE_SUCCESS, CarPropertyResponse.builder().setPropertyId(
+                INFO_FUEL_CAPACITY).setStatus(STATUS_UNIMPLEMENTED).setTimestampMillis(
+                DEFAULT_TIMESTAMP_MILLIS).build());
 
-        // The other properties should still work without capacity values
-        assertThat(energyLevel.getEnergyIsLow().getValue()).isEqualTo(true);
-        assertThat(energyLevel.getRangeRemainingMeters().getValue()).isEqualTo(5f);
-        assertThat(energyLevel.getDistanceDisplayUnit().getValue()).isEqualTo(2);
-        assertThat(energyLevel.getFuelVolumeDisplayUnit().getValue()).isEqualTo(201);
+        List<CarPropertyResponse<?>> energyResponses = Arrays.asList(
+                EV_BATTERY_LEVEL_RESPONSE_SUCCESS, FUEL_LEVEL_RESPONSE_SUCCESS,
+                FUEL_LEVEL_LOW_RESPONSE_SUCCESS, RANGE_REMAINING_RESPONSE_SUCCESS,
+                DISTANCE_DISPLAY_UNITS_RESPONSE_SUCCESS,
+                FUEL_VOLUME_DISPLAY_UNITS_RESPONSE_SUCCESS);
+
+        EnergyLevel expectedEnergyLevel = new EnergyLevel.Builder().setBatteryPercent(
+                EXPECTED_BATTERY_PERCENT_SUCCESS).setFuelPercent(
+                new CarValue<>(null, DEFAULT_TIMESTAMP_MILLIS,
+                        STATUS_UNIMPLEMENTED)).setEnergyIsLow(
+                EXPECTED_ENERGY_IS_LOW_SUCCESS).setRangeRemainingMeters(
+                EXPECTED_RANGE_REMAINING_METERS_SUCCESS).setDistanceDisplayUnit(
+                EXPECTED_DISTANCE_DISPLAY_UNIT_SUCCESS).setFuelVolumeDisplayUnit(
+                EXPECTED_FUEL_VOLUME_DISPLAY_UNIT_SUCCESS).build();
+
+        getEnergyLevelHelperFunction(energyCapacities, energyResponses, expectedEnergyLevel);
+    }
+
+    @Test
+    public void getEnergyLevel_withUnknownEvBatteryCapacity() throws InterruptedException {
+        List<CarPropertyResponse<?>> energyCapacities = Arrays.asList(
+                CarPropertyResponse.builder().setPropertyId(INFO_EV_BATTERY_CAPACITY).setStatus(
+                        STATUS_UNKNOWN).setTimestampMillis(DEFAULT_TIMESTAMP_MILLIS).build(),
+                FUEL_CAPACITY_RESPONSE_SUCCESS);
+
+        List<CarPropertyResponse<?>> energyResponses = Arrays.asList(
+                EV_BATTERY_LEVEL_RESPONSE_SUCCESS, FUEL_LEVEL_RESPONSE_SUCCESS,
+                FUEL_LEVEL_LOW_RESPONSE_SUCCESS, RANGE_REMAINING_RESPONSE_SUCCESS,
+                DISTANCE_DISPLAY_UNITS_RESPONSE_SUCCESS,
+                FUEL_VOLUME_DISPLAY_UNITS_RESPONSE_SUCCESS);
+
+        EnergyLevel expectedEnergyLevel = new EnergyLevel.Builder().setBatteryPercent(
+                new CarValue<>(null, DEFAULT_TIMESTAMP_MILLIS, STATUS_UNKNOWN)).setFuelPercent(
+                EXPECTED_FUEL_PERCENT_SUCCESS).setEnergyIsLow(
+                EXPECTED_ENERGY_IS_LOW_SUCCESS).setRangeRemainingMeters(
+                EXPECTED_RANGE_REMAINING_METERS_SUCCESS).setDistanceDisplayUnit(
+                EXPECTED_DISTANCE_DISPLAY_UNIT_SUCCESS).setFuelVolumeDisplayUnit(
+                EXPECTED_FUEL_VOLUME_DISPLAY_UNIT_SUCCESS).build();
+
+        getEnergyLevelHelperFunction(energyCapacities, energyResponses, expectedEnergyLevel);
+    }
+
+    @Test
+    public void getEnergyLevel_withUnknownFuelCapacity() throws InterruptedException {
+        List<CarPropertyResponse<?>> energyCapacities = Arrays.asList(
+                EV_BATTERY_CAPACITY_RESPONSE_SUCCESS, CarPropertyResponse.builder().setPropertyId(
+                        INFO_FUEL_CAPACITY).setStatus(STATUS_UNKNOWN).setTimestampMillis(
+                        DEFAULT_TIMESTAMP_MILLIS).build());
+
+        List<CarPropertyResponse<?>> energyResponses = Arrays.asList(
+                EV_BATTERY_LEVEL_RESPONSE_SUCCESS, FUEL_LEVEL_RESPONSE_SUCCESS,
+                FUEL_LEVEL_LOW_RESPONSE_SUCCESS, RANGE_REMAINING_RESPONSE_SUCCESS,
+                DISTANCE_DISPLAY_UNITS_RESPONSE_SUCCESS,
+                FUEL_VOLUME_DISPLAY_UNITS_RESPONSE_SUCCESS);
+
+        EnergyLevel expectedEnergyLevel = new EnergyLevel.Builder().setBatteryPercent(
+                EXPECTED_BATTERY_PERCENT_SUCCESS).setFuelPercent(
+                new CarValue<>(null, DEFAULT_TIMESTAMP_MILLIS, STATUS_UNKNOWN)).setEnergyIsLow(
+                EXPECTED_ENERGY_IS_LOW_SUCCESS).setRangeRemainingMeters(
+                EXPECTED_RANGE_REMAINING_METERS_SUCCESS).setDistanceDisplayUnit(
+                EXPECTED_DISTANCE_DISPLAY_UNIT_SUCCESS).setFuelVolumeDisplayUnit(
+                EXPECTED_FUEL_VOLUME_DISPLAY_UNIT_SUCCESS).build();
+
+        getEnergyLevelHelperFunction(energyCapacities, energyResponses, expectedEnergyLevel);
+    }
+
+    @Test
+    public void getEnergyLevel_withNoEvBatteryCapacityResponse() throws InterruptedException {
+        List<CarPropertyResponse<?>> energyCapacities = Arrays.asList(
+                FUEL_CAPACITY_RESPONSE_SUCCESS);
+
+        List<CarPropertyResponse<?>> energyResponses = Arrays.asList(
+                EV_BATTERY_LEVEL_RESPONSE_SUCCESS, FUEL_LEVEL_RESPONSE_SUCCESS,
+                FUEL_LEVEL_LOW_RESPONSE_SUCCESS, RANGE_REMAINING_RESPONSE_SUCCESS,
+                DISTANCE_DISPLAY_UNITS_RESPONSE_SUCCESS,
+                FUEL_VOLUME_DISPLAY_UNITS_RESPONSE_SUCCESS);
+
+        EnergyLevel expectedEnergyLevel = new EnergyLevel.Builder().setBatteryPercent(
+                new CarValue<>(null, 0, STATUS_UNKNOWN)).setFuelPercent(
+                EXPECTED_FUEL_PERCENT_SUCCESS).setEnergyIsLow(
+                EXPECTED_ENERGY_IS_LOW_SUCCESS).setRangeRemainingMeters(
+                EXPECTED_RANGE_REMAINING_METERS_SUCCESS).setDistanceDisplayUnit(
+                EXPECTED_DISTANCE_DISPLAY_UNIT_SUCCESS).setFuelVolumeDisplayUnit(
+                EXPECTED_FUEL_VOLUME_DISPLAY_UNIT_SUCCESS).build();
+
+        getEnergyLevelHelperFunction(energyCapacities, energyResponses, expectedEnergyLevel);
+    }
+
+    @Test
+    public void getEnergyLevel_withNoFuelCapacityResponse() throws InterruptedException {
+        List<CarPropertyResponse<?>> energyCapacities = Arrays.asList(
+                EV_BATTERY_CAPACITY_RESPONSE_SUCCESS);
+
+        List<CarPropertyResponse<?>> energyResponses = Arrays.asList(
+                EV_BATTERY_LEVEL_RESPONSE_SUCCESS, FUEL_LEVEL_RESPONSE_SUCCESS,
+                FUEL_LEVEL_LOW_RESPONSE_SUCCESS, RANGE_REMAINING_RESPONSE_SUCCESS,
+                DISTANCE_DISPLAY_UNITS_RESPONSE_SUCCESS,
+                FUEL_VOLUME_DISPLAY_UNITS_RESPONSE_SUCCESS);
+
+        EnergyLevel expectedEnergyLevel = new EnergyLevel.Builder().setBatteryPercent(
+                EXPECTED_BATTERY_PERCENT_SUCCESS).setFuelPercent(
+                new CarValue<>(null, 0, STATUS_UNKNOWN)).setEnergyIsLow(
+                EXPECTED_ENERGY_IS_LOW_SUCCESS).setRangeRemainingMeters(
+                EXPECTED_RANGE_REMAINING_METERS_SUCCESS).setDistanceDisplayUnit(
+                EXPECTED_DISTANCE_DISPLAY_UNIT_SUCCESS).setFuelVolumeDisplayUnit(
+                EXPECTED_FUEL_VOLUME_DISPLAY_UNIT_SUCCESS).build();
+
+        getEnergyLevelHelperFunction(energyCapacities, energyResponses, expectedEnergyLevel);
     }
 
     @Test
     public void getEnergyLevel_SuccessfulPartialResponses() throws InterruptedException {
-        // Add "INFO_EV_BATTERY_CAPACITY" and "INFO_FUEL_CAPACITY" to the request.
-        mGetPropertyRequests.add(GetPropertyRequest.create(INFO_EV_BATTERY_CAPACITY));
-        mGetPropertyRequests.add(GetPropertyRequest.create(INFO_FUEL_CAPACITY));
+        List<CarPropertyResponse<?>> energyCapacities = Arrays.asList(
+                EV_BATTERY_CAPACITY_RESPONSE_SUCCESS, FUEL_CAPACITY_RESPONSE_SUCCESS);
 
-        ArgumentCaptor<OnCarPropertyResponseListener> captor = ArgumentCaptor.forClass(
-                OnCarPropertyResponseListener.class);
-        int meterDistanceUnit = 0x21;
-        float evBatteryCapacity = 100f;
-        float evBatteryLevelValue = 50f;
-        float fuelCapacity = 120f;
-        float fuelLevelValue = 50f;
-        List<CarPropertyResponse<?>> capacities = new ArrayList<>();
-        capacities.add(CarPropertyResponse.builder().setPropertyId(
-                INFO_EV_BATTERY_CAPACITY).setStatus(STATUS_SUCCESS).setValue(
-                evBatteryCapacity).setTimestampMillis(1L).build());
-        capacities.add(CarPropertyResponse.builder().setPropertyId(INFO_FUEL_CAPACITY).setStatus(
-                STATUS_SUCCESS).setValue(fuelCapacity).setTimestampMillis(1L).build());
-        ListenableFuture<List<CarPropertyResponse<?>>> future = Futures.immediateFuture(capacities);
-        when(mPropertyManager.submitGetPropertyRequest(eq(mGetPropertyRequests), any())).thenReturn(
-                future);
+        List<CarPropertyResponse<?>> energyResponses = Arrays.asList(
+                EV_BATTERY_LEVEL_RESPONSE_SUCCESS, FUEL_LEVEL_RESPONSE_SUCCESS,
+                FUEL_LEVEL_LOW_RESPONSE_SUCCESS, RANGE_REMAINING_RESPONSE_SUCCESS,
+                DISTANCE_DISPLAY_UNITS_RESPONSE_SUCCESS);
 
-        AtomicReference<EnergyLevel> loadedResult = new AtomicReference<>();
-        OnCarDataAvailableListener<EnergyLevel> listener = (data) -> {
-            loadedResult.set(data);
-            mCountDownLatch.countDown();
-        };
+        EnergyLevel expectedEnergyLevel = new EnergyLevel.Builder().setBatteryPercent(
+                EXPECTED_BATTERY_PERCENT_SUCCESS).setFuelPercent(
+                EXPECTED_FUEL_PERCENT_SUCCESS).setEnergyIsLow(
+                EXPECTED_ENERGY_IS_LOW_SUCCESS).setRangeRemainingMeters(
+                EXPECTED_RANGE_REMAINING_METERS_SUCCESS).setDistanceDisplayUnit(
+                EXPECTED_DISTANCE_DISPLAY_UNIT_SUCCESS).build();
 
-        mAutomotiveCarInfo.addEnergyLevelListener(mExecutor, listener);
-
-        // Create "EV_BATTERY_LEVEL", "FUEL_LEVEL", "FUEL_LEVEL_LOW", "RANGE_REMAINING",
-        // "DISTANCE_DISPLAY_UNITS" and "FUEL_VOLUME_DISPLAY_UNITS" property IDs list with car
-        // zones.
-        Map<Integer, List<CarZone>> propertyIdsWithCarZones =
-                ImmutableMap.<Integer, List<CarZone>>builder()
-                        .put(EV_BATTERY_LEVEL, mCarZones)
-                        .put(FUEL_LEVEL, mCarZones)
-                        .put(FUEL_LEVEL_LOW, mCarZones)
-                        .put(RANGE_REMAINING, mCarZones)
-                        .put(DISTANCE_DISPLAY_UNITS, mCarZones)
-                        .put(FUEL_VOLUME_DISPLAY_UNITS, mCarZones)
-                        .buildKeepingLast();
-
-        verify(mPropertyManager, times(1)).submitGetPropertyRequest(eq(mGetPropertyRequests),
-                eq(mExecutor));
-        verify(mPropertyManager, times(1)).submitRegisterListenerRequest(
-                eq(propertyIdsWithCarZones), eq(DEFAULT_SAMPLE_RATE), captor.capture(),
-                eq(mExecutor));
-
-        // Missing response for FUEL_VOLUME_DISPLAY_UNITS.
-        mResponse.add(CarPropertyResponse.builder().setPropertyId(EV_BATTERY_LEVEL).setStatus(
-                STATUS_SUCCESS).setValue(evBatteryLevelValue).setTimestampMillis(1L).build());
-        mResponse.add(CarPropertyResponse.builder().setPropertyId(FUEL_LEVEL).setStatus(
-                STATUS_SUCCESS).setValue(fuelLevelValue).setTimestampMillis(1L).build());
-        mResponse.add(CarPropertyResponse.builder().setPropertyId(FUEL_LEVEL_LOW).setStatus(
-                STATUS_SUCCESS).setValue(true).setTimestampMillis(1L).build());
-        mResponse.add(CarPropertyResponse.builder().setPropertyId(RANGE_REMAINING).setStatus(
-                STATUS_SUCCESS).setValue(5f).setTimestampMillis(1L).build());
-        mResponse.add(CarPropertyResponse.builder().setPropertyId(DISTANCE_DISPLAY_UNITS).setStatus(
-                STATUS_SUCCESS).setValue(meterDistanceUnit).setTimestampMillis(1L).build());
-
-        captor.getValue().onCarPropertyResponses(mResponse);
-        mCountDownLatch.await();
-
-        // The partial responses will be returned successfully.
-        EnergyLevel energyLevel = loadedResult.get();
-        assertThat(energyLevel.getBatteryPercent().getValue()).isEqualTo(
-                evBatteryLevelValue / evBatteryCapacity * 100);
-        assertThat(energyLevel.getFuelPercent().getValue()).isEqualTo(
-                fuelLevelValue / fuelCapacity * 100);
-        assertThat(energyLevel.getEnergyIsLow().getValue()).isEqualTo(true);
-        assertThat(energyLevel.getRangeRemainingMeters().getValue()).isEqualTo(5f);
-        assertThat(energyLevel.getDistanceDisplayUnit().getValue()).isEqualTo(2);
+        getEnergyLevelHelperFunction(energyCapacities, energyResponses, expectedEnergyLevel);
     }
 }

diff --git a/car/app/app-samples/showcase/common/src/main/java/androidx/car/app/sample/showcase/common/screens/UserInteractionsDemoScreen.java b/car/app/app-samples/showcase/common/src/main/java/androidx/car/app/sample/showcase/common/screens/UserInteractionsDemoScreen.java
index 8bd55d5..01cd107 100644
--- a/car/app/app-samples/showcase/common/src/main/java/androidx/car/app/sample/showcase/common/screens/UserInteractionsDemoScreen.java
+++ b/car/app/app-samples/showcase/common/src/main/java/androidx/car/app/sample/showcase/common/screens/UserInteractionsDemoScreen.java

@@ -34,6 +34,7 @@
 import androidx.car.app.sample.showcase.common.R;
 import androidx.car.app.sample.showcase.common.audio.VoiceInteraction;
 import androidx.car.app.sample.showcase.common.screens.userinteractions.RequestPermissionMenuDemoScreen;
+import androidx.car.app.sample.showcase.common.screens.userinteractions.TaskOverflowDemoScreen;
 import androidx.core.graphics.drawable.IconCompat;
 
 /** A screen demonstrating User Interactions */
@@ -104,21 +105,40 @@
      * Returns the row for TaskRestriction Demo
      */
     private Item buildRowForTaskRestrictionDemo() {
+        boolean isInOverflow = mStep >= MAX_STEPS_ALLOWED;
+        String title = isInOverflow ? getCarContext().getString(
+                R.string.application_overflow_title) :
+                getCarContext().getString(R.string.task_step_of_title, mStep,
+                        MAX_STEPS_ALLOWED);
+        String subTitle = isInOverflow
+                ?
+                getCarContext().getString(R.string.task_step_of_title, mStep,
+                        MAX_STEPS_ALLOWED) :
+                getCarContext().getString(R.string.task_step_of_text);
         return new Row.Builder()
-                .setTitle(getCarContext().getString(R.string.task_step_of_title, mStep,
-                        MAX_STEPS_ALLOWED))
-                .addText(getCarContext().getString(R.string.task_step_of_text))
+                .setTitle(title)
+                .addText(subTitle)
                 .setImage(new CarIcon.Builder(
                         IconCompat.createWithResource(
                                 getCarContext(), R.drawable.baseline_task_24))
                         .build(), Row.IMAGE_TYPE_ICON)
                 .setOnClickListener(
-                        () ->
+                        () -> {
+                            if (mStep < MAX_STEPS_ALLOWED) {
                                 getScreenManager()
                                         .pushForResult(
                                                 new UserInteractionsDemoScreen(
                                                         mStep + 1, getCarContext()),
-                                                result -> mIsBackOperation = true))
+                                                result -> mIsBackOperation = true);
+                            } else {
+                                getScreenManager()
+                                        .pushForResult(
+                                                new TaskOverflowDemoScreen(
+                                                        getCarContext()),
+                                                result -> mIsBackOperation = true);
+                            }
+                        }
+                )
                 .build();
     }
 

diff --git a/car/app/app-samples/showcase/common/src/main/java/androidx/car/app/sample/showcase/common/screens/userinteractions/TaskOverflowDemoScreen.java b/car/app/app-samples/showcase/common/src/main/java/androidx/car/app/sample/showcase/common/screens/userinteractions/TaskOverflowDemoScreen.java
new file mode 100644
index 0000000..7c44b5e
--- /dev/null
+++ b/car/app/app-samples/showcase/common/src/main/java/androidx/car/app/sample/showcase/common/screens/userinteractions/TaskOverflowDemoScreen.java

@@ -0,0 +1,108 @@
+/*
+ * Copyright 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.car.app.sample.showcase.common.screens.userinteractions;
+
+import static androidx.car.app.model.Action.BACK;
+
+import androidx.annotation.NonNull;
+import androidx.car.app.CarContext;
+import androidx.car.app.Screen;
+import androidx.car.app.constraints.ConstraintManager;
+import androidx.car.app.model.ItemList;
+import androidx.car.app.model.ListTemplate;
+import androidx.car.app.model.Row;
+import androidx.car.app.model.Template;
+import androidx.car.app.sample.showcase.common.R;
+import androidx.car.app.sample.showcase.common.screens.templatelayouts.GridTemplateMenuDemoScreen;
+import androidx.car.app.sample.showcase.common.screens.templatelayouts.ListTemplateDemoScreen;
+import androidx.car.app.sample.showcase.common.screens.templatelayouts.MessageTemplateDemoScreen;
+import androidx.car.app.sample.showcase.common.screens.templatelayouts.PaneTemplateDemoScreen;
+import androidx.car.app.sample.showcase.common.screens.templatelayouts.SearchTemplateDemoScreen;
+import androidx.car.app.sample.showcase.common.screens.templatelayouts.SignInTemplateDemoScreen;
+
+/** A screen demonstrating Task Overflow for the different templates */
+public class TaskOverflowDemoScreen extends Screen {
+
+    public TaskOverflowDemoScreen(@NonNull CarContext carContext) {
+        super(carContext);
+    }
+
+    private Row createRow(int index) {
+        switch (index) {
+            case 0:
+                return new Row.Builder()
+                        .setTitle("    ")
+                        .addText(getCarContext().getString(R.string.application_overflow_subtitle1))
+                        .addText(getCarContext().getString(R.string.application_overflow_subtitle2))
+
+                        .build();
+            case 1:
+                return buildRowForTemplate(new ListTemplateDemoScreen(getCarContext()),
+                        R.string.list_template_demo_title);
+            case 2:
+                return buildRowForTemplate(new GridTemplateMenuDemoScreen(getCarContext()),
+                        R.string.grid_template_menu_demo_title);
+            case 3:
+                return buildRowForTemplate(new MessageTemplateDemoScreen(getCarContext()),
+                        R.string.msg_template_demo_title);
+            case 4:
+                return buildRowForTemplate(new PaneTemplateDemoScreen(getCarContext()),
+                        R.string.pane_template_demo_title);
+            case 5:
+                return buildRowForTemplate(new SearchTemplateDemoScreen(getCarContext()),
+                        R.string.search_template_demo_title);
+            case 6:
+                return buildRowForTemplate(new SignInTemplateDemoScreen(getCarContext()),
+                        R.string.sign_in_template_demo_title);
+            default:
+                return new Row.Builder()
+                        .setTitle(
+                                getCarContext().getString(R.string.other_row_title_prefix) + (index
+                                        + 1))
+                        .addText(getCarContext().getString(R.string.other_row_text))
+                        .build();
+        }
+    }
+
+    private Row buildRowForTemplate(Screen screen, int title) {
+        return new Row.Builder()
+                .setTitle(getCarContext().getString(title))
+                .setOnClickListener(() -> getScreenManager().push(screen))
+                .setBrowsable(true)
+                .build();
+    }
+
+    @NonNull
+    @Override
+    public Template onGetTemplate() {
+        int listLimit = getCarContext().getCarService(ConstraintManager.class).getContentLimit(
+                ConstraintManager.CONTENT_LIMIT_TYPE_LIST);
+        if (listLimit >= 6) {
+            listLimit = 6;
+        }
+
+        ItemList.Builder listBuilder = new ItemList.Builder();
+        for (int i = 0; i < listLimit; i++) {
+            listBuilder.addItem(createRow(i));
+        }
+        return new ListTemplate.Builder()
+                .setSingleList(listBuilder.build())
+                .setTitle(getCarContext().getString(R.string.application_overflow_title))
+                .setHeaderAction(BACK)
+                .build();
+    }
+}

diff --git a/car/app/app-samples/showcase/common/src/main/res/values/strings.xml b/car/app/app-samples/showcase/common/src/main/res/values/strings.xml
index 197eb29..9bbe73a 100644
--- a/car/app/app-samples/showcase/common/src/main/res/values/strings.xml
+++ b/car/app/app-samples/showcase/common/src/main/res/values/strings.xml

@@ -373,6 +373,7 @@
   <string name="task_limit_reached_msg">Task limit reached\nGoing forward will force stop the app</string>
   <string name="task_step_of_title">Task step %1$d of %2$d</string>
   <string name="task_step_of_text">Click to go forward</string>
+  <string name="task_content_allowed">Please visit the different templates and ensure the car is in driving mode</string>
 
   <!-- ToggleButtonDemoScreen -->
   <string name="toggle_button_demo_title">Toggle Button Demo</string>
@@ -411,6 +412,11 @@
   <string name="user_interactions_demo_title">User Interactions</string>
   <string name="request_permission_menu_demo_title">Request Permissions Demos</string>
 
+  <!-- Task Overflow Demo Screen -->
+  <string name="application_overflow_title">Application Overflow Validator</string>
+  <string name="application_overflow_subtitle1">Please test the following templates while changing</string>
+  <string name="application_overflow_subtitle2">the vehicle from parked to driving state</string>
+
   <!-- Manifest file permissions -->
   <string name="perm_group">Permission Group</string>
   <string name="perm_group_description">Permission Group for Showcase App</string>

diff --git a/car/app/app/api/public_plus_experimental_1.3.0-beta02.txt b/car/app/app/api/public_plus_experimental_1.3.0-beta02.txt
index 9908df5..8157779 100644
--- a/car/app/app/api/public_plus_experimental_1.3.0-beta02.txt
+++ b/car/app/app/api/public_plus_experimental_1.3.0-beta02.txt

@@ -39,6 +39,7 @@
     field @Deprecated public static final String CATEGORY_CHARGING_APP = "androidx.car.app.category.CHARGING";
     field @androidx.car.app.annotations.RequiresCarApi(6) public static final String CATEGORY_FEATURE_CLUSTER = "androidx.car.app.category.FEATURE_CLUSTER";
     field @androidx.car.app.annotations.ExperimentalCarApi public static final String CATEGORY_IOT_APP = "androidx.car.app.category.IOT";
+    field @androidx.car.app.annotations.ExperimentalCarApi public static final String CATEGORY_MESSAGING_APP = "androidx.car.app.category.MESSAGING";
     field public static final String CATEGORY_NAVIGATION_APP = "androidx.car.app.category.NAVIGATION";
     field @Deprecated public static final String CATEGORY_PARKING_APP = "androidx.car.app.category.PARKING";
     field public static final String CATEGORY_POI_APP = "androidx.car.app.category.POI";
@@ -843,6 +844,14 @@
 
 }
 
+package androidx.car.app.messaging {
+
+  @androidx.car.app.annotations.ExperimentalCarApi public class MessagingServiceConstants {
+    field public static final String ACTION_HANDLE_CAR_MESSAGING = "androidx.car.app.messaging.action.HANDLE_CAR_MESSAGING";
+  }
+
+}
+
 package androidx.car.app.messaging.model {
 
   @androidx.car.app.annotations.CarProtocol @androidx.car.app.annotations.ExperimentalCarApi @androidx.car.app.annotations.RequiresCarApi(6) public class CarMessage {

diff --git a/car/app/app/api/public_plus_experimental_current.txt b/car/app/app/api/public_plus_experimental_current.txt
index 9908df5..8157779 100644
--- a/car/app/app/api/public_plus_experimental_current.txt
+++ b/car/app/app/api/public_plus_experimental_current.txt

@@ -39,6 +39,7 @@
     field @Deprecated public static final String CATEGORY_CHARGING_APP = "androidx.car.app.category.CHARGING";
     field @androidx.car.app.annotations.RequiresCarApi(6) public static final String CATEGORY_FEATURE_CLUSTER = "androidx.car.app.category.FEATURE_CLUSTER";
     field @androidx.car.app.annotations.ExperimentalCarApi public static final String CATEGORY_IOT_APP = "androidx.car.app.category.IOT";
+    field @androidx.car.app.annotations.ExperimentalCarApi public static final String CATEGORY_MESSAGING_APP = "androidx.car.app.category.MESSAGING";
     field public static final String CATEGORY_NAVIGATION_APP = "androidx.car.app.category.NAVIGATION";
     field @Deprecated public static final String CATEGORY_PARKING_APP = "androidx.car.app.category.PARKING";
     field public static final String CATEGORY_POI_APP = "androidx.car.app.category.POI";
@@ -843,6 +844,14 @@
 
 }
 
+package androidx.car.app.messaging {
+
+  @androidx.car.app.annotations.ExperimentalCarApi public class MessagingServiceConstants {
+    field public static final String ACTION_HANDLE_CAR_MESSAGING = "androidx.car.app.messaging.action.HANDLE_CAR_MESSAGING";
+  }
+
+}
+
 package androidx.car.app.messaging.model {
 
   @androidx.car.app.annotations.CarProtocol @androidx.car.app.annotations.ExperimentalCarApi @androidx.car.app.annotations.RequiresCarApi(6) public class CarMessage {

diff --git a/car/app/app/src/main/java/androidx/car/app/CarAppService.java b/car/app/app/src/main/java/androidx/car/app/CarAppService.java
index 4a8c423..3f4b442 100644
--- a/car/app/app/src/main/java/androidx/car/app/CarAppService.java
+++ b/car/app/app/src/main/java/androidx/car/app/CarAppService.java

@@ -136,6 +136,14 @@
     @ExperimentalCarApi
     public static final String CATEGORY_SETTINGS_APP = "androidx.car.app.category.SETTINGS";
 
+    /**
+     * Used to declare that this app is a messaging app in the manifest.
+     *
+     * <p> This app can be used to send and receive short-form chat messages (IM/SMS).
+     */
+    @ExperimentalCarApi
+    public static final String CATEGORY_MESSAGING_APP = "androidx.car.app.category.MESSAGING";
+
     private static final String AUTO_DRIVE = "AUTO_DRIVE";
 
     @NonNull

diff --git a/car/app/app/src/main/java/androidx/car/app/messaging/MessagingServiceConstants.java b/car/app/app/src/main/java/androidx/car/app/messaging/MessagingServiceConstants.java
new file mode 100644
index 0000000..ef46c87
--- /dev/null
+++ b/car/app/app/src/main/java/androidx/car/app/messaging/MessagingServiceConstants.java

@@ -0,0 +1,36 @@
+/*
+ * Copyright 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.car.app.messaging;
+
+import androidx.car.app.annotations.ExperimentalCarApi;
+
+/** Constants related to messaging in Android Auto */
+@ExperimentalCarApi
+public class MessagingServiceConstants {
+    /**
+     * Used to declare Android Auto messaging support within an app's manifest
+     *
+     * <p> Specifically, this bit should be added to an {@link android.app.IntentService} as the
+     * {@code IntentFilter}'s action. When declared, apps will show up in Android Auto's app
+     * launcher with the "default" / "built-in" in-car messaging experience.
+     */
+    public static final String ACTION_HANDLE_CAR_MESSAGING =
+            "androidx.car.app.messaging.action.HANDLE_CAR_MESSAGING";
+
+    // Do not instantiate
+    private MessagingServiceConstants() {}
+}

diff --git a/collection/collection-benchmark/build.gradle b/collection/collection-benchmark/build.gradle
index 7832f49..1cec99e 100644
--- a/collection/collection-benchmark/build.gradle
+++ b/collection/collection-benchmark/build.gradle

@@ -16,7 +16,6 @@
 
 
 import androidx.build.KmpPlatformsKt
-import androidx.build.Publish
 import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType
 import org.jetbrains.kotlin.gradle.plugin.mpp.BitcodeEmbeddingMode
 import org.jetbrains.kotlin.gradle.plugin.mpp.apple.XCFrameworkConfig
@@ -27,6 +26,7 @@
     id("AndroidXPlugin")
     id("com.android.library")
     id("androidx.benchmark")
+    id("androidx.benchmark.darwin")
 }
 
 def macEnabled = KmpPlatformsKt.enableMac(project)
@@ -34,7 +34,7 @@
 androidXMultiplatform {
     android()
 
-    // XCFrameworkConfig must match module name
+    // XCFrameworkConfig must always be called AndroidXDarwinBenchmarks
     def xcf = new XCFrameworkConfig(project, "AndroidXDarwinBenchmarks")
     ios {
         binaries.framework {
@@ -111,18 +111,14 @@
     description = "AndroidX Collections Benchmarks (Android / iOS)"
 }
 
-if (macEnabled) {
-    apply plugin: "androidx.benchmark.darwin"
-    darwinBenchmark {
-        xcodeGenConfigFile = project.rootProject.file(
-                "benchmark/benchmark-darwin-xcode/projects/collection-benchmark-ios.yml"
-        )
-        xcodeProjectName = "collection-benchmark-ios"
-        scheme = "testapp-ios"
-        // ios 13, 15.2
-        destination = "platform=iOS Simulator,name=iPhone 13,OS=15.2"
-        xcFrameworkConfig = "AndroidXDarwinBenchmarks"
-    }
+darwinBenchmark {
+    xcodeGenConfigFile = project.rootProject.file(
+            "benchmark/benchmark-darwin-xcode/projects/collection-benchmark-ios.yml"
+    )
+    xcodeProjectName = "collection-benchmark-ios"
+    scheme = "testapp-ios"
+    // ios 13, 15.2
+    destination = "platform=iOS Simulator,name=iPhone 13,OS=15.2"
 }
 
 android {

diff --git a/compose/animation/animation-core/src/commonMain/kotlin/androidx/compose/animation/core/AnimateAsState.kt b/compose/animation/animation-core/src/commonMain/kotlin/androidx/compose/animation/core/AnimateAsState.kt
index c7872c7..debf3c6 100644
--- a/compose/animation/animation-core/src/commonMain/kotlin/androidx/compose/animation/core/AnimateAsState.kt
+++ b/compose/animation/animation-core/src/commonMain/kotlin/androidx/compose/animation/core/AnimateAsState.kt

@@ -21,6 +21,7 @@
 import androidx.compose.runtime.SideEffect
 import androidx.compose.runtime.State
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberUpdatedState
 import androidx.compose.ui.geometry.Offset
@@ -396,6 +397,7 @@
     finishedListener: ((T) -> Unit)? = null
 ): State<T> {
 
+    val toolingOverride = remember { mutableStateOf<State<T>?>(null) }
     val animatable = remember { Animatable(targetValue, typeConverter, visibilityThreshold, label) }
     val listener by rememberUpdatedState(finishedListener)
     val animSpec: AnimationSpec<T> by rememberUpdatedState(
@@ -429,7 +431,7 @@
             }
         }
     }
-    return animatable.asState()
+    return toolingOverride.value ?: animatable.asState()
 }
 
 @Deprecated(

diff --git a/compose/compiler/compiler-hosted/integration-tests/src/test/java/androidx/compose/compiler/plugins/kotlin/AbstractControlFlowTransformTests.kt b/compose/compiler/compiler-hosted/integration-tests/src/test/java/androidx/compose/compiler/plugins/kotlin/AbstractControlFlowTransformTests.kt
index c9657c0..c1d0123 100644
--- a/compose/compiler/compiler-hosted/integration-tests/src/test/java/androidx/compose/compiler/plugins/kotlin/AbstractControlFlowTransformTests.kt
+++ b/compose/compiler/compiler-hosted/integration-tests/src/test/java/androidx/compose/compiler/plugins/kotlin/AbstractControlFlowTransformTests.kt

@@ -28,6 +28,7 @@
     ) = verifyComposeIrTransform(
         """
             import androidx.compose.runtime.Composable
+            import androidx.compose.runtime.ReadOnlyComposable
             import androidx.compose.runtime.key
             import androidx.compose.runtime.NonRestartableComposable
 

diff --git a/compose/compiler/compiler-hosted/integration-tests/src/test/java/androidx/compose/compiler/plugins/kotlin/ControlFlowTransformTests.kt b/compose/compiler/compiler-hosted/integration-tests/src/test/java/androidx/compose/compiler/plugins/kotlin/ControlFlowTransformTests.kt
index fc62647..0f96e97 100644
--- a/compose/compiler/compiler-hosted/integration-tests/src/test/java/androidx/compose/compiler/plugins/kotlin/ControlFlowTransformTests.kt
+++ b/compose/compiler/compiler-hosted/integration-tests/src/test/java/androidx/compose/compiler/plugins/kotlin/ControlFlowTransformTests.kt

@@ -287,7 +287,7 @@
             fun Test(condition: Boolean, %composer: Composer?, %changed: Int) {
               %composer = %composer.startRestartGroup(<>)
               sourceInformation(%composer, "C(Test)<A()>,<M3>,<A()>:Test.kt")
-              val tmp1_marker = %composer.currentMarker
+              val tmp0_marker = %composer.currentMarker
               val %dirty = %changed
               if (%changed and 0b1110 === 0) {
                 %dirty = %dirty or if (%composer.changed(condition)) 0b0100 else 0b0010
@@ -303,7 +303,7 @@
                   if (%changed and 0b1011 !== 0b0010 || !%composer.skipping) {
                     A(%composer, 0)
                     if (condition) {
-                      %composer.endToMarker(tmp1_marker)
+                      %composer.endToMarker(tmp0_marker)
                       if (isTraceInProgress()) {
                         traceEventEnd()
                       }
@@ -361,7 +361,7 @@
             fun Test(a: Boolean, b: Boolean, %composer: Composer?, %changed: Int) {
               %composer = %composer.startRestartGroup(<>)
               sourceInformation(%composer, "C(Test)<A()>,<M3>,<M3>,<A()>:Test.kt")
-              val tmp1_marker = %composer.currentMarker
+              val tmp0_marker = %composer.currentMarker
               val %dirty = %changed
               if (%changed and 0b1110 === 0) {
                 %dirty = %dirty or if (%composer.changed(a)) 0b0100 else 0b0010
@@ -380,7 +380,7 @@
                   if (%changed and 0b1011 !== 0b0010 || !%composer.skipping) {
                     A(%composer, 0)
                     if (a) {
-                      %composer.endToMarker(tmp1_marker)
+                      %composer.endToMarker(tmp0_marker)
                       if (isTraceInProgress()) {
                         traceEventEnd()
                       }
@@ -401,7 +401,7 @@
                   if (%changed and 0b1011 !== 0b0010 || !%composer.skipping) {
                     A(%composer, 0)
                     if (b) {
-                      %composer.endToMarker(tmp1_marker)
+                      %composer.endToMarker(tmp0_marker)
                       if (isTraceInProgress()) {
                         traceEventEnd()
                       }
@@ -722,7 +722,7 @@
             fun testInline_M1_W_Return_Func(condition: Boolean, %composer: Composer?, %changed: Int) {
               %composer = %composer.startRestartGroup(<>)
               sourceInformation(%composer, "C(testInline_M1_W_Return_Func)<A()>,<M1>,<A()>:Test.kt")
-              val tmp1_marker = %composer.currentMarker
+              val tmp0_marker = %composer.currentMarker
               val %dirty = %changed
               if (%changed and 0b1110 === 0) {
                 %dirty = %dirty or if (%composer.changed(condition)) 0b0100 else 0b0010
@@ -742,7 +742,7 @@
                     while (true) {
                       A(%composer, 0)
                       if (condition) {
-                        %composer.endToMarker(tmp1_marker)
+                        %composer.endToMarker(tmp0_marker)
                         if (isTraceInProgress()) {
                           traceEventEnd()
                         }
@@ -882,7 +882,7 @@
             fun test_CM1_CCM1_RetFun(condition: Boolean, %composer: Composer?, %changed: Int) {
               %composer = %composer.startRestartGroup(<>)
               sourceInformation(%composer, "C(test_CM1_CCM1_RetFun)<Text("...>,<M1>,<Text("...>:Test.kt")
-              val tmp1_marker = %composer.currentMarker
+              val tmp0_marker = %composer.currentMarker
               val %dirty = %changed
               if (%changed and 0b1110 === 0) {
                 %dirty = %dirty or if (%composer.changed(condition)) 0b0100 else 0b0010
@@ -906,7 +906,7 @@
                         sourceInformation(%composer, "C<Text("...>:Test.kt")
                         if (%changed and 0b1011 !== 0b0010 || !%composer.skipping) {
                           Text("In CCM1", %composer, 0b0110)
-                          %composer.endToMarker(tmp1_marker)
+                          %composer.endToMarker(tmp0_marker)
                           if (isTraceInProgress()) {
                             traceEventEnd()
                           }
@@ -998,6 +998,295 @@
         """
     )
 
+    @Test // regression 255350755
+    fun testEnsureEarlyExitInNonInline_NormalComposable() = controlFlow(
+        """
+            object obj {
+                val condition = true
+            }
+
+            @Composable
+            fun Test(condition: Boolean) {
+                if (condition) return
+                with (obj) {
+                    if (condition) return
+                }
+                A()
+            }
+        """,
+        """
+            @StabilityInferred(parameters = 0)
+            object obj {
+              val condition: Boolean = true
+              static val %stable: Int = 0
+            }
+            @Composable
+            fun Test(condition: Boolean, %composer: Composer?, %changed: Int) {
+              %composer = %composer.startRestartGroup(<>)
+              sourceInformation(%composer, "C(Test)<A()>:Test.kt")
+              val tmp0_marker = %composer.currentMarker
+              val %dirty = %changed
+              if (%changed and 0b1110 === 0) {
+                %dirty = %dirty or if (%composer.changed(condition)) 0b0100 else 0b0010
+              }
+              if (%dirty and 0b1011 !== 0b0010 || !%composer.skipping) {
+                if (isTraceInProgress()) {
+                  traceEventStart(<>, %changed, -1, <>)
+                }
+                if (condition) {
+                  if (isTraceInProgress()) {
+                    traceEventEnd()
+                  }
+                  %composer.endRestartGroup()?.updateScope { %composer: Composer?, %force: Int ->
+                    Test(condition, %composer, updateChangedFlags(%changed or 0b0001))
+                  }
+                  return
+                }
+                with(obj) {
+                  if (condition) {
+                    %composer.endToMarker(tmp0_marker)
+                    if (isTraceInProgress()) {
+                      traceEventEnd()
+                    }
+                    %composer.endRestartGroup()?.updateScope { %composer: Composer?, %force: Int ->
+                      Test(condition, %composer, updateChangedFlags(%changed or 0b0001))
+                    }
+                    return
+                  }
+                }
+                A(%composer, 0)
+                if (isTraceInProgress()) {
+                  traceEventEnd()
+                }
+              } else {
+                %composer.skipToGroupEnd()
+              }
+              %composer.endRestartGroup()?.updateScope { %composer: Composer?, %force: Int ->
+                Test(condition, %composer, updateChangedFlags(%changed or 0b0001))
+              }
+            }
+        """
+    )
+
+    @Test // regression 255350755
+    fun testEnsureEarlyExitInNonInline_ReadOnlyComposable() = controlFlow(
+        """
+            import androidx.compose.runtime.currentComposer
+
+            object obj {
+                val condition = false
+            }
+
+            @Composable
+            @ReadOnlyComposable
+            fun Calculate(condition: Boolean): Boolean {
+                if (condition) return false
+
+                with (obj) {
+                    if (condition) return false
+                    return currentComposer.inserting
+                }
+            }
+        """,
+        """
+            @StabilityInferred(parameters = 0)
+            object obj {
+              val condition: Boolean = false
+              static val %stable: Int = 0
+            }
+            @Composable
+            @ReadOnlyComposable
+            fun Calculate(condition: Boolean, %composer: Composer?, %changed: Int): Boolean {
+              sourceInformationMarkerStart(%composer, <>, "C(Calculate):Test.kt")
+              val tmp1_marker = %composer.currentMarker
+              if (isTraceInProgress()) {
+                traceEventStart(<>, %changed, -1, <>)
+              }
+              if (condition) {
+                val tmp0_return = false
+                sourceInformationMarkerEnd(%composer)
+                return tmp0_return
+              }
+              with(obj) {
+                if (condition) {
+                  val tmp0_return = false
+                  %composer.endToMarker(tmp1_marker)
+                  sourceInformationMarkerEnd(%composer)
+                  return tmp0_return
+                }
+                val tmp1_return = %composer.inserting
+                %composer.endToMarker(tmp1_marker)
+                sourceInformationMarkerEnd(%composer)
+                return tmp1_return
+              }
+              if (isTraceInProgress()) {
+                traceEventEnd()
+              }
+              sourceInformationMarkerEnd(%composer)
+            }
+        """
+    )
+
+    @Test // regression 255350755
+    fun testEnsureEarlyExitInInline_Labeled() = controlFlow(
+        """
+            @Composable
+            fun Test(condition: Boolean) {
+                IW iw@ {
+                    if (condition) return@iw
+                    A()
+                }
+            }
+        """,
+        """
+            @Composable
+            fun Test(condition: Boolean, %composer: Composer?, %changed: Int) {
+              %composer = %composer.startRestartGroup(<>)
+              sourceInformation(%composer, "C(Test)<IW>:Test.kt")
+              val %dirty = %changed
+              if (%changed and 0b1110 === 0) {
+                %dirty = %dirty or if (%composer.changed(condition)) 0b0100 else 0b0010
+              }
+              if (%dirty and 0b1011 !== 0b0010 || !%composer.skipping) {
+                if (isTraceInProgress()) {
+                  traceEventStart(<>, %changed, -1, <>)
+                }
+                val tmp0_marker = %composer.currentMarker
+                IW({ %composer: Composer?, %changed: Int ->
+                  %composer.startReplaceableGroup(<>)
+                  sourceInformation(%composer, "C<A()>:Test.kt")
+                  if (%changed and 0b1011 !== 0b0010 || !%composer.skipping) {
+                    if (condition) {
+                      %composer.endToMarker(tmp0_marker)
+                    }
+                    A(%composer, 0)
+                  } else {
+                    %composer.skipToGroupEnd()
+                  }
+                  %composer.endReplaceableGroup()
+                }, %composer, 0)
+                if (isTraceInProgress()) {
+                  traceEventEnd()
+                }
+              } else {
+                %composer.skipToGroupEnd()
+              }
+              %composer.endRestartGroup()?.updateScope { %composer: Composer?, %force: Int ->
+                Test(condition, %composer, updateChangedFlags(%changed or 0b0001))
+              }
+            }
+        """
+    )
+
+    @Test
+    fun testEnsureRuntimeTestWillCompile_CL() = ensureSetup {
+        classLoader(
+            """
+            import androidx.compose.runtime.Composable
+
+            @Composable
+            fun test_CM1_RetFun(condition: Boolean) {
+                Text("Root - before")
+                M1 {
+                    Text("M1 - before")
+                    if (condition) return
+                    Text("M1 - after")
+                }
+                Text("Root - after")
+            }
+            @Composable
+            inline fun InlineWrapper(content: @Composable () -> Unit) = content()
+
+            @Composable
+            inline fun M1(content: @Composable () -> Unit) = InlineWrapper { content() }
+
+            @Composable
+            fun Text(value: String) { }
+            """,
+            "Test.kt"
+        )
+    }
+
+    @Test // regression 255350755
+    fun testEnsureRuntimeTestWillCompile_CG() = verifyComposeIrTransform(
+        """
+            import androidx.compose.runtime.Composable
+
+            @Composable
+            fun test_CM1_RetFun(condition: Boolean) {
+                Text("Root - before")
+                M1 {
+                    Text("M1 - before")
+                    if (condition) return
+                    Text("M1 - after")
+                }
+                Text("Root - after")
+            }
+
+        """,
+        """
+            @Composable
+            fun test_CM1_RetFun(condition: Boolean, %composer: Composer?, %changed: Int) {
+              %composer = %composer.startRestartGroup(<>)
+              sourceInformation(%composer, "C(test_CM1_RetFun)<Text("...>,<M1>,<Text("...>:Test.kt")
+              val tmp0_marker = %composer.currentMarker
+              val %dirty = %changed
+              if (%changed and 0b1110 === 0) {
+                %dirty = %dirty or if (%composer.changed(condition)) 0b0100 else 0b0010
+              }
+              if (%dirty and 0b1011 !== 0b0010 || !%composer.skipping) {
+                if (isTraceInProgress()) {
+                  traceEventStart(<>, %changed, -1, <>)
+                }
+                Text("Root - before", %composer, 0b0110)
+                M1({ %composer: Composer?, %changed: Int ->
+                  %composer.startReplaceableGroup(<>)
+                  sourceInformation(%composer, "C<Text("...>,<Text("...>:Test.kt")
+                  if (%changed and 0b1011 !== 0b0010 || !%composer.skipping) {
+                    Text("M1 - before", %composer, 0b0110)
+                    if (condition) {
+                      %composer.endToMarker(tmp0_marker)
+                      if (isTraceInProgress()) {
+                        traceEventEnd()
+                      }
+                      %composer.endRestartGroup()?.updateScope { %composer: Composer?, %force: Int ->
+                        test_CM1_RetFun(condition, %composer, updateChangedFlags(%changed or 0b0001))
+                      }
+                      return
+                    }
+                    Text("M1 - after", %composer, 0b0110)
+                  } else {
+                    %composer.skipToGroupEnd()
+                  }
+                  %composer.endReplaceableGroup()
+                }, %composer, 0)
+                Text("Root - after", %composer, 0b0110)
+                if (isTraceInProgress()) {
+                  traceEventEnd()
+                }
+              } else {
+                %composer.skipToGroupEnd()
+              }
+              %composer.endRestartGroup()?.updateScope { %composer: Composer?, %force: Int ->
+                test_CM1_RetFun(condition, %composer, updateChangedFlags(%changed or 0b0001))
+              }
+            }
+        """,
+        extra = """
+            import androidx.compose.runtime.Composable
+            import androidx.compose.runtime.NonRestartableComposable
+
+            @Composable
+            inline fun InlineWrapper(content: @Composable () -> Unit) = content()
+
+            @Composable
+            inline fun M1(content: @Composable () -> Unit) = InlineWrapper { content() }
+
+            @Composable @NonRestartableComposable
+            fun Text(value: String) { }
+        """
+    )
+
     @Test
     fun testIfElseWithCallsInConditions(): Unit = controlFlow(
         """
@@ -5299,8 +5588,6 @@
     @Test
     fun testReadOnlyComposableWithEarlyReturn() = controlFlow(
         source = """
-            import androidx.compose.runtime.ReadOnlyComposable
-
             @ReadOnlyComposable
             @Composable
             fun getSomeValue(a: Int): Int {