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

Commit 84dd4baf authored by Jae Seo's avatar Jae Seo Committed by Android Git Automerger
Browse files

am b162e74a: am c151f8d7: am 77771822: TIF: Use equals() instead of \'==\' for String comparisons 

* commit 'b162e74a':
  TIF: Use equals() instead of '==' for String comparisons
parents 58a68b29 b162e74a

media/java/android/media/tv/TvInputManager.java

+6 −3
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ import android.os.Looper; 
import android.os.Message;

import android.os.ParcelFileDescriptor;

import android.os.RemoteException;

import android.text.TextUtils;

import android.util.ArrayMap;

import android.util.Log;

import android.util.Pools.Pool;
@@ -1652,14 +1653,16 @@ public final class TvInputManager { 
         */

        boolean updateTrackSelection(int type, String trackId) {

            synchronized (mMetadataLock) {

                if (type == TvTrackInfo.TYPE_AUDIO && trackId != mSelectedAudioTrackId) {

                if (type == TvTrackInfo.TYPE_AUDIO

                        && !TextUtils.equals(trackId, mSelectedAudioTrackId)) {

                    mSelectedAudioTrackId = trackId;

                    return true;

                } else if (type == TvTrackInfo.TYPE_VIDEO && trackId != mSelectedVideoTrackId) {

                } else if (type == TvTrackInfo.TYPE_VIDEO

                        && !TextUtils.equals(trackId, mSelectedVideoTrackId)) {

                    mSelectedVideoTrackId = trackId;

                    return true;

                } else if (type == TvTrackInfo.TYPE_SUBTITLE

                        && trackId != mSelectedSubtitleTrackId) {

                        && !TextUtils.equals(trackId, mSelectedSubtitleTrackId)) {

                    mSelectedSubtitleTrackId = trackId;

                    return true;

                }