Remove all obsolete logic for Android SDKs < 19.

Since androidx now supports only SDKs 19 and above, remove all logic that
is applicable only to APIs < 19.

#cleanup

PiperOrigin-RevId: 599556590

Author: brettchabot

core/CHANGELOG.md

@@ -5,8 +5,9 @@
 `androidx.test:core:{version}` and `androidx.test:core-ktx:{version}` are released.
 
 **Bug Fixes**
-Update Activity Scenario reference documentation to fix missing links
 
+* Update Activity Scenario reference documentation to fix missing links
+* Remove all support for Android SDKs < 19. Minimum is API 19 (Android Kit Kat 4.4)
 * Reference doc cleanup - document previously missing parameters, fix links, etc
 
 **New Features**

core/java/androidx/test/core/app/DeviceCapture.kt

@@ -18,12 +18,10 @@
 package androidx.test.core.app
 
 import android.graphics.Bitmap
-import android.os.Build
 import android.os.Handler
 import android.os.Looper
 import android.util.Log
 import android.view.Choreographer
-import androidx.annotation.RequiresApi
 import androidx.annotation.RestrictTo
 import androidx.concurrent.futures.ResolvableFuture
 import androidx.test.annotation.ExperimentalTestApi
@@ -49,9 +47,7 @@ import java.util.concurrent.TimeUnit
  */
 @ExperimentalTestApi
 fun canTakeScreenshot(): Boolean =
-  Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2 &&
-    getInstrumentation().uiAutomation != null &&
-    Looper.myLooper() != Looper.getMainLooper()
+  getInstrumentation().uiAutomation != null && Looper.myLooper() != Looper.getMainLooper()
 
 /**
  * Captures an image of the device's screen into a [Bitmap].
@@ -75,7 +71,6 @@ fun canTakeScreenshot(): Boolean =
  *   to UiAutomation, [RuntimeException] if UiAutomation fails to take the screenshot
  */
 @ExperimentalTestApi
