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

Commit bdad243d authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 10726380 from 9a0e3f77 to udc-qpr1-release 

Change-Id: I29e409766aaf8f1e5aa6f4c7181bf5e84718c9cb
parents 3aa61a29 9a0e3f77

core/res/res/values/config.xml

+3 −0
Original line number Diff line number Diff line
@@ -6566,6 +6566,9 @@ 
         Off by default, since OEMs may have had a similar feature on their devices. -->

    <bool name="config_repairModeSupported">false</bool>



    <!-- Whether unlocking and waking a device are sequenced -->

    <bool name="config_orderUnlockAndWake">false</bool>



    <!-- Enables or disables the "Share" action item shown in the context menu that appears upon

        long-pressing on selected text. Enabled by default. -->

    <bool name="config_textShareSupported">true</bool>

core/res/res/values/symbols.xml

+3 −0
Original line number Diff line number Diff line
@@ -5160,4 +5160,7 @@ 


  <java-symbol type="drawable" name="focus_event_pressed_key_background" />

  <java-symbol type="string" name="lockscreen_too_many_failed_attempts_countdown" />



  <!-- Whether we order unlocking and waking -->

  <java-symbol type="bool" name="config_orderUnlockAndWake" />

</resources>

libs/hwui/renderthread/CanvasContext.cpp

+2 −0
Original line number Diff line number Diff line
@@ -160,6 +160,7 @@ void CanvasContext::destroy() { 
    destroyHardwareResources();

    mAnimationContext->destroy();

    mRenderThread.cacheManager().onContextStopped(this);

    mHintSessionWrapper.destroy();

}



static void setBufferCount(ANativeWindow* window) {
@@ -193,6 +194,7 @@ void CanvasContext::setHardwareBuffer(AHardwareBuffer* buffer) { 
void CanvasContext::setSurface(ANativeWindow* window, bool enableTimeout) {

    ATRACE_CALL();



    startHintSession();

    if (window) {

        mNativeSurface = std::make_unique<ReliableSurface>(window);

        mNativeSurface->init();

libs/hwui/renderthread/HintSessionWrapper.cpp

+9 −0
Original line number Diff line number Diff line
@@ -93,8 +93,17 @@ HintSessionWrapper::HintSessionWrapper(pid_t uiThreadId, pid_t renderThreadId) 
        : mUiThreadId(uiThreadId), mRenderThreadId(renderThreadId) {}



HintSessionWrapper::~HintSessionWrapper() {

    destroy();

}



void HintSessionWrapper::destroy() {

    if (mHintSessionFuture.valid()) {

        mHintSession = mHintSessionFuture.get();

    }

    if (mHintSession) {

        gAPH_closeSessionFn(mHintSession);

        mSessionValid = true;

        mHintSession = nullptr;

    }

}

libs/hwui/renderthread/HintSessionWrapper.h

+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ public: 
    void sendLoadResetHint();

    void sendLoadIncreaseHint();

    bool init();

    void destroy();



private:

    APerformanceHintSession* mHintSession = nullptr;