commit 211f60ef799f0051d64a5c99f8533ec48cc31919
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Feb 26 02:29:08 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Feb 26 02:29:08 2020 +0000
tree c7ab5b7ecf7c1099222f816a58ff9bb1b9a16b82
parent 4a8248a60023bdec29a2ef8febf6017891e0e8d9
parent 7019ed3eadf1308543e9ca105d522944ac020cea

Fix broken test on UserIdMangerTest am: 7019ed3ead

Change-Id: I83b2748bfe14fd1fe82a834a4ffa984b576ab6d2

src/com/android/documentsui/UserIdManager.java

diff --git a/src/com/android/documentsui/UserIdManager.java b/src/com/android/documentsui/UserIdManager.java
index f1ce903..2d80f8c 100644
--- a/src/com/android/documentsui/UserIdManager.java
+++ b/src/com/android/documentsui/UserIdManager.java
@@ -34,7 +34,6 @@
 import androidx.annotation.GuardedBy;
 import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
-import androidx.core.os.BuildCompat;
 
 import com.android.documentsui.base.Features;
 import com.android.documentsui.base.UserId;
@@ -214,7 +213,7 @@
         private static boolean isDeviceSupported(Context context) {
             // The feature requires Android R DocumentsContract APIs and INTERACT_ACROSS_USERS
             // permission.
-            return (BuildCompat.isAtLeastR()
+            return (Build.VERSION.CODENAME.equals("R")
                     || (Build.VERSION.CODENAME.equals("REL") && Build.VERSION.SDK_INT >= 30))
                     && context.checkSelfPermission(Manifest.permission.INTERACT_ACROSS_USERS)
                     == PackageManager.PERMISSION_GRANTED;

tests/unit/com/android/documentsui/UserIdManagerTest.java

diff --git a/tests/unit/com/android/documentsui/UserIdManagerTest.java b/tests/unit/com/android/documentsui/UserIdManagerTest.java
index 1ca3c5b..e798c4b 100644
--- a/tests/unit/com/android/documentsui/UserIdManagerTest.java
+++ b/tests/unit/com/android/documentsui/UserIdManagerTest.java
@@ -28,7 +28,6 @@
 import android.os.UserHandle;
 import android.os.UserManager;
 
-import androidx.core.os.BuildCompat;
 import androidx.test.filters.SmallTest;
 
 import com.android.documentsui.base.UserId;
@@ -141,7 +140,7 @@
     @Test
     public void testGetUserIds_deviceWithoutPermission() {
         // This test only tests for Android R or later. This test case always passes before R.
-        if (BuildCompat.isAtLeastR()
+        if (Build.VERSION.CODENAME.equals("R")
                 || (Build.VERSION.CODENAME.equals("REL") && Build.VERSION.SDK_INT >= 30)) {
             // When permission is denied, only returns the current user.
             when(mockContext.checkSelfPermission(Manifest.permission.INTERACT_ACROSS_USERS))