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

Commit 98486b67 authored by YoungJoon Yang's avatar YoungJoon Yang Committed by Android (Google) Code Review
Browse files

Merge "[Flag Removal] Remove flag... 

Merge "[Flag Removal] Remove flag com.android.window.flags.screen_brightness_dim_on_emulator" into main
parents 770058f6 d4679854

core/java/android/window/flags/windowing_frontend.aconfig

+1 −9
Original line number Diff line number Diff line
@@ -375,15 +375,7 @@ flag { 
    bug: "410930250"

}



flag {

    name: "screen_brightness_dim_on_emulator"

    namespace: "wear_systems"

    description: "Apply screen brightness to emulator display overlay"

    bug: "418830217"

    metadata {

        purpose: PURPOSE_BUGFIX

    }

}





flag {

    name: "multiple_system_navigation_observer_callbacks"

services/core/java/com/android/server/wm/WindowManagerService.java

+1 −2
Original line number Diff line number Diff line
@@ -159,7 +159,6 @@ import static com.android.server.wm.WindowManagerInternal.WindowFocusChangeListe 
import static com.android.systemui.shared.Flags.enableLppAssistInvocationEffect;

import static com.android.window.flags.Flags.enableDeviceStateAutoRotateSettingRefactor;

import static com.android.window.flags.Flags.multiCrop;

import static com.android.window.flags.Flags.screenBrightnessDimOnEmulator;

import static com.android.window.flags.Flags.setScPropertiesInClient;



import android.Manifest;
@@ -4400,7 +4399,7 @@ public class WindowManagerService extends IWindowManager.Stub 


    @VisibleForTesting

    boolean enableScreenBrightnessEmulatorDisplayOverlay() {

        return screenBrightnessDimOnEmulator() && Build.IS_EMULATOR

        return Build.IS_EMULATOR

                && mContext.getResources().getBoolean(

                R.bool.config_windowEnableScreenBrightnessEmulatorDisplayOverlay);

    }