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

Commit f5e9ccf1 authored by Kevin Liu's avatar Kevin Liu
Browse files

Replacing ShadowBuild with AndroidVersions 

Trying to promot AndroidVersions for version check

Bug: 261728063
Test: atest SettingsLibRoboTests
Change-Id: If545563403a51cb1b2cdb8d23797cb89809cccbb
parent 12a2cfd8

packages/SettingsLib/tests/robotests/testutils/com/android/settingslib/testutils/shadow/ShadowUserManager.java

+4 −5
Original line number Original line Diff line number Diff line
@@ -16,8 +16,6 @@ 




package com.android.settingslib.testutils.shadow;

package com.android.settingslib.testutils.shadow;





import static android.os.Build.VERSION_CODES.N_MR1;



import android.annotation.UserIdInt;

import android.annotation.UserIdInt;

import android.content.Context;

import android.content.Context;

import android.content.pm.UserInfo;

import android.content.pm.UserInfo;
@@ -27,7 +25,8 @@ import android.os.UserManager; 




import org.robolectric.annotation.Implementation;

import org.robolectric.annotation.Implementation;

import org.robolectric.annotation.Implements;

import org.robolectric.annotation.Implements;

import org.robolectric.shadows.ShadowBuild;

import org.robolectric.versioning.AndroidVersions.NMR1;

import org.robolectric.versioning.AndroidVersions.U;





import java.util.ArrayList;

import java.util.ArrayList;

import java.util.HashMap;

import java.util.HashMap;
@@ -74,7 +73,7 @@ public class ShadowUserManager extends org.robolectric.shadows.ShadowUserManager 
    /**

    /**

     * @return {@code false} by default, or the value specified via {@link #setIsAdminUser(boolean)}

     * @return {@code false} by default, or the value specified via {@link #setIsAdminUser(boolean)}

     */

     */

    @Implementation(minSdk = N_MR1)

    @Implementation(minSdk = NMR1.SDK_INT)

    public boolean isAdminUser() {

    public boolean isAdminUser() {

        return getUserInfo(UserHandle.myUserId()).isAdmin();

        return getUserInfo(UserHandle.myUserId()).isAdmin();

    }

    }
@@ -98,7 +97,7 @@ public class ShadowUserManager extends org.robolectric.shadows.ShadowUserManager 
        mUserPropertiesMap.putIfAbsent(userId, userProperties);

        mUserPropertiesMap.putIfAbsent(userId, userProperties);

    }

    }





    @Implementation(minSdk = ShadowBuild.UPSIDE_DOWN_CAKE)

    @Implementation(minSdk = U.SDK_INT)

    protected UserProperties getUserProperties(UserHandle user) {

    protected UserProperties getUserProperties(UserHandle user) {

        return mUserPropertiesMap.getOrDefault(user.getIdentifier(),

        return mUserPropertiesMap.getOrDefault(user.getIdentifier(),

            new UserProperties(new UserProperties.Builder().build()));

            new UserProperties(new UserProperties.Builder().build()));