diff --git a/build_extensions/AndroidManifest_robolectric.xml b/build_extensions/AndroidManifest_robolectric.xml index 4685d5733..3cc9b3da8 100644 --- a/build_extensions/AndroidManifest_robolectric.xml +++ b/build_extensions/AndroidManifest_robolectric.xml @@ -18,7 +18,7 @@ package="androidx.test.robolectric" > diff --git a/build_extensions/AndroidManifest_target_stub.xml b/build_extensions/AndroidManifest_target_stub.xml index 1a520ad8d..b7c695f15 100644 --- a/build_extensions/AndroidManifest_target_stub.xml +++ b/build_extensions/AndroidManifest_target_stub.xml @@ -18,7 +18,7 @@ package="${applicationId}" > diff --git a/core/CHANGELOG.md b/core/CHANGELOG.md index e5c230db6..b973f2b2d 100644 --- a/core/CHANGELOG.md +++ b/core/CHANGELOG.md @@ -12,7 +12,7 @@ **API Changes** -* Update to minSdkVersion 23 and remove all related logic for SDKs < 23 +* Update to minSdkVersion 24 and remove all related logic for SDKs < 24 **Breaking API Changes** diff --git a/core/java/androidx/test/core/AndroidManifest.xml b/core/java/androidx/test/core/AndroidManifest.xml index 692342834..f0f3a04a9 100644 --- a/core/java/androidx/test/core/AndroidManifest.xml +++ b/core/java/androidx/test/core/AndroidManifest.xml @@ -18,7 +18,7 @@ package="androidx.test.core" > diff --git a/core/javatests/androidx/test/core/app/AndroidManifest_target.xml b/core/javatests/androidx/test/core/app/AndroidManifest_target.xml index cc9ccbbbf..e421012d1 100644 --- a/core/javatests/androidx/test/core/app/AndroidManifest_target.xml +++ b/core/javatests/androidx/test/core/app/AndroidManifest_target.xml @@ -18,7 +18,7 @@ package="androidx.test.core.app" > diff --git a/core/javatests/androidx/test/core/app/AndroidManifest_test.xml b/core/javatests/androidx/test/core/app/AndroidManifest_test.xml index 8935f2d73..343adcbb1 100644 --- a/core/javatests/androidx/test/core/app/AndroidManifest_test.xml +++ b/core/javatests/androidx/test/core/app/AndroidManifest_test.xml @@ -18,7 +18,7 @@ package="androidx.test.core.app.test" > diff --git a/core/javatests/androidx/test/core/app/testing/AndroidManifest.xml b/core/javatests/androidx/test/core/app/testing/AndroidManifest.xml index 87340d09c..20f6c4644 100644 --- a/core/javatests/androidx/test/core/app/testing/AndroidManifest.xml +++ b/core/javatests/androidx/test/core/app/testing/AndroidManifest.xml @@ -3,7 +3,7 @@ xmlns:android="http://schemas.android.com/apk/res/android" package="androidx.test.core.app.testing"> + android:minSdkVersion="24"/> + android:minSdkVersion="24"/> diff --git a/espresso/CHANGELOG.md b/espresso/CHANGELOG.md index 41eba945b..110c0a51f 100644 --- a/espresso/CHANGELOG.md +++ b/espresso/CHANGELOG.md @@ -29,7 +29,7 @@ The following artifacts were released: **API Changes** -* Update to minSdkVersion 23 and remove all related logic for SDKs < 23 +* Update to minSdkVersion 24 and remove all related logic for SDKs < 24 **Breaking API Changes** diff --git a/espresso/accessibility/java/androidx/test/espresso/accessibility/AndroidManifest.xml b/espresso/accessibility/java/androidx/test/espresso/accessibility/AndroidManifest.xml index 89b9c7b1c..00c8571ef 100644 --- a/espresso/accessibility/java/androidx/test/espresso/accessibility/AndroidManifest.xml +++ b/espresso/accessibility/java/androidx/test/espresso/accessibility/AndroidManifest.xml @@ -19,7 +19,7 @@ package="androidx.test.espresso.accessibility" > diff --git a/espresso/contrib/java/androidx/test/espresso/contrib/AndroidManifest.xml b/espresso/contrib/java/androidx/test/espresso/contrib/AndroidManifest.xml index 221ee4e85..13d5cc890 100644 --- a/espresso/contrib/java/androidx/test/espresso/contrib/AndroidManifest.xml +++ b/espresso/contrib/java/androidx/test/espresso/contrib/AndroidManifest.xml @@ -19,7 +19,7 @@ package="androidx.test.espresso.contrib" > diff --git a/espresso/core/java/androidx/test/espresso/AndroidManifest.xml b/espresso/core/java/androidx/test/espresso/AndroidManifest.xml index 7bd15762b..c59d424e7 100644 --- a/espresso/core/java/androidx/test/espresso/AndroidManifest.xml +++ b/espresso/core/java/androidx/test/espresso/AndroidManifest.xml @@ -18,7 +18,7 @@ package="androidx.test.espresso.core" > diff --git a/espresso/core/java/androidx/test/espresso/base/ConfigurationSynchronizationUtils.java b/espresso/core/java/androidx/test/espresso/base/ConfigurationSynchronizationUtils.java index d976c3602..0c5db8a52 100644 --- a/espresso/core/java/androidx/test/espresso/base/ConfigurationSynchronizationUtils.java +++ b/espresso/core/java/androidx/test/espresso/base/ConfigurationSynchronizationUtils.java @@ -48,7 +48,7 @@ public static void waitForConfigurationChangesOnActivity( Activity currentActivity, UiController uiController, Context appContext) { // The activity's orientation can differ from application's orientation when the activity is in // multi-window mode. - if (Build.VERSION.SDK_INT >= 24 && currentActivity.isInMultiWindowMode()) { + if (currentActivity.isInMultiWindowMode()) { return; } // If the application is running activities in different processes, activities that aren't diff --git a/espresso/core/java/androidx/test/espresso/base/InputManagerEventInjectionStrategy.java b/espresso/core/java/androidx/test/espresso/base/InputManagerEventInjectionStrategy.java index fa28796ee..1734e41a1 100644 --- a/espresso/core/java/androidx/test/espresso/base/InputManagerEventInjectionStrategy.java +++ b/espresso/core/java/androidx/test/espresso/base/InputManagerEventInjectionStrategy.java @@ -36,7 +36,7 @@ /** * An {@link EventInjectionStrategy} that uses the input manager to inject Events. This strategy - * supports API level 23 and above. + * supports API level 24 and above. */ final class InputManagerEventInjectionStrategy implements EventInjectionStrategy { private static final String TAG = "EventInjectionStrategy"; diff --git a/espresso/core/java/androidx/test/espresso/matcher/RootMatchers.java b/espresso/core/java/androidx/test/espresso/matcher/RootMatchers.java index 71f63da29..f588700d4 100644 --- a/espresso/core/java/androidx/test/espresso/matcher/RootMatchers.java +++ b/espresso/core/java/androidx/test/espresso/matcher/RootMatchers.java @@ -23,7 +23,6 @@ import static org.hamcrest.Matchers.is; import android.app.Activity; -import android.os.Build; import android.os.IBinder; import android.util.Log; import android.view.View; @@ -226,19 +225,13 @@ public IsPlatformPopup() {} @Override public boolean matchesSafely(Root item) { - String popupClassName = "android.widget.PopupWindow$PopupViewContainer"; - if (Build.VERSION.SDK_INT >= 23) { - popupClassName = "android.widget.PopupWindow$PopupDecorView"; - } + String popupClassName = "android.widget.PopupWindow$PopupDecorView"; return withDecorView(withClassName(is(popupClassName))).matches(item); } @Override public void describeTo(Description description) { - String popupClassName = "PopupWindow$PopupViewContainer"; - if (Build.VERSION.SDK_INT >= 23) { - popupClassName = "PopupWindow$PopupDecorView"; - } + String popupClassName = "PopupWindow$PopupDecorView"; description.appendText("with decor view of type " + popupClassName); } } diff --git a/espresso/core/java/androidx/test/espresso/remote/AndroidManifest.xml b/espresso/core/java/androidx/test/espresso/remote/AndroidManifest.xml index 7e40ca101..492bef620 100644 --- a/espresso/core/java/androidx/test/espresso/remote/AndroidManifest.xml +++ b/espresso/core/java/androidx/test/espresso/remote/AndroidManifest.xml @@ -19,7 +19,7 @@ package="androidx.test.espresso.remote" > diff --git a/espresso/core/javatests/androidx/test/espresso/action/AndroidManifest_key.xml b/espresso/core/javatests/androidx/test/espresso/action/AndroidManifest_key.xml index 239a6ba37..475f57d23 100644 --- a/espresso/core/javatests/androidx/test/espresso/action/AndroidManifest_key.xml +++ b/espresso/core/javatests/androidx/test/espresso/action/AndroidManifest_key.xml @@ -18,7 +18,7 @@ package="androidx.test.espresso.action" > diff --git a/espresso/device/CHANGELOG.md b/espresso/device/CHANGELOG.md index 15eb6a686..d95a00a98 100644 --- a/espresso/device/CHANGELOG.md +++ b/espresso/device/CHANGELOG.md @@ -12,7 +12,7 @@ **API Changes** -* Update to minSdkVersion 23 and remove all related logic for SDKs < 23 +* Update to minSdkVersion 24 and remove all related logic for SDKs < 24 **Breaking API Changes** diff --git a/espresso/device/java/androidx/test/espresso/device/AndroidManifest.xml b/espresso/device/java/androidx/test/espresso/device/AndroidManifest.xml index 2f8935a30..e79c6bb88 100644 --- a/espresso/device/java/androidx/test/espresso/device/AndroidManifest.xml +++ b/espresso/device/java/androidx/test/espresso/device/AndroidManifest.xml @@ -21,7 +21,7 @@ \ No newline at end of file diff --git a/espresso/device/java/androidx/test/espresso/device/common/AccelerometerRotationUtil.kt b/espresso/device/java/androidx/test/espresso/device/common/AccelerometerRotationUtil.kt index 0b7a9e8bf..eec673522 100644 --- a/espresso/device/java/androidx/test/espresso/device/common/AccelerometerRotationUtil.kt +++ b/espresso/device/java/androidx/test/espresso/device/common/AccelerometerRotationUtil.kt @@ -18,11 +18,9 @@ package androidx.test.espresso.device.common -import android.os.Build import android.os.Handler import android.os.HandlerThread import android.provider.Settings -import androidx.annotation.RequiresApi import androidx.annotation.RestrictTo import androidx.test.platform.app.InstrumentationRegistry import java.util.concurrent.CountDownLatch @@ -34,7 +32,7 @@ fun getAccelerometerRotationSetting(): AccelerometerRotation = Settings.System.getInt( InstrumentationRegistry.getInstrumentation().getTargetContext().getContentResolver(), Settings.System.ACCELEROMETER_ROTATION, - 0 + 0, ) == 1 ) { AccelerometerRotation.ENABLED @@ -42,7 +40,6 @@ fun getAccelerometerRotationSetting(): AccelerometerRotation = AccelerometerRotation.DISABLED } -@RequiresApi(Build.VERSION_CODES.LOLLIPOP) @RestrictTo(RestrictTo.Scope.LIBRARY) fun setAccelerometerRotationSetting(accelerometerRotation: AccelerometerRotation) { val context = InstrumentationRegistry.getInstrumentation().getTargetContext() @@ -55,7 +52,7 @@ fun setAccelerometerRotationSetting(accelerometerRotation: AccelerometerRotation runnableHandler, context, settingsLatch, - Settings.System.ACCELEROMETER_ROTATION + Settings.System.ACCELEROMETER_ROTATION, ) settingsObserver.observe() executeShellCommand("settings put system accelerometer_rotation ${accelerometerRotation.value}") @@ -67,5 +64,5 @@ fun setAccelerometerRotationSetting(accelerometerRotation: AccelerometerRotation @RestrictTo(RestrictTo.Scope.LIBRARY) enum class AccelerometerRotation(val value: Int) { DISABLED(0), - ENABLED(1) + ENABLED(1), } diff --git a/espresso/device/java/androidx/test/espresso/device/common/DeviceUtil.kt b/espresso/device/java/androidx/test/espresso/device/common/DeviceUtil.kt index 02330e329..4cab842c6 100644 --- a/espresso/device/java/androidx/test/espresso/device/common/DeviceUtil.kt +++ b/espresso/device/java/androidx/test/espresso/device/common/DeviceUtil.kt @@ -19,7 +19,6 @@ package androidx.test.espresso.device.common import android.os.Build -import androidx.annotation.RequiresApi import androidx.annotation.RestrictTo import java.util.regex.Pattern @@ -118,7 +117,6 @@ fun getMapOfDeviceStateNamesToIdentifiers(): MutableMap { * * @hide */ -@RequiresApi(Build.VERSION_CODES.LOLLIPOP) @RestrictTo(RestrictTo.Scope.LIBRARY) fun calculateCurrentDisplayWidthAndHeightPx(): Pair { // "wm size" will output a string with the format diff --git a/espresso/device/java/androidx/test/espresso/device/common/UiAutomationUtil.kt b/espresso/device/java/androidx/test/espresso/device/common/UiAutomationUtil.kt index 7bc89cca0..df54f0321 100644 --- a/espresso/device/java/androidx/test/espresso/device/common/UiAutomationUtil.kt +++ b/espresso/device/java/androidx/test/espresso/device/common/UiAutomationUtil.kt @@ -18,9 +18,7 @@ package androidx.test.espresso.device.common -import android.os.Build import android.os.ParcelFileDescriptor.AutoCloseInputStream -import androidx.annotation.RequiresApi import androidx.annotation.RestrictTo import androidx.annotation.RestrictTo.Scope import androidx.test.platform.app.InstrumentationRegistry @@ -36,7 +34,6 @@ import java.nio.charset.Charset * @hide */ @RestrictTo(Scope.LIBRARY) -@RequiresApi(Build.VERSION_CODES.LOLLIPOP) fun executeShellCommand(command: String): String { val parcelFileDescriptor = InstrumentationRegistry.getInstrumentation().getUiAutomation().executeShellCommand(command) diff --git a/espresso/idling_resource/concurrent/java/androidx/test/espresso/idling/concurrent/AndroidManifest.xml b/espresso/idling_resource/concurrent/java/androidx/test/espresso/idling/concurrent/AndroidManifest.xml index 7c00a74c6..54b4fc95e 100644 --- a/espresso/idling_resource/concurrent/java/androidx/test/espresso/idling/concurrent/AndroidManifest.xml +++ b/espresso/idling_resource/concurrent/java/androidx/test/espresso/idling/concurrent/AndroidManifest.xml @@ -19,7 +19,7 @@ package="androidx.test.espresso.idling.concurrent" > diff --git a/espresso/idling_resource/concurrent/javatests/androidx/test/espresso/idling/concurrent/AndroidManifest.xml b/espresso/idling_resource/concurrent/javatests/androidx/test/espresso/idling/concurrent/AndroidManifest.xml index 96acd81b3..af6ea986f 100644 --- a/espresso/idling_resource/concurrent/javatests/androidx/test/espresso/idling/concurrent/AndroidManifest.xml +++ b/espresso/idling_resource/concurrent/javatests/androidx/test/espresso/idling/concurrent/AndroidManifest.xml @@ -18,7 +18,7 @@ package="androidx.test.espresso.idling.concurrent" xmlns:android="http://schemas.android.com/apk/res/android"> - + diff --git a/espresso/idling_resource/java/androidx/test/espresso/AndroidManifest.xml b/espresso/idling_resource/java/androidx/test/espresso/AndroidManifest.xml index effade7c9..ca999ac8b 100644 --- a/espresso/idling_resource/java/androidx/test/espresso/AndroidManifest.xml +++ b/espresso/idling_resource/java/androidx/test/espresso/AndroidManifest.xml @@ -19,7 +19,7 @@ package="androidx.test.espresso.idling.resource" > diff --git a/espresso/idling_resource/net/java/androidx/test/espresso/idling/net/AndroidManifest.xml b/espresso/idling_resource/net/java/androidx/test/espresso/idling/net/AndroidManifest.xml index 0b56363e7..ec782b84b 100644 --- a/espresso/idling_resource/net/java/androidx/test/espresso/idling/net/AndroidManifest.xml +++ b/espresso/idling_resource/net/java/androidx/test/espresso/idling/net/AndroidManifest.xml @@ -18,6 +18,6 @@ package="androidx.test.espresso.idling.net" > diff --git a/espresso/intents/java/androidx/test/espresso/intent/AndroidManifest.xml b/espresso/intents/java/androidx/test/espresso/intent/AndroidManifest.xml index 68a9de962..f05eb4c73 100644 --- a/espresso/intents/java/androidx/test/espresso/intent/AndroidManifest.xml +++ b/espresso/intents/java/androidx/test/espresso/intent/AndroidManifest.xml @@ -18,7 +18,7 @@ package="androidx.test.espresso.intent" > diff --git a/espresso/intents/javatests/androidx/test/espresso/intent/AndroidManifest.xml b/espresso/intents/javatests/androidx/test/espresso/intent/AndroidManifest.xml index 26aedbba2..f21fb8484 100644 --- a/espresso/intents/javatests/androidx/test/espresso/intent/AndroidManifest.xml +++ b/espresso/intents/javatests/androidx/test/espresso/intent/AndroidManifest.xml @@ -18,7 +18,7 @@ package="androidx.test.espresso.intents"> diff --git a/espresso/intents/javatests/androidx/test/espresso/intent/IntentsIntegrationTest.java b/espresso/intents/javatests/androidx/test/espresso/intent/IntentsIntegrationTest.java index 8a5c791c0..67f6405e7 100644 --- a/espresso/intents/javatests/androidx/test/espresso/intent/IntentsIntegrationTest.java +++ b/espresso/intents/javatests/androidx/test/espresso/intent/IntentsIntegrationTest.java @@ -61,7 +61,6 @@ import android.content.ActivityNotFoundException; import android.content.Intent; import android.net.Uri; -import android.os.Build; import androidx.test.espresso.intent.rule.IntentsTestRule; import androidx.test.ext.junit.runners.AndroidJUnit4; import androidx.test.filters.LargeTest; @@ -156,12 +155,7 @@ public void recordsIntentsOnlyAfterInit() { @Test public void intentScheme() { - String dialerPackage = "com.android.phone"; - - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { - // Starting with Android Lollipop the dialer package has changed. - dialerPackage = "com.android.server.telecom"; - } + String dialerPackage = "com.android.server.telecom"; // Testing Scheme "tel:xxx-xxx-xxxx" onView(withId(R.id.send_data_to_call_edit_text)) diff --git a/espresso/remote/java/androidx/test/espresso/remote/AndroidManifest.xml b/espresso/remote/java/androidx/test/espresso/remote/AndroidManifest.xml index 7e40ca101..492bef620 100644 --- a/espresso/remote/java/androidx/test/espresso/remote/AndroidManifest.xml +++ b/espresso/remote/java/androidx/test/espresso/remote/AndroidManifest.xml @@ -19,7 +19,7 @@ package="androidx.test.espresso.remote" > diff --git a/espresso/web/java/androidx/test/espresso/web/AndroidManifest.xml b/espresso/web/java/androidx/test/espresso/web/AndroidManifest.xml index 6a795549e..9f1daa32f 100644 --- a/espresso/web/java/androidx/test/espresso/web/AndroidManifest.xml +++ b/espresso/web/java/androidx/test/espresso/web/AndroidManifest.xml @@ -18,7 +18,7 @@ package="androidx.test.espresso.web" > diff --git a/espresso/web/java/androidx/test/espresso/web/action/AtomAction.java b/espresso/web/java/androidx/test/espresso/web/action/AtomAction.java index d525578fd..cda34efa7 100644 --- a/espresso/web/java/androidx/test/espresso/web/action/AtomAction.java +++ b/espresso/web/java/androidx/test/espresso/web/action/AtomAction.java @@ -21,7 +21,6 @@ import static androidx.test.internal.util.Checks.checkNotNull; import static androidx.test.internal.util.Checks.checkState; -import android.os.Build; import android.os.Bundle; import android.os.IBinder; import android.os.Looper; @@ -113,7 +112,7 @@ public String getDescription() { @Override public void perform(UiController uiController, View view) { WebView webView = (WebView) view; - if (Build.VERSION.SDK_INT >= 23 && !webView.isHardwareAccelerated()) { + if (!webView.isHardwareAccelerated()) { throw new PerformException.Builder() .withViewDescription(webView.toString()) .withCause( @@ -124,16 +123,6 @@ public void perform(UiController uiController, View view) { String script = checkNotNull(atom.getScript()); final ListenableFuture localEval = JavascriptEvaluation.evaluate(webView, script, arguments, window); - if (null != window && Build.VERSION.SDK_INT == 19) { - Log.w( - TAG, - "WARNING: KitKat does not report when an iframe is loading new content. " - + "If you are interacting with content within an iframe and that content is changing " - + "(eg: you have just pressed a submit button). Espresso will not be able to block " - + "you until the new content has loaded (which it can do on all other API levels). " - + "You will need to have some custom polling / synchronization with the iframe in " - + "that case."); - } localEval.addListener( new Runnable() { diff --git a/ext/junit/CHANGELOG.md b/ext/junit/CHANGELOG.md index b32f51bd8..36afde44e 100644 --- a/ext/junit/CHANGELOG.md +++ b/ext/junit/CHANGELOG.md @@ -13,7 +13,7 @@ are released. **API Changes** -* Update to minSdkVersion 23 and remove all related logic for SDKs < 23 +* Update to minSdkVersion 24 and remove all related logic for SDKs < 24 **Breaking API Changes** diff --git a/ext/junit/java/androidx/test/ext/junit/AndroidManifest.xml b/ext/junit/java/androidx/test/ext/junit/AndroidManifest.xml index 6c442b412..68554614d 100644 --- a/ext/junit/java/androidx/test/ext/junit/AndroidManifest.xml +++ b/ext/junit/java/androidx/test/ext/junit/AndroidManifest.xml @@ -19,7 +19,7 @@ diff --git a/ext/junit/java/androidx/test/ext/junit/rules/DeleteFilesRule.java b/ext/junit/java/androidx/test/ext/junit/rules/DeleteFilesRule.java index 8244a2e14..3f3297933 100644 --- a/ext/junit/java/androidx/test/ext/junit/rules/DeleteFilesRule.java +++ b/ext/junit/java/androidx/test/ext/junit/rules/DeleteFilesRule.java @@ -16,7 +16,6 @@ package androidx.test.ext.junit.rules; import android.content.Context; -import android.os.Build; import android.os.Environment; import androidx.test.core.app.ApplicationProvider; import androidx.test.platform.io.PlatformTestStorageRegistry; @@ -64,12 +63,8 @@ public void evaluate() throws Throwable { if (context.getExternalCacheDir() != null) { directories.add(context.getExternalCacheDir()); } - if (Build.VERSION.SDK_INT >= 21) { - directories.add(context.getNoBackupFilesDir()); - } - if (Build.VERSION.SDK_INT >= 24) { - directories.add(new File(context.getApplicationInfo().deviceProtectedDataDir)); - } + directories.add(context.getNoBackupFilesDir()); + directories.add(new File(context.getApplicationInfo().deviceProtectedDataDir)); Set existingFiles = new HashSet<>(); for (File directory : directories) { diff --git a/ext/truth/CHANGELOG.md b/ext/truth/CHANGELOG.md index 0613c94af..54c0b0477 100644 --- a/ext/truth/CHANGELOG.md +++ b/ext/truth/CHANGELOG.md @@ -18,7 +18,7 @@ **API Changes** -* Update to minSdkVersion 23 and remove all related logic for SDKs < 23 +* Update to minSdkVersion 24 and remove all related logic for SDKs < 24 **Breaking API Changes** diff --git a/ext/truth/java/androidx/test/ext/truth/AndroidManifest.xml b/ext/truth/java/androidx/test/ext/truth/AndroidManifest.xml index 8e66c3929..e0da9ba9f 100644 --- a/ext/truth/java/androidx/test/ext/truth/AndroidManifest.xml +++ b/ext/truth/java/androidx/test/ext/truth/AndroidManifest.xml @@ -18,7 +18,7 @@ package="androidx.test.ext.truth" > diff --git a/ext/truth/java/androidx/test/ext/truth/api/current_public.txt b/ext/truth/java/androidx/test/ext/truth/api/current_public.txt index 827288d8f..998d67cbc 100644 --- a/ext/truth/java/androidx/test/ext/truth/api/current_public.txt +++ b/ext/truth/java/androidx/test/ext/truth/api/current_public.txt @@ -137,7 +137,7 @@ package androidx.test.ext.truth.os { method public void recreatesEqual(android.os.Parcelable.Creator!); } - @RequiresApi(android.os.Build.VERSION_CODES.LOLLIPOP) public final class PersistableBundleSubject extends com.google.common.truth.Subject { + public final class PersistableBundleSubject extends com.google.common.truth.Subject { method public static androidx.test.ext.truth.os.PersistableBundleSubject! assertThat(android.os.PersistableBundle!); method public final com.google.common.truth.BooleanSubject! bool(String!); method public final com.google.common.truth.PrimitiveBooleanArraySubject! booleanArray(String!); diff --git a/ext/truth/java/androidx/test/ext/truth/os/PersistableBundleSubject.java b/ext/truth/java/androidx/test/ext/truth/os/PersistableBundleSubject.java index 2a7fd5b37..74a39d45d 100644 --- a/ext/truth/java/androidx/test/ext/truth/os/PersistableBundleSubject.java +++ b/ext/truth/java/androidx/test/ext/truth/os/PersistableBundleSubject.java @@ -15,9 +15,7 @@ */ package androidx.test.ext.truth.os; -import android.os.Build; import android.os.PersistableBundle; -import androidx.annotation.RequiresApi; import com.google.common.primitives.Booleans; import com.google.common.primitives.Doubles; import com.google.common.primitives.Ints; @@ -34,7 +32,6 @@ * *

To assert about "regular" {@link android.os.Bundle}s, use {@link BundleSubject}. */ -@RequiresApi(Build.VERSION_CODES.LOLLIPOP) public final class PersistableBundleSubject extends BaseBundleSubject { public static PersistableBundleSubject assertThat(PersistableBundle persistableBundle) { diff --git a/ext/truth/java/androidx/test/ext/truth/view/MotionEventSubject.java b/ext/truth/java/androidx/test/ext/truth/view/MotionEventSubject.java index 16ba51c9c..7b959b87e 100644 --- a/ext/truth/java/androidx/test/ext/truth/view/MotionEventSubject.java +++ b/ext/truth/java/androidx/test/ext/truth/view/MotionEventSubject.java @@ -15,7 +15,6 @@ */ package androidx.test.ext.truth.view; -import android.os.Build; import android.view.MotionEvent; import android.view.MotionEvent.PointerCoords; import android.view.MotionEvent.PointerProperties; @@ -49,16 +48,8 @@ public void hasAction(int action) { check("getAction()").that(actual.getAction()).isEqualTo(action); } - /** - * Check the value of {@link MotionEvent#getActionButton()} - * - * @throws IllegalStateException if called on below Android API 23 - */ + /** Check the value of {@link MotionEvent#getActionButton()} */ public void hasActionButton(int actionButton) { - if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) { - throw new IllegalStateException( - "getActionButton() is only available on Android API 23 and above"); - } check("getActionButton()").that(actual.getActionButton()).isEqualTo(actionButton); } diff --git a/gradle-tests/build.gradle b/gradle-tests/build.gradle index 7ceaa6ccf..dc93026ea 100644 --- a/gradle-tests/build.gradle +++ b/gradle-tests/build.gradle @@ -10,7 +10,7 @@ tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile) { } ext { - minSdk = 23 + minSdk = 24 targetSdk = 36 compileSdk = 36 emulatorApi = 33 diff --git a/ktx/core/java/androidx/test/core/AndroidManifest.xml b/ktx/core/java/androidx/test/core/AndroidManifest.xml index c3ed3734a..5c8cb4745 100644 --- a/ktx/core/java/androidx/test/core/AndroidManifest.xml +++ b/ktx/core/java/androidx/test/core/AndroidManifest.xml @@ -17,6 +17,6 @@ diff --git a/ktx/ext/junit/java/androidx/test/ext/junit/AndroidManifest.xml b/ktx/ext/junit/java/androidx/test/ext/junit/AndroidManifest.xml index 5002b04f1..eb8e8c1b2 100644 --- a/ktx/ext/junit/java/androidx/test/ext/junit/AndroidManifest.xml +++ b/ktx/ext/junit/java/androidx/test/ext/junit/AndroidManifest.xml @@ -17,6 +17,6 @@ diff --git a/runner/android_junit_runner/CHANGELOG.md b/runner/android_junit_runner/CHANGELOG.md index 5e886f303..74db23aa9 100644 --- a/runner/android_junit_runner/CHANGELOG.md +++ b/runner/android_junit_runner/CHANGELOG.md @@ -18,7 +18,7 @@ **API Changes** -* Update to minSdkVersion 23 and remove all related logic for SDKs < 23 +* Update to minSdkVersion 24 and remove all related logic for SDKs < 24 **Breaking API Changes** diff --git a/runner/android_junit_runner/java/androidx/test/AndroidManifest.xml b/runner/android_junit_runner/java/androidx/test/AndroidManifest.xml index cd1a0e574..4938c4609 100644 --- a/runner/android_junit_runner/java/androidx/test/AndroidManifest.xml +++ b/runner/android_junit_runner/java/androidx/test/AndroidManifest.xml @@ -23,7 +23,7 @@ diff --git a/runner/android_junit_runner/java/androidx/test/runner/permission/PermissionRequester.java b/runner/android_junit_runner/java/androidx/test/runner/permission/PermissionRequester.java index 9c9272c2b..c5129f0a9 100644 --- a/runner/android_junit_runner/java/androidx/test/runner/permission/PermissionRequester.java +++ b/runner/android_junit_runner/java/androidx/test/runner/permission/PermissionRequester.java @@ -21,12 +21,9 @@ import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.fail; -import android.annotation.TargetApi; import android.content.Context; -import android.os.Build; import android.text.TextUtils; import android.util.Log; -import androidx.annotation.ChecksSdkIntAtLeast; import androidx.annotation.NonNull; import androidx.annotation.RestrictTo; import androidx.annotation.RestrictTo.Scope; @@ -54,14 +51,10 @@ * @hide */ @RestrictTo(Scope.LIBRARY_GROUP) // used by rule -@TargetApi(value = 23) public class PermissionRequester implements PermissionGranter { private static final String TAG = "PermissionRequester"; - @ChecksSdkIntAtLeast(extension = 0) - private int androidRuntimeVersion = Build.VERSION.SDK_INT; - @NonNull private final Context targetContext; @VisibleForTesting @@ -80,70 +73,42 @@ public PermissionRequester() { * Adds a permission to the list of permissions which will be requested when {@link * #requestPermissions()} is called. * - *

Precondition: This method does nothing when called on an API level lower than {@link - * Build.VERSION_CODES#M}. - * * @param permissions a list of Android runtime permissions. */ @Override public void addPermissions(@NonNull String... permissions) { checkNotNull(permissions, "permissions cannot be null!"); - if (deviceSupportsRuntimePermissions()) { - for (String permission : permissions) { - assertFalse("Permission String is empty or null!", TextUtils.isEmpty(permission)); - GrantPermissionCallable requestPermissionCallable = - new GrantPermissionCallable( - new UiAutomationShellCommand( - targetContext.getPackageName(), permission, PmCommand.GRANT_PERMISSION), - targetContext, - permission); - checkState(requestedPermissions.add(requestPermissionCallable)); - } + for (String permission : permissions) { + assertFalse("Permission String is empty or null!", TextUtils.isEmpty(permission)); + GrantPermissionCallable requestPermissionCallable = + new GrantPermissionCallable( + new UiAutomationShellCommand( + targetContext.getPackageName(), permission, PmCommand.GRANT_PERMISSION), + targetContext, + permission); + checkState(requestedPermissions.add(requestPermissionCallable)); } } /** * Request all permissions previously added using {@link #addPermissions(String...)} - * - *

Precondition: This method does nothing when called on an API level lower than {@link - * Build.VERSION_CODES#M}. */ @Override public void requestPermissions() { - if (deviceSupportsRuntimePermissions()) { - for (RequestPermissionCallable requestPermissionCallable : requestedPermissions) { - try { - if (RequestPermissionCallable.Result.FAILURE == requestPermissionCallable.call()) { - fail("Failed to grant permissions, see logcat for details"); - return; - } - } catch (Exception exception) { - Log.e(TAG, "An Exception was thrown while granting permission", exception); + for (RequestPermissionCallable requestPermissionCallable : requestedPermissions) { + try { + if (RequestPermissionCallable.Result.FAILURE == requestPermissionCallable.call()) { fail("Failed to grant permissions, see logcat for details"); return; } + } catch (Exception exception) { + Log.e(TAG, "An Exception was thrown while granting permission", exception); + fail("Failed to grant permissions, see logcat for details"); + return; } } } @VisibleForTesting - protected void setAndroidRuntimeVersion(int sdkInt) { - androidRuntimeVersion = sdkInt; - } - - private boolean deviceSupportsRuntimePermissions() { - boolean supportsRuntimePermissions = getAndroidRuntimeVersion() >= 23; - if (!supportsRuntimePermissions) { - // TODO: replace with Assume.assumeTrue() once we bumped gradle plugin version to 2.0 - Log.w( - TAG, - "Permissions can only be granted on devices running Android M (API 23) or" - + "higher. This rule is ignored."); - } - return supportsRuntimePermissions; - } - - private int getAndroidRuntimeVersion() { - return androidRuntimeVersion; - } + protected void setAndroidRuntimeVersion(int sdkInt) {} } diff --git a/runner/android_junit_runner/java/androidx/test/runner/permission/UiAutomationShellCommand.java b/runner/android_junit_runner/java/androidx/test/runner/permission/UiAutomationShellCommand.java index 453ce6cf0..f590092b6 100644 --- a/runner/android_junit_runner/java/androidx/test/runner/permission/UiAutomationShellCommand.java +++ b/runner/android_junit_runner/java/androidx/test/runner/permission/UiAutomationShellCommand.java @@ -18,7 +18,6 @@ import static androidx.test.internal.util.Checks.checkNotNull; -import android.annotation.TargetApi; import android.app.UiAutomation; import android.os.ParcelFileDescriptor; import android.util.Log; @@ -34,7 +33,6 @@ * {@link ShellCommand} implementation which uses {@link UiAutomation} to grant a permission at * runtime. */ -@TargetApi(value = 23) class UiAutomationShellCommand extends ShellCommand { private static final String TAG = "UiAutomationShellCmd"; diff --git a/runner/android_junit_runner/javatests/androidx/test/internal/runner/AndroidManifest.xml b/runner/android_junit_runner/javatests/androidx/test/internal/runner/AndroidManifest.xml index efdc715db..562de4d8c 100644 --- a/runner/android_junit_runner/javatests/androidx/test/internal/runner/AndroidManifest.xml +++ b/runner/android_junit_runner/javatests/androidx/test/internal/runner/AndroidManifest.xml @@ -18,7 +18,7 @@ package="androidx.test.internal.runner" xmlns:android="http://schemas.android.com/apk/res/android"> - + diff --git a/runner/android_junit_runner/javatests/androidx/test/internal/runner/lifecycle/AndroidManifest.xml b/runner/android_junit_runner/javatests/androidx/test/internal/runner/lifecycle/AndroidManifest.xml index e435c3ede..5aaf33c14 100644 --- a/runner/android_junit_runner/javatests/androidx/test/internal/runner/lifecycle/AndroidManifest.xml +++ b/runner/android_junit_runner/javatests/androidx/test/internal/runner/lifecycle/AndroidManifest.xml @@ -21,7 +21,7 @@ - + - + permissions) { - if (Build.VERSION.SDK_INT < 24) { - // Only grant runtime permissions on API 24 and up - return; - } Context context = getContext(); for (String permission : permissions) { if (PackageManager.PERMISSION_GRANTED == context.checkCallingOrSelfPermission(permission)) { @@ -414,9 +409,7 @@ private OutputStream getOutputStream() { try { Context context = getContext(); // Support for directBootMode - if (Build.VERSION.SDK_INT >= 24) { - context = ContextCompat.createDeviceProtectedStorageContext(context); - } + context = ContextCompat.createDeviceProtectedStorageContext(context); return context.openFileOutput(getOutputFile(test), 0); } catch (FileNotFoundException e) { throw new RuntimeException("Could not open stream for output"); diff --git a/runner/android_test_orchestrator/stubapp/src/AndroidManifest.xml b/runner/android_test_orchestrator/stubapp/src/AndroidManifest.xml index 7c20a80c7..ee1b6a263 100644 --- a/runner/android_test_orchestrator/stubapp/src/AndroidManifest.xml +++ b/runner/android_test_orchestrator/stubapp/src/AndroidManifest.xml @@ -35,7 +35,7 @@ diff --git a/runner/monitor/CHANGELOG.md b/runner/monitor/CHANGELOG.md index 81697fb4a..20511dc46 100644 --- a/runner/monitor/CHANGELOG.md +++ b/runner/monitor/CHANGELOG.md @@ -12,6 +12,8 @@ **API Changes** +* Update to minSdkVersion 24 and remove all related logic for SDKs < 24 + **Breaking API Changes** **Known Issues** diff --git a/runner/monitor/java/androidx/test/AndroidManifest.xml b/runner/monitor/java/androidx/test/AndroidManifest.xml index fbebbbcf8..07ce33311 100644 --- a/runner/monitor/java/androidx/test/AndroidManifest.xml +++ b/runner/monitor/java/androidx/test/AndroidManifest.xml @@ -18,7 +18,7 @@ package="androidx.test.monitor" > diff --git a/runner/monitor/javatests/androidx/test/platform/io/AndroidManifest.xml b/runner/monitor/javatests/androidx/test/platform/io/AndroidManifest.xml index fbf9c0f63..5240352a4 100644 --- a/runner/monitor/javatests/androidx/test/platform/io/AndroidManifest.xml +++ b/runner/monitor/javatests/androidx/test/platform/io/AndroidManifest.xml @@ -18,7 +18,7 @@ package="androidx.test.monitor.tests" xmlns:android="http://schemas.android.com/apk/res/android"> - + diff --git a/runner/monitor/javatests/androidx/test/platform/view/inspector/fixtures/AndroidManifest.xml b/runner/monitor/javatests/androidx/test/platform/view/inspector/fixtures/AndroidManifest.xml index 559da6ab1..5bfd39a08 100644 --- a/runner/monitor/javatests/androidx/test/platform/view/inspector/fixtures/AndroidManifest.xml +++ b/runner/monitor/javatests/androidx/test/platform/view/inspector/fixtures/AndroidManifest.xml @@ -18,7 +18,7 @@ package="androidx.test.platform.view.inspector.fixtures" xmlns:android="http://schemas.android.com/apk/res/android"> - + diff --git a/runner/rules/CHANGELOG.md b/runner/rules/CHANGELOG.md index 2c9475e84..a3391ef15 100644 --- a/runner/rules/CHANGELOG.md +++ b/runner/rules/CHANGELOG.md @@ -12,7 +12,7 @@ **API Changes** -* Update to minSdkVersion 23 and remove all related logic for SDKs < 23 +* Update to minSdkVersion 24 and remove all related logic for SDKs < 24 **Breaking API Changes** diff --git a/runner/rules/java/androidx/test/AndroidManifest.xml b/runner/rules/java/androidx/test/AndroidManifest.xml index 46610f22e..69d0da31d 100644 --- a/runner/rules/java/androidx/test/AndroidManifest.xml +++ b/runner/rules/java/androidx/test/AndroidManifest.xml @@ -18,7 +18,7 @@ package="androidx.test.rules" > diff --git a/runner/rules/javatests/androidx/test/rule/AndroidManifest_activitytestrule.xml b/runner/rules/javatests/androidx/test/rule/AndroidManifest_activitytestrule.xml index ef026209d..f594141e4 100644 --- a/runner/rules/javatests/androidx/test/rule/AndroidManifest_activitytestrule.xml +++ b/runner/rules/javatests/androidx/test/rule/AndroidManifest_activitytestrule.xml @@ -18,7 +18,7 @@ package="androidx.test.rule" xmlns:android="http://schemas.android.com/apk/res/android"> - + diff --git a/runner/rules/javatests/androidx/test/rule/AndroidManifest_servicetestrule.xml b/runner/rules/javatests/androidx/test/rule/AndroidManifest_servicetestrule.xml index ac9b03123..a25b36284 100644 --- a/runner/rules/javatests/androidx/test/rule/AndroidManifest_servicetestrule.xml +++ b/runner/rules/javatests/androidx/test/rule/AndroidManifest_servicetestrule.xml @@ -18,7 +18,7 @@ package="androidx.test.rule" xmlns:android="http://schemas.android.com/apk/res/android"> - + diff --git a/runner/rules/javatests/androidx/test/rule/AndroidManifest_testlibrary.xml b/runner/rules/javatests/androidx/test/rule/AndroidManifest_testlibrary.xml index 751fb2dd6..3d1ff02f0 100644 --- a/runner/rules/javatests/androidx/test/rule/AndroidManifest_testlibrary.xml +++ b/runner/rules/javatests/androidx/test/rule/AndroidManifest_testlibrary.xml @@ -18,7 +18,7 @@ package="androidx.test.rule" xmlns:android="http://schemas.android.com/apk/res/android"> - + diff --git a/services/AndroidManifest.xml b/services/AndroidManifest.xml index 831bd4fb1..4cf080d67 100644 --- a/services/AndroidManifest.xml +++ b/services/AndroidManifest.xml @@ -22,7 +22,7 @@ android:versionName="${appVersion}"> diff --git a/services/CHANGELOG.md b/services/CHANGELOG.md index 5f06775b0..b52180a8e 100644 --- a/services/CHANGELOG.md +++ b/services/CHANGELOG.md @@ -12,7 +12,7 @@ **API Changes** -* Update to minSdkVersion 23 and remove all related logic for SDKs < 23 +* Update to minSdkVersion 24 and remove all related logic for SDKs < 24 **Breaking API Changes** diff --git a/services/events/javatests/androidx/test/services/events/internal/BUILD b/services/events/javatests/androidx/test/services/events/internal/BUILD index 5dd70e21c..806a19a40 100644 --- a/services/events/javatests/androidx/test/services/events/internal/BUILD +++ b/services/events/javatests/androidx/test/services/events/internal/BUILD @@ -15,7 +15,7 @@ axt_android_local_test( "StackTrimmerTest.java", ], manifest_values = { - "minSdkVersion": "23", + "minSdkVersion": "24", }, deps = [ "//ext/junit", diff --git a/services/shellexecutor/javatests/androidx/test/services/shellexecutor/AndroidManifest.xml b/services/shellexecutor/javatests/androidx/test/services/shellexecutor/AndroidManifest.xml index 5c8864775..9cee357e8 100644 --- a/services/shellexecutor/javatests/androidx/test/services/shellexecutor/AndroidManifest.xml +++ b/services/shellexecutor/javatests/androidx/test/services/shellexecutor/AndroidManifest.xml @@ -19,7 +19,7 @@ package="androidx.test.services.shellexecutor" > diff --git a/services/speakeasy/java/androidx/test/services/speakeasy/server/AndroidManifest.xml b/services/speakeasy/java/androidx/test/services/speakeasy/server/AndroidManifest.xml index c405a1965..7f8f22d87 100644 --- a/services/speakeasy/java/androidx/test/services/speakeasy/server/AndroidManifest.xml +++ b/services/speakeasy/java/androidx/test/services/speakeasy/server/AndroidManifest.xml @@ -19,7 +19,7 @@ package="androidx.test.services.speakeasy.server"> diff --git a/services/speakeasy/javatests/androidx/test/services/speakeasy/client/AndroidManifest.xml b/services/speakeasy/javatests/androidx/test/services/speakeasy/client/AndroidManifest.xml index 82878c248..86fc2d8fd 100644 --- a/services/speakeasy/javatests/androidx/test/services/speakeasy/client/AndroidManifest.xml +++ b/services/speakeasy/javatests/androidx/test/services/speakeasy/client/AndroidManifest.xml @@ -19,7 +19,7 @@ package="androidx.test.services.speakeasy.client" > diff --git a/services/speakeasy/javatests/androidx/test/services/speakeasy/client/testapp/AndroidManifest.xml b/services/speakeasy/javatests/androidx/test/services/speakeasy/client/testapp/AndroidManifest.xml index 38e7b1503..9d4084299 100644 --- a/services/speakeasy/javatests/androidx/test/services/speakeasy/client/testapp/AndroidManifest.xml +++ b/services/speakeasy/javatests/androidx/test/services/speakeasy/client/testapp/AndroidManifest.xml @@ -20,7 +20,7 @@ diff --git a/services/speakeasy/javatests/androidx/test/services/speakeasy/server/AndroidManifest.xml b/services/speakeasy/javatests/androidx/test/services/speakeasy/server/AndroidManifest.xml index 6a6e89b41..e6deda5c4 100644 --- a/services/speakeasy/javatests/androidx/test/services/speakeasy/server/AndroidManifest.xml +++ b/services/speakeasy/javatests/androidx/test/services/speakeasy/server/AndroidManifest.xml @@ -19,7 +19,7 @@ package="androidx.test.services.speakeasy.server" > diff --git a/services/storage/java/androidx/test/services/storage/AndroidManifest.xml b/services/storage/java/androidx/test/services/storage/AndroidManifest.xml index a8fe993fe..88af9c4c8 100644 --- a/services/storage/java/androidx/test/services/storage/AndroidManifest.xml +++ b/services/storage/java/androidx/test/services/storage/AndroidManifest.xml @@ -18,7 +18,7 @@ package="androidx.test.services.storage" > diff --git a/services/storage/java/androidx/test/services/storage/provider/AndroidManifest.xml b/services/storage/java/androidx/test/services/storage/provider/AndroidManifest.xml index d0ad262a4..de9969cfa 100644 --- a/services/storage/java/androidx/test/services/storage/provider/AndroidManifest.xml +++ b/services/storage/java/androidx/test/services/storage/provider/AndroidManifest.xml @@ -25,7 +25,7 @@ - diff --git a/services/storage/java/androidx/test/services/storage/provider/AndroidManifest_opensource.xml b/services/storage/java/androidx/test/services/storage/provider/AndroidManifest_opensource.xml index a661da6d4..de77034b0 100644 --- a/services/storage/java/androidx/test/services/storage/provider/AndroidManifest_opensource.xml +++ b/services/storage/java/androidx/test/services/storage/provider/AndroidManifest_opensource.xml @@ -52,6 +52,6 @@ + android:minSdkVersion="24" /> diff --git a/services/storage/javatests/androidx/test/services/storage/provider/AndroidManifest.xml b/services/storage/javatests/androidx/test/services/storage/provider/AndroidManifest.xml index 251066e28..dbfb6538d 100644 --- a/services/storage/javatests/androidx/test/services/storage/provider/AndroidManifest.xml +++ b/services/storage/javatests/androidx/test/services/storage/provider/AndroidManifest.xml @@ -18,7 +18,7 @@ package="androidx.test.services.storage.provider"> diff --git a/services/storage/javatests/androidx/test/services/storage/provider/AndroidManifest_opensource.xml b/services/storage/javatests/androidx/test/services/storage/provider/AndroidManifest_opensource.xml index ae00e6baf..690145a99 100644 --- a/services/storage/javatests/androidx/test/services/storage/provider/AndroidManifest_opensource.xml +++ b/services/storage/javatests/androidx/test/services/storage/provider/AndroidManifest_opensource.xml @@ -18,7 +18,7 @@ package="androidx.test.services.storage.provider"> diff --git a/services/storage/javatests/androidx/test/services/storage/provider/AndroidManifest_stub.xml b/services/storage/javatests/androidx/test/services/storage/provider/AndroidManifest_stub.xml index bf41e63ba..10b897986 100644 --- a/services/storage/javatests/androidx/test/services/storage/provider/AndroidManifest_stub.xml +++ b/services/storage/javatests/androidx/test/services/storage/provider/AndroidManifest_stub.xml @@ -18,7 +18,7 @@ package="androidx.test.services.storage.provider" > \ No newline at end of file diff --git a/testapps/foldable_testapp/java/androidx/test/foldable/app/AndroidManifest.xml b/testapps/foldable_testapp/java/androidx/test/foldable/app/AndroidManifest.xml index ba202baa4..40d6ef996 100644 --- a/testapps/foldable_testapp/java/androidx/test/foldable/app/AndroidManifest.xml +++ b/testapps/foldable_testapp/java/androidx/test/foldable/app/AndroidManifest.xml @@ -20,7 +20,7 @@ package="androidx.test.foldable.app"> diff --git a/testapps/foldable_testapp/java/androidx/test/foldable/app/AndroidManifest_opensource.xml b/testapps/foldable_testapp/java/androidx/test/foldable/app/AndroidManifest_opensource.xml index cc4510fd8..5578cd29d 100644 --- a/testapps/foldable_testapp/java/androidx/test/foldable/app/AndroidManifest_opensource.xml +++ b/testapps/foldable_testapp/java/androidx/test/foldable/app/AndroidManifest_opensource.xml @@ -20,7 +20,7 @@ package="androidx.test.foldable.app"> diff --git a/testapps/multiprocess_testapp/java/androidx/test/multiprocess/app/AndroidManifest.xml b/testapps/multiprocess_testapp/java/androidx/test/multiprocess/app/AndroidManifest.xml index dedd0b11e..7e7bb1813 100644 --- a/testapps/multiprocess_testapp/java/androidx/test/multiprocess/app/AndroidManifest.xml +++ b/testapps/multiprocess_testapp/java/androidx/test/multiprocess/app/AndroidManifest.xml @@ -20,7 +20,7 @@ package="androidx.test.multiprocess.app" > diff --git a/testapps/ui_testapp/java/androidx/test/ui/app/AndroidManifest_opensource.xml b/testapps/ui_testapp/java/androidx/test/ui/app/AndroidManifest_opensource.xml index 826812b48..78386c4f1 100644 --- a/testapps/ui_testapp/java/androidx/test/ui/app/AndroidManifest_opensource.xml +++ b/testapps/ui_testapp/java/androidx/test/ui/app/AndroidManifest_opensource.xml @@ -18,7 +18,7 @@ package="androidx.test.ui.app"> diff --git a/testapps/ui_testapp/java/androidx/test/ui/app/ChatHeadActivity.java b/testapps/ui_testapp/java/androidx/test/ui/app/ChatHeadActivity.java index 20f88489e..8d55cb144 100644 --- a/testapps/ui_testapp/java/androidx/test/ui/app/ChatHeadActivity.java +++ b/testapps/ui_testapp/java/androidx/test/ui/app/ChatHeadActivity.java @@ -17,16 +17,12 @@ package androidx.test.ui.app; import android.app.Activity; -import android.content.Context; import android.content.Intent; import android.net.Uri; -import android.os.Build.VERSION; import android.os.Bundle; import android.provider.Settings; -import android.util.Log; import android.view.View; import android.widget.Toast; -import java.lang.reflect.InvocationTargetException; /** * Upon creating this activity will start the {@link ChatHeadService} that will create a floating @@ -34,8 +30,6 @@ */ public class ChatHeadActivity extends Activity { - private static final String TAG = "ChatHeadActivity"; - private static final int REQUEST_CODE = 1337; @Override @@ -65,43 +59,25 @@ private void startChatHeadService() { } private void checkDrawOverlayPermission() { - if (VERSION.SDK_INT >= 23) { - if (!reflectiveCanDrawOverlays()) { - // To satisfy F5 project - Intent intent = new Intent("android.settings.action.MANAGE_OVERLAY_PERMISSION", - Uri.parse("package:" + getPackageName())); - this.startActivityForResult(intent, REQUEST_CODE); - } - } else { - startChatHeadService(); + if (!Settings.canDrawOverlays(this)) { + // To satisfy F5 project + Intent intent = + new Intent( + "android.settings.action.MANAGE_OVERLAY_PERMISSION", + Uri.parse("package:" + getPackageName())); + this.startActivityForResult(intent, REQUEST_CODE); } } @Override protected void onActivityResult(int requestCode, int resultCode, Intent data) { - if (VERSION.SDK_INT >= 23) { - if (requestCode == REQUEST_CODE) { - if (reflectiveCanDrawOverlays()) { - // continue here - permission was granted - startChatHeadService(); - } else { - Toast.makeText(this, "No permissions", Toast.LENGTH_LONG).show(); - } + if (requestCode == REQUEST_CODE) { + if (Settings.canDrawOverlays(this)) { + // continue here - permission was granted + startChatHeadService(); + } else { + Toast.makeText(this, "No permissions", Toast.LENGTH_LONG).show(); } } } - - private boolean reflectiveCanDrawOverlays() { - try { - return ((Boolean) Settings.class.getDeclaredMethod("canDrawOverlays", Context.class) - .invoke(null, this)); - } catch (IllegalAccessException e) { - Log.e(TAG, "IllegalAccessException", e); - } catch (InvocationTargetException e) { - Log.e(TAG, "InvocationTargetException", e); - } catch (NoSuchMethodException e) { - Log.e(TAG, "NoSuchMethodException", e); - } - return false; - } } diff --git a/testapps/ui_testapp/java/androidx/test/ui/app/TransitionDetailActivity.java b/testapps/ui_testapp/java/androidx/test/ui/app/TransitionDetailActivity.java index d76a11020..d2e587624 100644 --- a/testapps/ui_testapp/java/androidx/test/ui/app/TransitionDetailActivity.java +++ b/testapps/ui_testapp/java/androidx/test/ui/app/TransitionDetailActivity.java @@ -17,7 +17,6 @@ package androidx.test.ui.app; import android.app.Activity; -import android.os.Build; import android.os.Bundle; import android.transition.Transition; import android.widget.ImageView; @@ -74,7 +73,7 @@ private void loadItem() { mTransitionActivityItem.getName(), mTransitionActivityItem.getAuthor())); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP && addTransitionListener()) { + if (addTransitionListener()) { // If we're running on Lollipop and we have added a listener to the shared element // transition, load the thumbnail. The listener will load the full-size image when // the transition is complete. diff --git a/testapps/ui_testapp/javatests/androidx/test/ui/app/AndroidManifest.xml b/testapps/ui_testapp/javatests/androidx/test/ui/app/AndroidManifest.xml index 1ee68b853..e653de288 100644 --- a/testapps/ui_testapp/javatests/androidx/test/ui/app/AndroidManifest.xml +++ b/testapps/ui_testapp/javatests/androidx/test/ui/app/AndroidManifest.xml @@ -19,7 +19,7 @@ package="androidx.test.ui.app.tests" >