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

Commit fc515110 authored by John Reck's avatar John Reck Committed by Android (Google) Code Review
Browse files

Merge "resolve merge conflicts of 04ce46db to master."

parents 0550f1b8 bf4b31f7

core/java/android/view/ThreadedRenderer.java

+3 −2
Original line number Diff line number Diff line
@@ -422,9 +422,10 @@ public final class ThreadedRenderer { 
     * @return True if the initialization was successful, false otherwise.

     */

    boolean initialize(Surface surface) throws OutOfResourcesException {

        boolean status = !mInitialized;

        mInitialized = true;

        updateEnabledState(surface);

        boolean status = nInitialize(mNativeProxy, surface);

        nInitialize(mNativeProxy, surface);

        return status;

    }
@@ -958,7 +959,7 @@ public final class ThreadedRenderer { 
    private static native boolean nLoadSystemProperties(long nativeProxy);

    private static native void nSetName(long nativeProxy, String name);



    private static native boolean nInitialize(long nativeProxy, Surface window);

    private static native void nInitialize(long nativeProxy, Surface window);

    private static native void nUpdateSurface(long nativeProxy, Surface window);

    private static native boolean nPauseSurface(long nativeProxy, Surface window);

    private static native void nSetup(long nativeProxy, int width, int height,

core/jni/android_view_ThreadedRenderer.cpp

+3 −3
Original line number Diff line number Diff line
@@ -262,11 +262,11 @@ static void android_view_ThreadedRenderer_setName(JNIEnv* env, jobject clazz, 
    env->ReleaseStringUTFChars(jname, name);

}



static jboolean android_view_ThreadedRenderer_initialize(JNIEnv* env, jobject clazz,

static void android_view_ThreadedRenderer_initialize(JNIEnv* env, jobject clazz,

        jlong proxyPtr, jobject jsurface) {

    RenderProxy* proxy = reinterpret_cast<RenderProxy*>(proxyPtr);

    sp<ANativeWindow> window = android_view_Surface_getNativeWindow(env, jsurface);

    return proxy->initialize(window);

    proxy->initialize(window);

}



static void android_view_ThreadedRenderer_updateSurface(JNIEnv* env, jobject clazz,
@@ -492,7 +492,7 @@ static const JNINativeMethod gMethods[] = { 
    { "nDeleteProxy", "(J)V", (void*) android_view_ThreadedRenderer_deleteProxy },

    { "nLoadSystemProperties", "(J)Z", (void*) android_view_ThreadedRenderer_loadSystemProperties },

    { "nSetName", "(JLjava/lang/String;)V", (void*) android_view_ThreadedRenderer_setName },

    { "nInitialize", "(JLandroid/view/Surface;)Z", (void*) android_view_ThreadedRenderer_initialize },

    { "nInitialize", "(JLandroid/view/Surface;)V", (void*) android_view_ThreadedRenderer_initialize },

    { "nUpdateSurface", "(JLandroid/view/Surface;)V", (void*) android_view_ThreadedRenderer_updateSurface },

    { "nPauseSurface", "(JLandroid/view/Surface;)Z", (void*) android_view_ThreadedRenderer_pauseSurface },

    { "nSetup", "(JIIFII)V", (void*) android_view_ThreadedRenderer_setup },

libs/hwui/renderthread/CanvasContext.cpp

+2 −3
Original line number Diff line number Diff line
@@ -128,14 +128,13 @@ void CanvasContext::setSwapBehavior(SwapBehavior swapBehavior) { 
    mSwapBehavior = swapBehavior;

}



bool CanvasContext::initialize(ANativeWindow* window) {

void CanvasContext::initialize(ANativeWindow* window) {

    setSurface(window);

#if !HWUI_NEW_OPS

    if (mCanvas) return false;

    if (mCanvas) return;

    mCanvas = new OpenGLRenderer(mRenderThread.renderState());

    mCanvas->initProperties();

#endif

    return true;

}



void CanvasContext::updateSurface(ANativeWindow* window) {

libs/hwui/renderthread/CanvasContext.h

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ public: 
    // Won't take effect until next EGLSurface creation

    void setSwapBehavior(SwapBehavior swapBehavior);



    bool initialize(ANativeWindow* window);

    void initialize(ANativeWindow* window);

    void updateSurface(ANativeWindow* window);

    bool pauseSurface(ANativeWindow* window);

    bool hasSurface() { return mNativeWindow.get(); }

libs/hwui/renderthread/RenderProxy.cpp

+4 −3
Original line number Diff line number Diff line
@@ -140,14 +140,15 @@ void RenderProxy::setName(const char* name) { 
}



CREATE_BRIDGE2(initialize, CanvasContext* context, ANativeWindow* window) {

    return (void*) args->context->initialize(args->window);

    args->context->initialize(args->window);

    return nullptr;

}



bool RenderProxy::initialize(const sp<ANativeWindow>& window) {

void RenderProxy::initialize(const sp<ANativeWindow>& window) {

    SETUP_TASK(initialize);

    args->context = mContext;

    args->window = window.get();

    return (bool) postAndWait(task);

    post(task);

}



CREATE_BRIDGE2(updateSurface, CanvasContext* context, ANativeWindow* window) {