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

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

Merge "Flag cleanup" into main

parents f22d0eeb 35293d9e

core/java/android/content/pm/LauncherApps.java

+5 −10
Original line number Diff line number Diff line
@@ -719,8 +719,7 @@ public class LauncherApps { 
            anyOf = {ACCESS_HIDDEN_PROFILES_FULL, ACCESS_HIDDEN_PROFILES})

    public List<UserHandle> getProfiles() {

        if (mUserManager.isManagedProfile()

                || (android.multiuser.Flags.enableLauncherAppsHiddenProfileChecks()

                    && android.os.Flags.allowPrivateProfile()

                || (android.os.Flags.allowPrivateProfile()

                    && android.multiuser.Flags.enablePrivateSpaceFeatures()

                    && mUserManager.isPrivateProfile())) {

            // If it's a managed or private profile, only return the current profile.
@@ -728,16 +727,12 @@ public class LauncherApps { 
            result.add(android.os.Process.myUserHandle());

            return result;

        } else {

            if (android.multiuser.Flags.enableLauncherAppsHiddenProfileChecks()) {

            try {

                return mService.getUserProfiles();

            } catch (RemoteException re) {

                throw re.rethrowFromSystemServer();

            }

        }



            return mUserManager.getUserProfiles();

        }

    }



    /**

core/java/android/content/pm/multiuser.aconfig

+0 −7
Original line number Diff line number Diff line
@@ -247,13 +247,6 @@ flag { 
    bug: "316362775"

}



flag {

    name: "enable_launcher_apps_hidden_profile_checks"

    namespace: "profile_experiences"

    description: "Enable extra check to limit access to hidden profiles data in Launcher apps APIs."

    bug: "321988638"

}



flag {

    name: "reorder_wallpaper_during_user_switch"

    namespace: "multiuser"

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

+0 −5
Original line number Diff line number Diff line
@@ -523,10 +523,6 @@ public class LauncherAppsService extends SystemService { 
        }



        private boolean isHiddenProfile(UserHandle targetUser) {

            if (!Flags.enableLauncherAppsHiddenProfileChecks()) {

                return false;

            }



            try {

                UserProperties properties = mUserManagerInternal

                        .getUserProperties(targetUser.getIdentifier());
@@ -596,7 +592,6 @@ public class LauncherAppsService extends SystemService { 
        private boolean areHiddenApisChecksEnabled() {

            return android.os.Flags.allowPrivateProfile()

                    && Flags.enableHidingProfiles()

                    && Flags.enableLauncherAppsHiddenProfileChecks()

                    && Flags.enablePermissionToAccessHiddenProfiles()

                    && Flags.enablePrivateSpaceFeatures();

        }