Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Respect manually set HARDWARE_ACCELERATED flag." into nyc-dev

Browse Source 
am: 37696cccd8

* commit '37696cccd8925ca6e4aa6f2ca6f29807066c7f1e':
  Respect manually set HARDWARE_ACCELERATED flag.

Change-Id: I28ae79e505d0a234c293efd56d2434dd6cca0ca8
This commit is contained in:
Robert Carr
2016-04-21 20:01:13 +00:00
committed by android-build-merger
parent 19ad9f3f9e 37696cccd8
commit ff54c9eeb2
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/android/view/Window.java
View File

@@ -43,6 +43,8 @@ import android.transition.Transition;
import android.transition.TransitionManager;
import android.view.accessibility.AccessibilityEvent;
import static android.view.WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED;
import java.util.List;
/**
@@ -792,8 +794,9 @@ public abstract class Window {
if (wp.packageName == null) {
wp.packageName = mContext.getPackageName();
}
if (mHardwareAccelerated) {
wp.flags |= WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED;
if (mHardwareAccelerated ||
(mWindowAttributes.flags & FLAG_HARDWARE_ACCELERATED) != 0) {
wp.flags |= FLAG_HARDWARE_ACCELERATED;
}
}