am 2bb13573: Bug fix: 3405930 Crash editing overlay text (1aa865aa) · Commits · e / os / android_frameworks_base

media/java/android/media/videoeditor/AudioTrack.java

+16 −12

Original line number	Diff line number	Diff line
		@@ -270,11 +270,13 @@ public class AudioTrack {
		if (volumePercent < 0) {
		throw new IllegalArgumentException("Invalid Volume ");
		}
		mVolumePercent = volumePercent;

		/**
		* Force update of preview settings
		*/
		mMANativeHelper.setGeneratePreview(true);

		mVolumePercent = volumePercent;
		}

		/**
		@@ -294,11 +296,11 @@ public class AudioTrack {
		* the volume of this Audio Track to 0.
		*/
		public void setMute(boolean muted) {
		mMuted = muted;
		/**
		* Force update of preview settings
		*/
		mMANativeHelper.setGeneratePreview(true);
		mMuted = muted;
		}

		/**
		@@ -363,14 +365,15 @@ public class AudioTrack {
		throw new IllegalArgumentException("Invalid end time; is < 0");
		}

		mBeginBoundaryTimeMs = beginMs;
		mEndBoundaryTimeMs = endMs;

		mTimelineDurationMs = mEndBoundaryTimeMs - mBeginBoundaryTimeMs;
		/**
		* Force update of preview settings
		*/
		mMANativeHelper.setGeneratePreview(true);

		mBeginBoundaryTimeMs = beginMs;
		mEndBoundaryTimeMs = endMs;

		mTimelineDurationMs = mEndBoundaryTimeMs - mBeginBoundaryTimeMs;
		}

		/**
		@@ -412,11 +415,11 @@ public class AudioTrack {
		*/
		public void disableLoop() {
		if (mLoop) {
		mLoop = false;
		/**
		* Force update of preview settings
		*/
		mMANativeHelper.setGeneratePreview(true);
		mLoop = false;
		}
		}

		@@ -434,11 +437,11 @@ public class AudioTrack {
		*/
		public void disableDucking() {
		if (mIsDuckingEnabled) {
		mIsDuckingEnabled = false;
		/**
		* Force update of preview settings
		*/
		mMANativeHelper.setGeneratePreview(true);
		mIsDuckingEnabled = false;
		}
		}

		@@ -462,13 +465,14 @@ public class AudioTrack {
		+ duckedTrackVolume);
		}

		mDuckingThreshold = threshold;
		mDuckedTrackVolume = duckedTrackVolume;
		mIsDuckingEnabled = true;
		/**
		* Force update of preview settings
		*/
		mMANativeHelper.setGeneratePreview(true);

		mDuckingThreshold = threshold;
		mDuckedTrackVolume = duckedTrackVolume;
		mIsDuckingEnabled = true;
		}

		/**

media/java/android/media/videoeditor/Effect.java

+4 −6

Original line number	Diff line number	Diff line
		@@ -105,8 +105,7 @@ public abstract class Effect {
		final long oldDurationMs = mDurationMs;
		mDurationMs = durationMs;

		mMediaItem.invalidateTransitions(mStartTimeMs, oldDurationMs,
		mStartTimeMs, mDurationMs);
		mMediaItem.invalidateTransitions(mStartTimeMs, oldDurationMs, mStartTimeMs, mDurationMs);
		}

		/**
		@@ -130,11 +129,11 @@ public abstract class Effect {
		throw new IllegalArgumentException("Start time is too large");
		}

		getMediaItem().getNativeContext().setGeneratePreview(true);
		final long oldStartTimeMs = mStartTimeMs;
		mStartTimeMs = startTimeMs;

		mMediaItem.invalidateTransitions(oldStartTimeMs, mDurationMs,
		mStartTimeMs, mDurationMs);
		mMediaItem.invalidateTransitions(oldStartTimeMs, mDurationMs, mStartTimeMs, mDurationMs);
		}

		/**
		@@ -163,8 +162,7 @@ public abstract class Effect {
		mStartTimeMs = startTimeMs;
		mDurationMs = durationMs;

		mMediaItem.invalidateTransitions(oldStartTimeMs, oldDurationMs,
		mStartTimeMs, mDurationMs);
		mMediaItem.invalidateTransitions(oldStartTimeMs, oldDurationMs, mStartTimeMs, mDurationMs);
		}

		/**