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

Commit 4c60c541 authored by Romain Guy's avatar Romain Guy Committed by Android (Google) Code Review
Browse files

Merge "Properly tear down TextureView"

parents 01ecdcc7 80429c45

core/java/android/view/TextureView.java

+1 −1
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ public class TextureView extends View { 
    protected void onDetachedFromWindow() {

        super.onDetachedFromWindow();



        if (isHardwareAccelerated() && mLayer != null) {

        if (mLayer != null) {

            if (mListener != null) {

                mListener.onSurfaceTextureDestroyed(mSurface);

            }

libs/hwui/LayerRenderer.cpp

+1 −0
Original line number Diff line number Diff line
@@ -281,6 +281,7 @@ void LayerRenderer::updateTextureLayer(Layer* layer, uint32_t width, uint32_t he 
        layer->texTransform.load(transform);

        layer->renderTarget = renderTarget;



        // TODO: This should be done only when the render target has changed

        glBindTexture(layer->renderTarget, layer->texture);



        glTexParameteri(layer->renderTarget, GL_TEXTURE_MIN_FILTER, GL_LINEAR);

tests/HwAccelerationTest/src/com/android/test/hwui/GLTextureViewActivity.java

+0 −2
Original line number Diff line number Diff line
@@ -93,8 +93,6 @@ public class GLTextureViewActivity extends Activity implements TextureView.Surfa 
        private static final String LOG_TAG = "GLTextureView";



        static final int EGL_CONTEXT_CLIENT_VERSION = 0x3098;

        static final int EGL_SURFACE_TYPE = 0x3033;

        static final int EGL_SWAP_BEHAVIOR_PRESERVED_BIT = 0x0400;

        static final int EGL_OPENGL_ES2_BIT = 4;



        private volatile boolean mFinished;

tests/HwAccelerationTest/src/com/android/test/hwui/TextureViewActivity.java

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import android.os.Bundle; 
import android.view.Gravity;

import android.view.TextureView;

import android.view.View;

import android.view.ViewGroup;

import android.widget.Button;

import android.widget.FrameLayout;