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

Commit e26ee8e7 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Flag cleanup for enable_hiding_profiles" into main

parents 4ed008ea f9b9f188

services/core/java/com/android/server/pm/LauncherAppsService.java

+0 −1
Original line number Diff line number Diff line
@@ -591,7 +591,6 @@ public class LauncherAppsService extends SystemService { 


        private boolean areHiddenApisChecksEnabled() {

            return android.os.Flags.allowPrivateProfile()

                    && Flags.enableHidingProfiles()

                    && Flags.enablePermissionToAccessHiddenProfiles()

                    && Flags.enablePrivateSpaceFeatures();

        }

services/core/java/com/android/server/pm/UserManagerService.java

+0 −1
Original line number Diff line number Diff line
@@ -1782,7 +1782,6 @@ public class UserManagerService extends IUserManager.Stub { 


    private boolean isProfileHidden(int userId) {

        if (android.os.Flags.allowPrivateProfile()

                && android.multiuser.Flags.enableHidingProfiles()

                && android.multiuser.Flags.enablePrivateSpaceFeatures()) {

            return getUserPropertiesInternal(userId).getProfileApiVisibility()

                    == UserProperties.PROFILE_API_VISIBILITY_HIDDEN;

services/tests/PackageManagerServiceTests/server/src/com/android/server/pm/CrossProfileAppsServiceImplTest.java

+0 −5
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ import android.os.UserManager; 
import android.permission.PermissionCheckerManager;

import android.permission.PermissionManager;

import android.platform.test.annotations.Presubmit;

import android.platform.test.flag.junit.SetFlagsRule;

import android.util.SparseArray;



import com.android.internal.util.FunctionalUtils.ThrowingRunnable;
@@ -56,7 +55,6 @@ import com.android.server.pm.permission.PermissionManagerService; 
import com.android.server.wm.ActivityTaskManagerInternal;



import org.junit.Before;

import org.junit.Rule;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Mock;
@@ -111,8 +109,6 @@ public class CrossProfileAppsServiceImplTest { 
    private IApplicationThread mIApplicationThread;



    private SparseArray<Boolean> mUserEnabled = new SparseArray<>();

    @Rule

    public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();



    @Before

    public void initCrossProfileAppsServiceImpl() {
@@ -127,7 +123,6 @@ public class CrossProfileAppsServiceImplTest { 
        mUserEnabled.put(PRIMARY_USER, true);

        mUserEnabled.put(PROFILE_OF_PRIMARY_USER, true);

        mUserEnabled.put(SECONDARY_USER, true);

        mSetFlagsRule.enableFlags(android.multiuser.Flags.FLAG_ENABLE_HIDING_PROFILES);



        when(mUserManager.getProfileIdsExcludingHidden(anyInt(), eq(true))).thenAnswer(

                invocation -> {

services/tests/mockingservicestests/src/com/android/server/pm/UserManagerServiceMockedTest.java

+0 −1
Original line number Diff line number Diff line
@@ -833,7 +833,6 @@ public final class UserManagerServiceMockedTest { 
    @EnableFlags({

        FLAG_ALLOW_PRIVATE_PROFILE,

        FLAG_ENABLE_PRIVATE_SPACE_FEATURES,

        android.multiuser.Flags.FLAG_ENABLE_HIDING_PROFILES

    })

    public void testGetProfileIdsExcludingHidden() {

        assumeTrue(mUms.canAddPrivateProfile(0));

services/tests/servicestests/src/com/android/server/pm/CrossProfileAppsServiceImplTest.java

+0 −5
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ import android.os.UserManager; 
import android.permission.PermissionCheckerManager;

import android.permission.PermissionManager;

import android.platform.test.annotations.Presubmit;

import android.platform.test.flag.junit.SetFlagsRule;

import android.util.SparseArray;



import com.android.internal.util.FunctionalUtils.ThrowingRunnable;
@@ -56,7 +55,6 @@ import com.android.server.pm.permission.PermissionManagerService; 
import com.android.server.wm.ActivityTaskManagerInternal;



import org.junit.Before;

import org.junit.Rule;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Mock;
@@ -111,8 +109,6 @@ public class CrossProfileAppsServiceImplTest { 
    private IApplicationThread mIApplicationThread;



    private SparseArray<Boolean> mUserEnabled = new SparseArray<>();

    @Rule

    public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();



    @Before

    public void initCrossProfileAppsServiceImpl() {
@@ -127,7 +123,6 @@ public class CrossProfileAppsServiceImplTest { 
        mUserEnabled.put(PRIMARY_USER, true);

        mUserEnabled.put(PROFILE_OF_PRIMARY_USER, true);

        mUserEnabled.put(SECONDARY_USER, true);

        mSetFlagsRule.enableFlags(android.multiuser.Flags.FLAG_ENABLE_HIDING_PROFILES);



        when(mUserManager.getProfileIdsExcludingHidden(anyInt(), eq(true))).thenAnswer(

                invocation -> {