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

Commit bf4e2f74 authored by John Reck's avatar John Reck Committed by android-build-merger
Browse files

Merge "Fix flag value collision" into nyc-dev 

am: e5cebf7a

* commit 'e5cebf7a':
  Fix flag value collision

Change-Id: I3e37e772474b2a8d37d2bb4dcea41daa46e23c69
parents a5f89b13 e5cebf7a

core/java/android/view/WindowManager.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -1251,7 +1251,7 @@ public interface WindowManager extends ViewManager { 
         * the device supports it.

         * the device supports it.

         * @hide

         * @hide

         */

         */

        public static final int PRIVATE_FLAG_SUSTAINED_PERFORMANCE_MODE = 0x00020000;

        public static final int PRIVATE_FLAG_SUSTAINED_PERFORMANCE_MODE = 0x00040000;





        /**

        /**

         * Control flags that are private to the platform.

         * Control flags that are private to the platform.