-@RequiresApi(Build.VERSION_CODES.JELLY_BEAN_MR2)
 @Suppress("FutureReturnValueIgnored")
 @Throws(RuntimeException::class)
 fun takeScreenshot(): Bitmap {
@@ -96,7 +91,6 @@ fun takeScreenshot(): Bitmap {
  */
 @ExperimentalTestApi
 @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
-@RequiresApi(Build.VERSION_CODES.JELLY_BEAN_MR2)
 @Suppress("FutureReturnValueIgnored")
 @Throws(RuntimeException::class)
 fun takeScreenshotNoSync(): Bitmap {
@@ -147,7 +141,6 @@ fun takeScreenshotNoSync(): Bitmap {
   }
 }
 
-@RequiresApi(Build.VERSION_CODES.JELLY_BEAN_MR2)
 private fun forceRedrawGlobalWindowViews(mainExecutor: Executor): ListenableFuture<List<Void>> {
   val future: ResolvableFuture<List<Void>> = ResolvableFuture.create()
   mainExecutor.execute {

core/java/androidx/test/core/content/pm/PackageInfoBuilder.java

@@ -96,7 +96,6 @@ public PackageInfoBuilder setVersionName(String versionName) {
    * @see PackageInfo#requestedPermissions
    * @see PackageInfo#requestedPermissionsFlags
    */
-  @TargetApi(Build.VERSION_CODES.JELLY_BEAN)
   public PackageInfoBuilder addRequestedPermission(
       String requestedPermission, int requestedPermissionFlag) {
     requestedPermissionsMap.put(requestedPermission, requestedPermissionFlag);
@@ -137,16 +136,13 @@ public PackageInfo build() {
     packageInfo.applicationInfo = applicationInfo;
     packageInfo.requestedPermissions = requestedPermissionsMap.keySet().toArray(new String[0]);
 
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
-      Integer[] requestedPermissionsFlags =
-          requestedPermissionsMap.values().toArray(new Integer[0]);
-      // Stream APIs such as `mapToInt` are not supported below API 24.
-      int[] requestedPermissionsFlagsIntArray = new int[requestedPermissionsFlags.length];
-      for (int i = 0; i < requestedPermissionsFlags.length; i++) {
-        requestedPermissionsFlagsIntArray[i] = requestedPermissionsFlags[i];
-      }
-      packageInfo.requestedPermissionsFlags = requestedPermissionsFlagsIntArray;
+    Integer[] requestedPermissionsFlags = requestedPermissionsMap.values().toArray(new Integer[0]);
+    // Stream APIs such as `mapToInt` are not supported below API 24.
+    int[] requestedPermissionsFlagsIntArray = new int[requestedPermissionsFlags.length];
+    for (int i = 0; i < requestedPermissionsFlags.length; i++) {
+      requestedPermissionsFlagsIntArray[i] = requestedPermissionsFlags[i];
     }
+    packageInfo.requestedPermissionsFlags = requestedPermissionsFlagsIntArray;
 
     checkState(
         packageInfo.packageName.equals(packageInfo.applicationInfo.packageName),

core/java/androidx/test/core/view/ViewCapture.kt

@@ -60,7 +60,6 @@ import java.util.function.Consumer
  * This API is currently experimental and subject to change or removal.
  */
 @ExperimentalTestApi
-@RequiresApi(Build.VERSION_CODES.JELLY_BEAN)
 fun View.captureToBitmap(rect: Rect? = null): ListenableFuture<Bitmap> {
   val bitmapFuture: ResolvableFuture<Bitmap> = ResolvableFuture.create()
   val mainExecutor = HandlerExecutor(Handler(Looper.getMainLooper()))
@@ -90,8 +89,7 @@ fun View.captureToBitmap(rect: Rect? = null): ListenableFuture<Bitmap> {
  *
  * @return a [ListenableFuture] that will be complete once ui drawing is complete
  */
-// NoClassDefFoundError occurs on API 15
-@RequiresApi(Build.VERSION_CODES.JELLY_BEAN)
+// TODO(b/316921934): uncomment once @ExperimentalTestApi is removed
 // @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
 @ExperimentalTestApi
 fun View.forceRedraw(): ListenableFuture<Void> {

core/java/androidx/test/core/view/WindowCapture.kt

@@ -24,7 +24,6 @@ import android.os.Handler
 import android.os.Looper
 import android.view.PixelCopy
 import android.view.Window
-import androidx.annotation.RequiresApi
 import androidx.concurrent.futures.ResolvableFuture
 import androidx.test.annotation.ExperimentalTestApi
 import androidx.test.core.internal.os.HandlerExecutor
@@ -45,7 +44,6 @@ import com.google.common.util.concurrent.ListenableFuture
  * This API is currently experimental and subject to change or removal.
  */
 @ExperimentalTestApi
-@RequiresApi(Build.VERSION_CODES.JELLY_BEAN)
 fun Window.captureRegionToBitmap(boundsInWindow: Rect? = null): ListenableFuture<Bitmap> {
   val bitmapFuture: ResolvableFuture<Bitmap> = ResolvableFuture.create()
   val mainExecutor = HandlerExecutor(Handler(Looper.getMainLooper()))

core/javatests/androidx/test/core/content/pm/PackageInfoBuilderTest.java

@@ -74,8 +74,6 @@ public void build_withLongVersionCode() {
 
   @Test
   public void build_withRequestedPermissionsFlags() {
-    // API added in API 16 or newer.
-    assumeTrue(Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN);
     int permissionFlag = PackageInfo.REQUESTED_PERMISSION_GRANTED;
 
     PackageInfo packageInfo =

espresso/CHANGELOG.md

@@ -20,6 +20,7 @@ The following artifacts were released:
 * Remove Kotlin collect stdlib calls in Java from espresso
 * Reference doc cleanup - document previously missing parameters, fix links, etc
 * Remove Kotlin StringKt calls from Java code
+* Remove all support for Android SDKs < 19. Minimum is API 19 (Android Kit Kat 4.4)
 
 **New Features**
 

espresso/core/java/androidx/test/espresso/Espresso.java

@@ -29,8 +29,6 @@
 
 import android.content.Context;
 import android.os.Build;
-import android.os.Build.VERSION;
-import android.os.Build.VERSION_CODES;
 import android.os.Looper;
 import android.util.Log;
 import android.view.Choreographer;
@@ -297,11 +295,6 @@ public static void openActionBarOverflowOrOptionsMenu(Context context) {
   }
 
   private static void waitUntilNextFrame(int times) {
-    // Choreographer API is added in API 16.
-    if (VERSION.SDK_INT < VERSION_CODES.JELLY_BEAN) {
-      return;
-    }
-
     for (int i = 0; i < times; ++i) {
       CountDownLatch latch = new CountDownLatch(1);
       InstrumentationRegistry.getInstrumentation()
@@ -393,11 +386,7 @@ public Void call() throws Exception {
   }
 
   private static boolean hasVirtualOverflowButton(Context context) {
-    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
-      return Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB;
-    } else {
-      return !ViewConfiguration.get(context).hasPermanentMenuKey();
-    }
+    return !ViewConfiguration.get(context).hasPermanentMenuKey();
   }
 
   /**

espresso/core/java/androidx/test/espresso/action/AdapterViewProtocols.java

@@ -20,7 +20,6 @@
 import static androidx.test.internal.util.Checks.checkArgument;
 
 import android.database.Cursor;
-import android.os.Build;
 import android.util.Log;
 import android.view.View;
 import android.widget.AbsListView;
@@ -133,25 +132,19 @@ public void makeDataRenderedWithinAdapterView(
       boolean moved = false;
       // set selection should always work, we can give a little better experience if per subtype
       // though.
-      if (Build.VERSION.SDK_INT > 7) {
-        if (adapterView instanceof AbsListView) {
-          if (Build.VERSION.SDK_INT > 10) {
-            ((AbsListView) adapterView)
-                .smoothScrollToPositionFromTop(position, adapterView.getPaddingTop(), 0);
-          } else {
-            ((AbsListView) adapterView).smoothScrollToPosition(position);
-          }
-          moved = true;
-        }
-        if (Build.VERSION.SDK_INT > 10) {
-          if (adapterView instanceof AdapterViewAnimator) {
-            if (adapterView instanceof AdapterViewFlipper) {
-              ((AdapterViewFlipper) adapterView).stopFlipping();
-            }
-            ((AdapterViewAnimator) adapterView).setDisplayedChild(position);
-            moved = true;
-          }
+      if (adapterView instanceof AbsListView) {
+        ((AbsListView) adapterView)
+            .smoothScrollToPositionFromTop(position, adapterView.getPaddingTop(), 0);
+
+        moved = true;
+      }
+
+      if (adapterView instanceof AdapterViewAnimator) {
+        if (adapterView instanceof AdapterViewFlipper) {
+          ((AdapterViewFlipper) adapterView).stopFlipping();
         }
+        ((AdapterViewAnimator) adapterView).setDisplayedChild(position);
+        moved = true;
       }
       if (!moved) {
         adapterView.setSelection(position);

espresso/core/java/androidx/test/espresso/action/EspressoKey.java

@@ -18,7 +18,6 @@
 
 import static androidx.test.internal.util.Checks.checkState;
 
-import android.os.Build;
 import android.view.KeyEvent;
 import androidx.test.espresso.remote.annotation.RemoteMsgConstructor;
 import androidx.test.espresso.remote.annotation.RemoteMsgField;
@@ -73,10 +72,7 @@ public Builder withShiftPressed(boolean shiftPressed) {
       return this;
     }
 
-    /**
-     * On Honeycomb and above, sets the CTRL_ON meta state of the resulting key. On Gingerbread and
-     * below, this is a noop.
-     */
+    /** Sets the CTRL_ON meta state of the resulting key. */
     public Builder withCtrlPressed(boolean ctrlPressed) {
       isCtrlPressed = ctrlPressed;
       return this;
@@ -98,7 +94,7 @@ private int getMetaState() {
         metaState |= KeyEvent.META_ALT_ON;
       }
 
-      if (isCtrlPressed && Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
+      if (isCtrlPressed) {
         metaState |= KeyEvent.META_CTRL_ON;
       }