summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Kelvin Kwan <kelvinkwan@google.com> 2020-02-25 21:16:54 +0000
committer Kelvin Kwan <kelvinkwan@google.com> 2020-02-25 21:16:54 +0000
commit7019ed3eadf1308543e9ca105d522944ac020cea (patch)
treec7ab5b7ecf7c1099222f816a58ff9bb1b9a16b82
parent4505a1787d58c3838c3800d1d89a93201a199d13 (diff)
Fix broken test on UserIdMangerTest
Test: atest DocumentsUIGoogleTests:com.android.documentsui.UserIdManagerTest Bug: 150214958 Bug: 150108105 Change-Id: I88f2b9c8a1afdae657f821e13a221dc1fbad4c9a
-rw-r--r--src/com/android/documentsui/UserIdManager.java3
-rw-r--r--tests/unit/com/android/documentsui/UserIdManagerTest.java3
2 files changed, 2 insertions, 4 deletions
diff --git a/src/com/android/documentsui/UserIdManager.java b/src/com/android/documentsui/UserIdManager.java
index f1ce90339..2d80f8c70 100644
--- a/src/com/android/documentsui/UserIdManager.java
+++ b/src/com/android/documentsui/UserIdManager.java
@@ -34,7 +34,6 @@ import android.util.Log;
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 @@ public interface UserIdManager {
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;
diff --git a/tests/unit/com/android/documentsui/UserIdManagerTest.java b/tests/unit/com/android/documentsui/UserIdManagerTest.java
index 1ca3c5b50..e798c4b2d 100644
--- a/tests/unit/com/android/documentsui/UserIdManagerTest.java
+++ b/tests/unit/com/android/documentsui/UserIdManagerTest.java
@@ -28,7 +28,6 @@ import android.os.Build;
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 @@ public class UserIdManagerTest {
@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))