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

Commit a4865ec7 authored by Rajneesh Chowdury's avatar Rajneesh Chowdury Committed by Android Git Automerger
Browse files

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

* commit 'a7118e33':
  Fix for 4080402 NPE in Transition.setDuration
parents adcaca26 a7118e33

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");