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

Commit 001ccdc9 authored by Robert Carr's avatar Robert Carr Committed by android-build-merger
Browse files

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

am: e42b3f05

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

Change-Id: I84acd6bb147dded75314aa97e21dc8d9446fd43a
parents 185f48b7 e42b3f05

core/java/android/view/Window.java

+5 −2
Original line number Original line Diff line number Diff line
@@ -43,6 +43,8 @@ import android.transition.Transition; 
import android.transition.TransitionManager;

import android.transition.TransitionManager;

import android.view.accessibility.AccessibilityEvent;

import android.view.accessibility.AccessibilityEvent;





import static android.view.WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED;



import java.util.List;

import java.util.List;





/**

/**
@@ -792,8 +794,9 @@ public abstract class Window { 
        if (wp.packageName == null) {

        if (wp.packageName == null) {

            wp.packageName = mContext.getPackageName();

            wp.packageName = mContext.getPackageName();

        }

        }

        if (mHardwareAccelerated) {

        if (mHardwareAccelerated ||

            wp.flags |= WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED;

                (mWindowAttributes.flags & FLAG_HARDWARE_ACCELERATED) != 0) {

            wp.flags |= FLAG_HARDWARE_ACCELERATED;

        }

        }

    }

    }