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

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

Merge "Flag removal: AddUiForSoundsFromBackgroundUsers" into main

parents f8c7ada3 d561ad52

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

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

}



flag {

    name: "add_ui_for_sounds_from_background_users"

    namespace: "multiuser"

    description: "Allow foreground user to dismiss sounds that are coming from background users"

    bug: "314907186"

}



flag {

    name: "new_multiuser_settings_ux"

    namespace: "multiuser"

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

+2 −4
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ import android.content.pm.UserInfo; 
import android.content.pm.UserProperties;

import android.content.res.Resources;

import android.graphics.Bitmap;

import android.multiuser.Flags;

import android.os.Bundle;

import android.os.UserManager;

import android.util.DebugUtils;
@@ -619,8 +618,7 @@ public abstract class UserManagerInternal { 
     * users.

     */

    public static boolean shouldShowNotificationForBackgroundUserSounds() {

        return Flags.addUiForSoundsFromBackgroundUsers() && Resources.getSystem().getBoolean(

                com.android.internal.R.bool.config_showNotificationForBackgroundUserAlarms)

                && UserManager.supportsMultipleUsers();

        return UserManager.supportsMultipleUsers() && Resources.getSystem().getBoolean(

                com.android.internal.R.bool.config_showNotificationForBackgroundUserAlarms);

    }

}