diff options
author | Eric Biggers <ebiggers@google.com> | 2023-11-20 19:45:16 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-11-20 19:45:16 +0000 |
commit | b52442f6faeb64681742b274e9c07ec7fa1e2db3 (patch) | |
tree | 2d42320e523283a0987fc41c47d076a480513efe | |
parent | 414cc684caba5f02ed31c8d95bb01ee669101c83 (diff) | |
parent | 9eed888af3af536b68ea2b530ca7d9012d94388d (diff) | |
download | robolectric-shadows-b52442f6faeb64681742b274e9c07ec7fa1e2db3.tar.gz |
Do not use isFileEncryptedNativeOrEmulated() on Android 14 and later am: 82724e7932 am: 9eed888af3
Original change: https://android-review.googlesource.com/c/platform/external/robolectric-shadows/+/2835791
Change-Id: I8f769739e293adc7ab8209030dda633f3ec964a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | robolectric/src/test/java/org/robolectric/shadows/ShadowStorageManagerTest.java | 11 | ||||
-rw-r--r-- | shadows/framework/src/main/java/org/robolectric/shadows/ShadowStorageManager.java | 5 |
2 files changed, 13 insertions, 3 deletions
diff --git a/robolectric/src/test/java/org/robolectric/shadows/ShadowStorageManagerTest.java b/robolectric/src/test/java/org/robolectric/shadows/ShadowStorageManagerTest.java index e1c4c7104..220317adc 100644 --- a/robolectric/src/test/java/org/robolectric/shadows/ShadowStorageManagerTest.java +++ b/robolectric/src/test/java/org/robolectric/shadows/ShadowStorageManagerTest.java @@ -1,6 +1,7 @@ package org.robolectric.shadows; import static android.os.Build.VERSION_CODES.N; +import static android.os.Build.VERSION_CODES.TIRAMISU; import static com.google.common.truth.Truth.assertThat; import static org.robolectric.RuntimeEnvironment.application; import static org.robolectric.Shadows.shadowOf; @@ -17,6 +18,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.annotation.Config; +import org.robolectric.util.ReflectionHelpers; /** Unit tests for {@link ShadowStorageManager}. */ @RunWith(AndroidJUnit4.class) @@ -53,10 +55,15 @@ public class ShadowStorageManagerTest { } @Test - @Config(minSdk = N) + @Config(minSdk = N, maxSdk = TIRAMISU) public void isFileEncryptedNativeOrEmulated() { shadowOf(storageManager).setFileEncryptedNativeOrEmulated(true); - assertThat(StorageManager.isFileEncryptedNativeOrEmulated()).isTrue(); + // Use reflection, as this method is planned to be removed from StorageManager in V. + assertThat( + (boolean) + ReflectionHelpers.callStaticMethod( + StorageManager.class, "isFileEncryptedNativeOrEmulated")) + .isTrue(); } @Test diff --git a/shadows/framework/src/main/java/org/robolectric/shadows/ShadowStorageManager.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowStorageManager.java index 2614d7e88..f17c6f434 100644 --- a/shadows/framework/src/main/java/org/robolectric/shadows/ShadowStorageManager.java +++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowStorageManager.java @@ -2,6 +2,7 @@ package org.robolectric.shadows; import static android.os.Build.VERSION_CODES.M; import static android.os.Build.VERSION_CODES.N; +import static android.os.Build.VERSION_CODES.TIRAMISU; import static org.robolectric.RuntimeEnvironment.application; import android.os.UserManager; @@ -82,8 +83,10 @@ public class ShadowStorageManager { return null; } + // Use maxSdk=T for this method, since starting in U, this method in StorageManager is deprecated + // and is no longer called by the Android framework. It's planned to be removed entirely in V. @HiddenApi - @Implementation(minSdk = N) + @Implementation(minSdk = N, maxSdk = TIRAMISU) protected static boolean isFileEncryptedNativeOrEmulated() { return isFileEncryptionSupported; } |