Merge "Fix flag value collision" into nyc-dev

2016-04-21 22:59:40 +00:00
parent 60b688876d 60e885f672
commit e5cebf7aaa
1 changed files with 1 additions and 1 deletions
--- a/core/java/android/view/WindowManager.java
+++ b/core/java/android/view/WindowManager.java
@@ -1251,7 +1251,7 @@ public interface WindowManager extends ViewManager {
         * the device supports it.
         * @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.