TIF: Use equals() instead of '==' for String comparisons
Change-Id: Iea6e3d5f5146e2e3a37c52db5a0a9706540ddb23
This commit is contained in:
@@ -29,6 +29,7 @@ import android.os.Looper;
|
|||||||
import android.os.Message;
|
import android.os.Message;
|
||||||
import android.os.ParcelFileDescriptor;
|
import android.os.ParcelFileDescriptor;
|
||||||
import android.os.RemoteException;
|
import android.os.RemoteException;
|
||||||
|
import android.text.TextUtils;
|
||||||
import android.util.ArrayMap;
|
import android.util.ArrayMap;
|
||||||
import android.util.Log;
|
import android.util.Log;
|
||||||
import android.util.Pools.Pool;
|
import android.util.Pools.Pool;
|
||||||
@@ -1652,14 +1653,16 @@ public final class TvInputManager {
|
|||||||
*/
|
*/
|
||||||
boolean updateTrackSelection(int type, String trackId) {
|
boolean updateTrackSelection(int type, String trackId) {
|
||||||
synchronized (mMetadataLock) {
|
synchronized (mMetadataLock) {
|
||||||
if (type == TvTrackInfo.TYPE_AUDIO && trackId != mSelectedAudioTrackId) {
|
if (type == TvTrackInfo.TYPE_AUDIO
|
||||||
|
&& !TextUtils.equals(trackId, mSelectedAudioTrackId)) {
|
||||||
mSelectedAudioTrackId = trackId;
|
mSelectedAudioTrackId = trackId;
|
||||||
return true;
|
return true;
|
||||||
} else if (type == TvTrackInfo.TYPE_VIDEO && trackId != mSelectedVideoTrackId) {
|
} else if (type == TvTrackInfo.TYPE_VIDEO
|
||||||
|
&& !TextUtils.equals(trackId, mSelectedVideoTrackId)) {
|
||||||
mSelectedVideoTrackId = trackId;
|
mSelectedVideoTrackId = trackId;
|
||||||
return true;
|
return true;
|
||||||
} else if (type == TvTrackInfo.TYPE_SUBTITLE
|
} else if (type == TvTrackInfo.TYPE_SUBTITLE
|
||||||
&& trackId != mSelectedSubtitleTrackId) {
|
&& !TextUtils.equals(trackId, mSelectedSubtitleTrackId)) {
|
||||||
mSelectedSubtitleTrackId = trackId;
|
mSelectedSubtitleTrackId = trackId;
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user