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

Commit dcd8a172 authored by Mathias Agopian's avatar Mathias Agopian Committed by The Android Automerger
Browse files

make sure to re-initialize SurfaceTexture to its default state on disconnect 

this caused problems where the NavigationBar would disapear or be
drawn in the wrong orientation.

Change-Id: I083c41338db83a4afd14f427caec2f31c180d734
parent 1a9fcfb7

libs/gui/SurfaceTexture.cpp

+4 −1
Original line number Diff line number Diff line
@@ -608,6 +608,9 @@ status_t SurfaceTexture::disconnect(int api) { 
            if (mConnectedApi == api) {

                drainQueueAndFreeBuffersLocked();

                mConnectedApi = NO_CONNECTED_API;

                mNextCrop.makeInvalid();

                mNextScalingMode = NATIVE_WINDOW_SCALING_MODE_FREEZE;

                mNextTransform = 0;

                mDequeueCondition.signal();

            } else {

                LOGE("disconnect: connected to another api (cur=%d, req=%d)",
@@ -1022,7 +1025,7 @@ void SurfaceTexture::dump(String8& result, const char* prefix, 
            mCurrentCrop.top, mCurrentCrop.right, mCurrentCrop.bottom,

            mCurrentTransform, mCurrentTexture,

            prefix, mNextCrop.left, mNextCrop.top, mNextCrop.right, mNextCrop.bottom,

            mCurrentTransform, fifoSize, fifo.string()

            mNextTransform, fifoSize, fifo.string()

    );

    result.append(buffer);

libs/gui/SurfaceTextureClient.cpp

+9 −2
Original line number Diff line number Diff line
@@ -407,9 +407,16 @@ int SurfaceTextureClient::disconnect(int api) { 
    LOGV("SurfaceTextureClient::disconnect");

    Mutex::Autolock lock(mMutex);

    int err = mSurfaceTexture->disconnect(api);

    if (!err && api == NATIVE_WINDOW_API_CPU) {

    if (!err) {

        freeAllBuffers();

        mReqFormat = 0;

        mReqWidth = 0;

        mReqHeight = 0;

        mReqUsage = 0;

        if (api == NATIVE_WINDOW_API_CPU) {

            mConnectedToCpu = false;

        }

    }

    return err;

}

services/java/com/android/server/Watchdog.java

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ public class Watchdog extends Thread { 


    static final int MONITOR = 2718;



    static final int TIME_TO_RESTART = DB ? 15*1000 : 60*1000;

    static final int TIME_TO_RESTART = DB ? 15*1000000 : 60*1000000;

    static final int TIME_TO_WAIT = TIME_TO_RESTART / 2;



    static final int MEMCHECK_DEFAULT_MIN_SCREEN_OFF = DB ? 1*60 : 5*60;   // 5 minutes