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

Commit 894d6a31 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 51173401 from e905bdb1 to pi-qpr2-release 

Change-Id: Ic24cfd7404a2b3eea63199fdb7305085eea624d9
parents aa496caa e905bdb1

cmds/statsd/src/atoms.proto

+21 −2
Original line number Diff line number Diff line
@@ -121,8 +121,7 @@ message Atom { 
        ANROccurred anr_occurred = 79;

        WTFOccurred wtf_occurred = 80;

        LowMemReported low_mem_reported = 81;





        ThermalThrottlingStateChanged thermal_throttling = 86;

    }



    // Pulled events will start at field 10000.
@@ -197,6 +196,26 @@ message AttributionNode { 
 * *****************************************************************************

 */



/**

 * Logs when the Thermal service HAL notifies the throttling start/stop events.

 *

 * Logged from:

 *   frameworks/base/services/core/java/com/android/server/stats/StatsCompanionService.java

 */

message ThermalThrottlingStateChanged {

    optional android.os.TemperatureTypeEnum sensor_type = 1;



    enum State {

        UNKNOWN = 0;

        START = 1;

        STOP = 2;

    }



    optional State state = 2;



    optional float temperature = 3;

}



/**

 * Logs when the screen state changes.

 *

libs/hwui/GlLayer.cpp

+8 −0
Original line number Diff line number Diff line
@@ -72,5 +72,13 @@ void GlLayer::generateTexture() { 
    }

}



SkBlendMode GlLayer::getMode() const {

    if (texture.blend || mode != SkBlendMode::kSrcOver) {

        return mode;

    } else {

        return SkBlendMode::kSrc;

    }

}



};  // namespace uirenderer

};  // namespace android

libs/hwui/GlLayer.h

+2 −0
Original line number Diff line number Diff line
@@ -66,6 +66,8 @@ public: 
     */

    void onGlContextLost();



    SkBlendMode getMode() const override;



private:

    Caches& caches;

libs/hwui/Layer.cpp

+2 −2
Original line number Diff line number Diff line
@@ -27,10 +27,10 @@ Layer::Layer(RenderState& renderState, Api api, sk_sp<SkColorFilter> colorFilter 
             SkBlendMode mode)

        : GpuMemoryTracker(GpuObjectType::Layer)

        , mRenderState(renderState)

        , mode(mode)

        , mApi(api)

        , mColorFilter(colorFilter)

        , alpha(alpha)

        , mode(mode) {

        , alpha(alpha) {

    // TODO: This is a violation of Android's typical ref counting, but it

    // preserves the old inc/dec ref locations. This should be changed...

    incStrong(nullptr);

libs/hwui/Layer.h

+6 −6
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ public: 


    inline int getAlpha() const { return alpha; }



    inline SkBlendMode getMode() const { return mode; }

    virtual SkBlendMode getMode() const { return mode; }



    inline SkColorFilter* getColorFilter() const { return mColorFilter.get(); }
@@ -109,6 +109,11 @@ protected: 


    RenderState& mRenderState;



    /**

     * Blending mode of the layer.

     */

    SkBlendMode mode;



private:

    void buildColorSpaceWithFilter();
@@ -139,11 +144,6 @@ private: 
     */

    int alpha;



    /**

     * Blending mode of the layer.

     */

    SkBlendMode mode;



    /**

     * Optional texture coordinates transform.

     */