commit c0d9d25b8731be61015ebf44c10a2d372d52c893
author Rajneesh Chowdury <rajneeshc@google.com> Thu Mar 10 15:14:27 2011 -0800
committer Android Git Automerger <android-git-automerger@android.com> Thu Mar 10 15:14:27 2011 -0800
tree d95a44e6ce97d1cf40d7089c184245798eddf900
parent b04509751205b879090daa2a1ce644c2326afdb3
parent a4865ec73f9faccd6dc442cbc6d78666b1a69b28

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

* commit 'a4865ec73f9faccd6dc442cbc6d78666b1a69b28':
  Fix for 4080402 NPE in Transition.setDuration

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

diff --git a/media/java/android/media/videoeditor/Transition.java b/media/java/android/media/videoeditor/Transition.java
index 3e8fe94..fa9d26d 100755
--- a/media/java/android/media/videoeditor/Transition.java
+++ b/media/java/android/media/videoeditor/Transition.java
@@ -131,6 +131,11 @@
         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

diff --git a/media/java/android/media/videoeditor/TransitionAlpha.java b/media/java/android/media/videoeditor/TransitionAlpha.java
index f7d17cb..22788d4 100755
--- a/media/java/android/media/videoeditor/TransitionAlpha.java
+++ b/media/java/android/media/videoeditor/TransitionAlpha.java
@@ -104,13 +104,6 @@
         mWidth = dbo.outWidth;
         mHeight = dbo.outHeight;
 
-        if (afterMediaItem != null) {
-            mNativeHelper = afterMediaItem.getNativeContext();
-        }else {
-            mNativeHelper = beforeMediaItem.getNativeContext();
-        }
-
-
         mRGBMaskFile = String.format(mNativeHelper.getProjectPath() +
                 "/" + "mask" + transitionId+ ".rgb");