Merge "Fix flag value collision" into nyc-dev

This commit is contained in:
Tim Murray
2016-04-21 22:59:40 +00:00
committed by Android (Google) Code Review

View File

@@ -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.