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

Commit a7118e33 authored by Rajneesh Chowdury's avatar Rajneesh Chowdury Committed by Android (Google) Code Review
Browse files

Merge "Fix for 4080402 NPE in Transition.setDuration" into honeycomb-mr1

parents ff25b975 e7defc29

media/java/android/media/videoeditor/Transition.java

+5 −0
Original line number Diff line number Diff line
@@ -131,6 +131,11 @@ public abstract class Transition { 
        if (durationMs > getMaximumDuration()) {

            throw new IllegalArgumentException("The duration is too large");

        }

        if (afterMediaItem != null) {

            mNativeHelper = afterMediaItem.getNativeContext();

        }else {

            mNativeHelper = beforeMediaItem.getNativeContext();

        }

    }



    /**

media/java/android/media/videoeditor/TransitionAlpha.java

+0 −7
Original line number Diff line number Diff line
@@ -104,13 +104,6 @@ public class TransitionAlpha extends Transition { 
        mWidth = dbo.outWidth;

        mHeight = dbo.outHeight;



        if (afterMediaItem != null) {

            mNativeHelper = afterMediaItem.getNativeContext();

        }else {

            mNativeHelper = beforeMediaItem.getNativeContext();

        }





        mRGBMaskFile = String.format(mNativeHelper.getProjectPath() +

                "/" + "mask" + transitionId+ ".rgb");