Tests

Author: GaryQian

shell/platform/android/io/flutter/embedding/android/FlutterActivity.java

@@ -496,11 +496,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
 
     lifecycle.handleLifecycleEvent(Lifecycle.Event.ON_CREATE);
 
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.T) {
-      getOnBackInvokedDispatcher()
-          .registerOnBackInvokedCallback(
-              OnBackInvokedDispatcher.PRIORITY_DEFAULT, onBackInvokedCallback);
-    }
+    registerOnBackInvokedCallback();
 
     configureWindowForTransparency();
 
@@ -509,6 +505,22 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
     configureStatusBarForFullscreenFlutterExperience();
   }
 
+  @VisibleForTesting
+  public void registerOnBackInvokedCallback() {
+    if (Build.VERSION.SDK_INT >= 33) {
+      getOnBackInvokedDispatcher()
+          .registerOnBackInvokedCallback(
+              OnBackInvokedDispatcher.PRIORITY_DEFAULT, onBackInvokedCallback);
+    }
+  }
+
+  @VisibleForTesting
+  public void unregisterOnBackInvokedCallback() {
+    if (Build.VERSION.SDK_INT >= 33) {
+      getOnBackInvokedDispatcher().unregisterOnBackInvokedCallback(onBackInvokedCallback);
+    }
+  }
+
   private final OnBackInvokedCallback onBackInvokedCallback =
       new OnBackInvokedCallback() {
         @Override
@@ -671,9 +683,6 @@ protected void onPause() {
   @Override
   protected void onStop() {
     super.onStop();
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.T) {
-      getOnBackInvokedDispatcher().unregisterOnBackInvokedCallback(onBackInvokedCallback);
-    }
     if (stillAttachedForEvent("onStop")) {
       delegate.onStop();
     }
@@ -699,6 +708,7 @@ protected void onSaveInstanceState(Bundle outState) {
    * <p>After calling, this activity should be disposed immediately and not be re-used.
    */
   private void release() {
+    unregisterOnBackInvokedCallback();
     if (delegate != null) {
       delegate.release();
       delegate = null;

shell/platform/android/test/io/flutter/embedding/android/FlutterActivityTest.java

@@ -88,6 +88,21 @@ public void flutterViewHasId() {
     assertTrue(activity.findViewById(FlutterActivity.FLUTTER_VIEW_ID) instanceof FlutterView);
   }
 
+  // TODO(garyq): Robolectric does not yet support android api 33 yet. Switch to a robolectric
+  // test that directly exercises the OnBackInvoked APIs when API 33 is supported.
+  @Test
+  @TargetApi(33)
+  public void itRegistersOnBackInvokedCallbackOnCreate() {
+    Intent intent = FlutterActivityWithReportFullyDrawn.createDefaultIntent(ctx);
+    ActivityController<FlutterActivityWithReportFullyDrawn> activityController =
+        Robolectric.buildActivity(FlutterActivityWithReportFullyDrawn.class, intent);
+    FlutterActivityWithReportFullyDrawn activity = spy(activityController.get());
+
+    activity.onCreate(null);
+
+    verify(activity, times(1)).registerOnBackInvokedCallback();
+  }
+
   @Test
   public void itCreatesDefaultIntentWithExpectedDefaults() {
     Intent intent = FlutterActivity.createDefaultIntent(ctx);
@@ -596,6 +611,14 @@ public void resetFullyDrawn() {
     }
   }
 
+  private class FlutterActivityWithMockBackInvokedHandling extends FlutterActivity {
+    @Override
+    public void registerOnBackInvokedCallback() {}
+
+    @Override
+    public void unregisterOnBackInvokedCallback() {}
+  }
+
   private static final class FakeFlutterPlugin
       implements FlutterPlugin,
           ActivityAware,

shell/platform/android/test_runner/build.gradle

@@ -36,6 +36,7 @@ android {
   compileSdkVersion 33
 
   defaultConfig {
+    targetSdkVersion 33
     minSdkVersion 16
   }
 
@@ -70,11 +71,11 @@ android {
     testImplementation "androidx.test:core:1.4.0"
     testImplementation "com.google.android.play:core:1.8.0"
     testImplementation "com.ibm.icu:icu4j:69.1"
-    testImplementation "org.robolectric:robolectric:4.7.3"
-    testImplementation "junit:junit:4.13"
-    testImplementation "androidx.test.ext:junit:1.1.3"
+    testImplementation "org.robolectric:robolectric:4.8.2"
+    testImplementation "junit:junit:4.13.2"
+    testImplementation "androidx.test.ext:junit:1.1.4-alpha07"
 
-    def mockitoVersion = "4.1.0"
+    def mockitoVersion = "4.7.0"
     testImplementation "org.mockito:mockito-core:$mockitoVersion"
     testImplementation "org.mockito:mockito-inline:$mockitoVersion"
     testImplementation "org.mockito:mockito-android:$mockitoVersion"

shell/platform/android/test_runner/src/main/resources/robolectric.properties

@@ -1,2 +1,2 @@
-sdk=31
+sdk=32
 shadows=io.flutter.CustomShadowContextImpl