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

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

Snap for 4984036 from 48d7e122 to qt-release 

Change-Id: I32ae4ec33898b09cc5e51830f6cd259a20e06192
parents 64ad1bbb 48d7e122

cmds/installd/tests/installd_cache_test.cpp

+2 −2
Original line number Diff line number Diff line
@@ -40,8 +40,8 @@ constexpr int64_t kMbInBytes = 1024 * kKbInBytes; 
constexpr int64_t kGbInBytes = 1024 * kMbInBytes;

constexpr int64_t kTbInBytes = 1024 * kGbInBytes;



static constexpr int FLAG_FREE_CACHE_V2 = 1 << 13;

static constexpr int FLAG_FREE_CACHE_V2_DEFY_QUOTA = 1 << 14;

#define FLAG_FREE_CACHE_V2 InstalldNativeService::FLAG_FREE_CACHE_V2

#define FLAG_FREE_CACHE_V2_DEFY_QUOTA InstalldNativeService::FLAG_FREE_CACHE_V2_DEFY_QUOTA



int get_property(const char *key, char *value, const char *default_value) {

    return property_get(key, value, default_value);

cmds/installd/tests/installd_service_test.cpp

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ namespace installd { 


constexpr const char* kTestUuid = "TEST";



static constexpr int FLAG_FORCE = 1 << 16;

#define FLAG_FORCE InstalldNativeService::FLAG_FORCE



int get_property(const char *key, char *value, const char *default_value) {

    return property_get(key, value, default_value);

cmds/surfacereplayer/proto/src/trace.proto

+1 −6
Original line number Diff line number Diff line
@@ -30,14 +30,13 @@ message Transaction { 


message SurfaceChange {

    required int32 id = 1;



    reserved 7;

    oneof SurfaceChange {

        PositionChange              position                = 2;

        SizeChange                  size                    = 3;

        AlphaChange                 alpha                   = 4;

        LayerChange                 layer                   = 5;

        CropChange                  crop                    = 6;

        FinalCropChange             final_crop              = 7;

        MatrixChange                matrix                  = 8;

        OverrideScalingModeChange   override_scaling_mode   = 9;

        TransparentRegionHintChange transparent_region_hint = 10;
@@ -71,10 +70,6 @@ message CropChange { 
    required Rectangle rectangle = 1;

}



message FinalCropChange {

    required Rectangle rectangle = 1;

}



message MatrixChange {

    required float dsdx = 1;

    required float dtdx = 2;

cmds/surfacereplayer/replayer/Replayer.cpp

+0 −13
Original line number Diff line number Diff line
@@ -388,9 +388,6 @@ status_t Replayer::doSurfaceTransaction( 
            case SurfaceChange::SurfaceChangeCase::kMatrix:

                setMatrix(transaction, change.id(), change.matrix());

                break;

            case SurfaceChange::SurfaceChangeCase::kFinalCrop:

                setFinalCrop(transaction, change.id(), change.final_crop());

                break;

            case SurfaceChange::SurfaceChangeCase::kOverrideScalingMode:

                setOverrideScalingMode(transaction, change.id(),

                        change.override_scaling_mode());
@@ -492,16 +489,6 @@ void Replayer::setCrop(SurfaceComposerClient::Transaction& t, 
    t.setCrop_legacy(mLayers[id], r);

}



void Replayer::setFinalCrop(SurfaceComposerClient::Transaction& t,

        layer_id id, const FinalCropChange& fcc) {

    ALOGV("Layer %d: Setting Final Crop -- left=%d, top=%d, right=%d, bottom=%d", id,

            fcc.rectangle().left(), fcc.rectangle().top(), fcc.rectangle().right(),

            fcc.rectangle().bottom());

    Rect r = Rect(fcc.rectangle().left(), fcc.rectangle().top(), fcc.rectangle().right(),

            fcc.rectangle().bottom());

    t.setFinalCrop_legacy(mLayers[id], r);

}



void Replayer::setMatrix(SurfaceComposerClient::Transaction& t,

        layer_id id, const MatrixChange& mc) {

    ALOGV("Layer %d: Setting Matrix -- dsdx=%f, dtdx=%f, dsdy=%f, dtdy=%f", id, mc.dsdx(),

cmds/surfacereplayer/replayer/Replayer.h

+0 −2
Original line number Diff line number Diff line
@@ -92,8 +92,6 @@ class Replayer { 
            layer_id id, const LayerChange& lc);

    void setCrop(SurfaceComposerClient::Transaction& t,

            layer_id id, const CropChange& cc);

    void setFinalCrop(SurfaceComposerClient::Transaction& t,

            layer_id id, const FinalCropChange& fcc);

    void setMatrix(SurfaceComposerClient::Transaction& t,

            layer_id id, const MatrixChange& mc);

    void setOverrideScalingMode(SurfaceComposerClient::Transaction& t,