Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 89bb6f60 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Fix broken test on UserIdMangerTest am: 7019ed3e am: 211f60ef am: e5146849 am: c084972c 

Change-Id: I9385fdc32d68794af4dc6f32175ffa99d150ec26
parents ee3c1e34 c084972c

src/com/android/documentsui/UserIdManager.java

+1 −2
Original line number Original line Diff line number Diff line
@@ -34,7 +34,6 @@ import android.util.Log; 
import androidx.annotation.GuardedBy;

import androidx.annotation.GuardedBy;

import androidx.annotation.Nullable;

import androidx.annotation.Nullable;

import androidx.annotation.VisibleForTesting;

import androidx.annotation.VisibleForTesting;

import androidx.core.os.BuildCompat;





import com.android.documentsui.base.Features;

import com.android.documentsui.base.Features;

import com.android.documentsui.base.UserId;

import com.android.documentsui.base.UserId;
@@ -214,7 +213,7 @@ public interface UserIdManager { 
        private static boolean isDeviceSupported(Context context) {

        private static boolean isDeviceSupported(Context context) {

            // The feature requires Android R DocumentsContract APIs and INTERACT_ACROSS_USERS

            // The feature requires Android R DocumentsContract APIs and INTERACT_ACROSS_USERS

            // permission.

            // permission.

            return (BuildCompat.isAtLeastR()

            return (Build.VERSION.CODENAME.equals("R")

                    || (Build.VERSION.CODENAME.equals("REL") && Build.VERSION.SDK_INT >= 30))

                    || (Build.VERSION.CODENAME.equals("REL") && Build.VERSION.SDK_INT >= 30))

                    && context.checkSelfPermission(Manifest.permission.INTERACT_ACROSS_USERS)

                    && context.checkSelfPermission(Manifest.permission.INTERACT_ACROSS_USERS)

                    == PackageManager.PERMISSION_GRANTED;

                    == PackageManager.PERMISSION_GRANTED;

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

+1 −2
Original line number Original line Diff line number Diff line
@@ -28,7 +28,6 @@ import android.os.Build; 
import android.os.UserHandle;

import android.os.UserHandle;

import android.os.UserManager;

import android.os.UserManager;





import androidx.core.os.BuildCompat;

import androidx.test.filters.SmallTest;

import androidx.test.filters.SmallTest;





import com.android.documentsui.base.UserId;

import com.android.documentsui.base.UserId;
@@ -141,7 +140,7 @@ public class UserIdManagerTest { 
    @Test

    @Test

    public void testGetUserIds_deviceWithoutPermission() {

    public void testGetUserIds_deviceWithoutPermission() {

        // This test only tests for Android R or later. This test case always passes before R.

        // 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)) {

                || (Build.VERSION.CODENAME.equals("REL") && Build.VERSION.SDK_INT >= 30)) {

            // When permission is denied, only returns the current user.

            // When permission is denied, only returns the current user.

            when(mockContext.checkSelfPermission(Manifest.permission.INTERACT_ACROSS_USERS))

            when(mockContext.checkSelfPermission(Manifest.permission.INTERACT_ACROSS_USERS))