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

Commit ee75008a authored by Lingyu Feng's avatar Lingyu Feng Committed by Android (Google) Code Review
Browse files

Merge "Disable content mode switch on wifi displays" into main

parents 02330691 ad910978
Loading
Loading
Loading
Loading
+0 −6
Original line number Diff line number Diff line
@@ -666,12 +666,6 @@ final class WifiDisplayAdapter extends DisplayAdapter {
                mInfo.setAssumedDensityForExternalDisplay(mWidth, mHeight);
                // The display is trusted since it is created by system.
                mInfo.flags |= DisplayDeviceInfo.FLAG_TRUSTED;
                if (getFeatureFlags().isDisplayContentModeManagementEnabled()) {
                    // The wifi display is allowed to switch content mode since FLAG_PRIVATE,
                    // FLAG_OWN_CONTENT_ONLY, and FLAG_SHOULD_SHOW_SYSTEM_DECORATIONS are not
                    // enabled in WifiDisplayDevice#getDisplayDeviceInfoLocked().
                    mInfo.flags |= DisplayDeviceInfo.FLAG_ALLOWS_CONTENT_MODE_SWITCH;
                }
                mInfo.displayShape =
                        DisplayShape.createDefaultDisplayShape(mInfo.width, mInfo.height, false);
            }