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

Commit 7e51a3a2 authored by Mathias Agopian's avatar Mathias Agopian Committed by Android Git Automerger
Browse files

am f8e4bc9f: Merge change I0c4cec7e into eclair 

Merge commit 'f8e4bc9f7789b98b54fe04df56555ca8c630df70' into eclair-plus-aosp

* commit 'f8e4bc9f7789b98b54fe04df56555ca8c630df70':
  Attempt to fix [2152536] ANR in browser
parents 7c29a43a defd1bd0

include/private/ui/SharedBufferStack.h

+9 −7
Original line number Diff line number Diff line
@@ -142,6 +142,7 @@ public: 
    SharedBufferBase(SharedClient* sharedClient, int surface, int num);

    ~SharedBufferBase();

    uint32_t getIdentity();

    status_t getStatus() const;

    size_t getFrontBuffer() const;

    String8 dump(char const* prefix) const;
@@ -188,13 +189,14 @@ status_t SharedBufferBase::waitForCondition(T condition) 
                if (condition()) {

                    LOGE("waitForCondition(%s) timed out (identity=%d), "

                        "but condition is true! We recovered but it "

                            "shouldn't happen." , 

                            T::name(), mSharedStack->identity);

                        "shouldn't happen." , T::name(),

                        mSharedStack->identity);

                    break;

                } else {

                    LOGW("waitForCondition(%s) timed out (identity=%d). "

                            "CPU may be pegged. trying again.",

                            T::name(), mSharedStack->identity);

                    LOGW("waitForCondition(%s) timed out "

                        "(identity=%d, status=%d). "

                        "CPU may be pegged. trying again.", T::name(),

                        mSharedStack->identity, mSharedStack->status);

                }

            } else {

                LOGE("waitForCondition(%s) error (%s) ",