Merge "Fix video scaling mode validity check." into jb-dev

Bryan Mawhinney · Android (Google) Code Review · commit 9de61ae0ed40 · 2012-05-17T16:19:30.000-07:00
diff --git a/media/java/android/media/MediaPlayer.java b/media/java/android/media/MediaPlayer.java
@@ -737,7 +737,7 @@ public void setSurface(Surface surface) {
      * @see MediaPlayer#VIDEO_SCALING_MODE_SCALE_TO_FIT_WITH_CROPPING
      */
     public void setVideoScalingMode(int mode) {
-        if (isVideoScalingModeSupported(mode)) {
+        if (!isVideoScalingModeSupported(mode)) {
             final String msg = "Scaling mode " + mode + " is not supported";
             throw new IllegalArgumentException(msg);
         }

Original file line number	Diff line number	Diff line change
`@@ -737,7 +737,7 @@ public void setSurface(Surface surface) {`
`737`	`737`	`* @see MediaPlayer#VIDEO_SCALING_MODE_SCALE_TO_FIT_WITH_CROPPING`
`738`	`738`	`*/`
`739`	`739`	`public void setVideoScalingMode(int mode) {`
`740`		`- if (isVideoScalingModeSupported(mode)) {`
	`740`	`+ if (!isVideoScalingModeSupported(mode)) {`
`741`	`741`	`final String msg = "Scaling mode " + mode + " is not supported";`
`742`	`742`	`throw new IllegalArgumentException(msg);`
`743`	`743`	`}`