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

Commit 115587fd authored by Ivan Podogov's avatar Ivan Podogov Committed by Android (Google) Code Review
Browse files

Merge "Fix emulator.circular property name prefix"

parents a3a8c17b fa4386a2

core/res/res/values/config.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -3326,7 +3326,7 @@ 
    <!-- default window ShowCircularMask property -->

    <!-- default window ShowCircularMask property -->

    <bool name="config_windowShowCircularMask">false</bool>

    <bool name="config_windowShowCircularMask">false</bool>





    <!-- default value for whether circular emulators (ro.emulator.circular)

    <!-- default value for whether circular emulators (ro.boot.emulator.circular)

         should show a display overlay on the screen -->

         should show a display overlay on the screen -->

    <bool name="config_windowEnableCircularEmulatorDisplayOverlay">false</bool>

    <bool name="config_windowEnableCircularEmulatorDisplayOverlay">false</bool>

services/core/java/com/android/server/display/LocalDisplayAdapter.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -70,7 +70,7 @@ final class LocalDisplayAdapter extends DisplayAdapter { 




    private static final String UNIQUE_ID_PREFIX = "local:";

    private static final String UNIQUE_ID_PREFIX = "local:";





    private static final String PROPERTY_EMULATOR_CIRCULAR = "ro.emulator.circular";

    private static final String PROPERTY_EMULATOR_CIRCULAR = "ro.boot.emulator.circular";





    private final LongSparseArray<LocalDisplayDevice> mDevices = new LongSparseArray<>();

    private final LongSparseArray<LocalDisplayDevice> mDevices = new LongSparseArray<>();

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -418,7 +418,7 @@ public class WindowManagerService extends IWindowManager.Stub 
    private static final String DENSITY_OVERRIDE = "ro.config.density_override";

    private static final String DENSITY_OVERRIDE = "ro.config.density_override";

    private static final String SIZE_OVERRIDE = "ro.config.size_override";

    private static final String SIZE_OVERRIDE = "ro.config.size_override";





    private static final String PROPERTY_EMULATOR_CIRCULAR = "ro.emulator.circular";

    private static final String PROPERTY_EMULATOR_CIRCULAR = "ro.boot.emulator.circular";





    static final int MY_PID = myPid();

    static final int MY_PID = myPid();

    static final int MY_UID = myUid();

    static final int MY_UID = myUid();