diff options
| author | Andreas Gampe <agampe@google.com> | 2015-03-16 20:26:32 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-16 20:26:32 +0000 |
| commit | 6ec9fd8b3b6c6722a86921a0d065b092c17082e8 (patch) | |
| tree | 208413ee5b86b4ef34810996ec432539bdebd122 | |
| parent | dc16e24afcffef742bc48ac1047ad48e928d3489 (diff) | |
| parent | c3228a9d400bcacd15fbbdf136ee1f9cf56de2d0 (diff) | |
| download | frameworks_base-6ec9fd8b3b6c6722a86921a0d065b092c17082e8.zip frameworks_base-6ec9fd8b3b6c6722a86921a0d065b092c17082e8.tar.gz frameworks_base-6ec9fd8b3b6c6722a86921a0d065b092c17082e8.tar.bz2 | |
am c3228a9d: am 3d33314e: Merge "Frameworks/base: Use equals for Integer comparison"
* commit 'c3228a9d400bcacd15fbbdf136ee1f9cf56de2d0':
Frameworks/base: Use equals for Integer comparison
| -rw-r--r-- | media/java/android/media/MediaCodecInfo.java | 4 | ||||
| -rw-r--r-- | media/java/android/media/MediaFormat.java | 4 | ||||
| -rw-r--r-- | media/java/android/media/WebVttRenderer.java | 4 |
3 files changed, 7 insertions, 5 deletions
diff --git a/media/java/android/media/MediaCodecInfo.java b/media/java/android/media/MediaCodecInfo.java index 3c9ca4e..ebf73da 100644 --- a/media/java/android/media/MediaCodecInfo.java +++ b/media/java/android/media/MediaCodecInfo.java @@ -1972,7 +1972,7 @@ public final class MediaCodecInfo { (Integer)map.get(MediaFormat.KEY_FLAC_COMPRESSION_LEVEL); if (complexity == null) { complexity = flacComplexity; - } else if (flacComplexity != null && complexity != flacComplexity) { + } else if (flacComplexity != null && !complexity.equals(flacComplexity)) { throw new IllegalArgumentException( "conflicting values for complexity and " + "flac-compression-level"); @@ -1985,7 +1985,7 @@ public final class MediaCodecInfo { Integer aacProfile = (Integer)map.get(MediaFormat.KEY_AAC_PROFILE); if (profile == null) { profile = aacProfile; - } else if (aacProfile != null && aacProfile != profile) { + } else if (aacProfile != null && !aacProfile.equals(profile)) { throw new IllegalArgumentException( "conflicting values for profile and aac-profile"); } diff --git a/media/java/android/media/MediaFormat.java b/media/java/android/media/MediaFormat.java index c44fbe6..0c1c7e9 100644 --- a/media/java/android/media/MediaFormat.java +++ b/media/java/android/media/MediaFormat.java @@ -606,14 +606,14 @@ public final class MediaFormat { * Sets the value of an integer key. */ public final void setInteger(String name, int value) { - mMap.put(name, new Integer(value)); + mMap.put(name, Integer.valueOf(value)); } /** * Sets the value of a long key. */ public final void setLong(String name, long value) { - mMap.put(name, new Long(value)); + mMap.put(name, Long.valueOf(value)); } /** diff --git a/media/java/android/media/WebVttRenderer.java b/media/java/android/media/WebVttRenderer.java index 69e0ea6..91c53fa 100644 --- a/media/java/android/media/WebVttRenderer.java +++ b/media/java/android/media/WebVttRenderer.java @@ -433,7 +433,9 @@ class TextTrackCue extends SubtitleTrack.Cue { mRegionId.equals(cue.mRegionId) && mSnapToLines == cue.mSnapToLines && mAutoLinePosition == cue.mAutoLinePosition && - (mAutoLinePosition || mLinePosition == cue.mLinePosition) && + (mAutoLinePosition || + ((mLinePosition != null && mLinePosition.equals(cue.mLinePosition)) || + (mLinePosition == null && cue.mLinePosition == null))) && mTextPosition == cue.mTextPosition && mSize == cue.mSize && mAlignment == cue.mAlignment && |