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

Commit e42b3f05 authored by Rob Carr's avatar Rob Carr Committed by android-build-merger
Browse files

Merge "Respect manually set HARDWARE_ACCELERATED flag." into nyc-dev am: 37696ccc 

am: ff54c9ee

* commit 'ff54c9ee':
  Respect manually set HARDWARE_ACCELERATED flag.

Change-Id: Ie0530121ee8dc34ae41f89acb27eeaf41ddf3534
parents baeb17e3 ff54c9ee

core/java/android/view/Window.java

+5 −2
Original line number Diff line number Diff line
@@ -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;

        }

    }