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

Commit 21420d6d authored by John Wang's avatar John Wang Committed by Android Git Automerger
Browse files

Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base

parents a617fdc6 b9e9f6f7

media/java/android/media/videoeditor/VideoEditorTestImpl.java

+2 −1
Original line number Diff line number Diff line
@@ -641,7 +641,8 @@ public class VideoEditorTestImpl implements VideoEditor { 
                        final EffectColor colorEffect = (EffectColor)effect;

                        serializer.attribute("", ATTR_COLOR_EFFECT_TYPE,

                                Integer.toString(colorEffect.getType()));

                        if (colorEffect.getType() == EffectColor.TYPE_COLOR) {

                        if (colorEffect.getType() == EffectColor.TYPE_COLOR ||

                                colorEffect.getType() == EffectColor.TYPE_GRADIENT) {

                            serializer.attribute("", ATTR_COLOR_EFFECT_VALUE,

                                    Integer.toString(colorEffect.getColor()));

                        }