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

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

Snap for 6152176 from a961e117 to rvc-release 

Change-Id: I4e0871c05fbbf64bad4ad4aa6fb955828226dde8
parents 6a5bcf13 a961e117

cmds/surfacereplayer/proto/src/trace.proto

+5 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ message SurfaceChange { 
        RelativeParentChange        relative_parent         = 18;

        DetachChildrenChange        detach_children         = 19;

        ReparentChildrenChange      reparent_children       = 20;

        BackgroundBlurRadiusChange  background_blur_radius  = 21;

        ShadowRadiusChange          shadow_radius           = 22;

    }

}
@@ -73,6 +74,10 @@ message CornerRadiusChange { 
    required float corner_radius = 1;

}



message BackgroundBlurRadiusChange {

    required float background_blur_radius = 1;

}



message LayerChange {

    required uint32 layer = 1;

}

cmds/surfacereplayer/replayer/Replayer.cpp

+8 −0
Original line number Diff line number Diff line
@@ -510,6 +510,14 @@ void Replayer::setCornerRadius(SurfaceComposerClient::Transaction& t, 
    t.setCornerRadius(mLayers[id], cc.corner_radius());

}



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

        layer_id id, const BackgroundBlurRadiusChange& cc) {

    ALOGV("Layer %d: Setting Background Blur Radius -- backgroundBlurRadius=%d", id,

        cc.background_blur_radius());



    t.setBackgroundBlurRadius(mLayers[id], cc.background_blur_radius());

}



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

+2 −0
Original line number Diff line number Diff line
@@ -94,6 +94,8 @@ class Replayer { 
            layer_id id, const CropChange& cc);

    void setCornerRadius(SurfaceComposerClient::Transaction& t,

            layer_id id, const CornerRadiusChange& cc);

    void setBackgroundBlurRadius(SurfaceComposerClient::Transaction& t,

            layer_id id, const BackgroundBlurRadiusChange& cc);

    void setMatrix(SurfaceComposerClient::Transaction& t,

            layer_id id, const MatrixChange& mc);

    void setOverrideScalingMode(SurfaceComposerClient::Transaction& t,

data/etc/android.hardware.telephony.cdma.xml

+0 −1
Original line number Diff line number Diff line
@@ -18,5 +18,4 @@ 
<permissions>

    <feature name="android.hardware.telephony" />

    <feature name="android.hardware.telephony.cdma" />

    <feature name="android.hardware.telephony.data" />

</permissions>

data/etc/android.hardware.telephony.gsm.xml

+0 −1
Original line number Diff line number Diff line
@@ -18,5 +18,4 @@ 
<permissions>

    <feature name="android.hardware.telephony" />

    <feature name="android.hardware.telephony.gsm" />

    <feature name="android.hardware.telephony.data" />

</permissions>