Use new import ordering.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=128967776

demo/src/main/java/com/google/android/exoplayer2/demo/EventLogger.java

@@ -15,6 +15,8 @@
  */
 package com.google.android.exoplayer2.demo;
 
+import android.os.SystemClock;
+import android.util.Log;
 import com.google.android.exoplayer2.ExoPlaybackException;
 import com.google.android.exoplayer2.ExoPlayer;
 import com.google.android.exoplayer2.Format;
@@ -38,10 +40,6 @@ import com.google.android.exoplayer2.trackselection.MappingTrackSelector;
 import com.google.android.exoplayer2.trackselection.MappingTrackSelector.TrackInfo;
 import com.google.android.exoplayer2.trackselection.TrackSelection;
 import com.google.android.exoplayer2.upstream.DataSpec;
-
-import android.os.SystemClock;
-import android.util.Log;
-
 import java.io.IOException;
 import java.text.NumberFormat;
 import java.util.List;

demo/src/main/java/com/google/android/exoplayer2/demo/PlayerActivity.java

@@ -15,6 +15,26 @@
  */
 package com.google.android.exoplayer2.demo;
 
+import android.app.Activity;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.Handler;
+import android.text.TextUtils;
+import android.view.KeyEvent;
+import android.view.MotionEvent;
+import android.view.Surface;
+import android.view.SurfaceView;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.View.OnKeyListener;
+import android.view.View.OnTouchListener;
+import android.widget.Button;
+import android.widget.LinearLayout;
+import android.widget.MediaController;
+import android.widget.TextView;
+import android.widget.Toast;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.DefaultLoadControl;
 import com.google.android.exoplayer2.ExoPlaybackException;
@@ -54,28 +74,6 @@ import com.google.android.exoplayer2.upstream.DefaultDataSourceFactory;
 import com.google.android.exoplayer2.upstream.DefaultHttpDataSource;
 import com.google.android.exoplayer2.upstream.HttpDataSource;
 import com.google.android.exoplayer2.util.Util;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.net.Uri;
-import android.os.Bundle;
-import android.os.Handler;
-import android.text.TextUtils;
-import android.view.KeyEvent;
-import android.view.MotionEvent;
-import android.view.Surface;
-import android.view.SurfaceView;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.view.View.OnKeyListener;
-import android.view.View.OnTouchListener;
-import android.widget.Button;
-import android.widget.LinearLayout;
-import android.widget.MediaController;
-import android.widget.TextView;
-import android.widget.Toast;
-
 import java.net.CookieHandler;
 import java.net.CookieManager;
 import java.net.CookiePolicy;

demo/src/main/java/com/google/android/exoplayer2/demo/SampleChooserActivity.java

@@ -15,15 +15,6 @@
  */
 package com.google.android.exoplayer2.demo;
 
-import com.google.android.exoplayer2.C;
-import com.google.android.exoplayer2.ParserException;
-import com.google.android.exoplayer2.upstream.DataSource;
-import com.google.android.exoplayer2.upstream.DataSourceInputStream;
-import com.google.android.exoplayer2.upstream.DataSpec;
-import com.google.android.exoplayer2.upstream.DefaultDataSource;
-import com.google.android.exoplayer2.util.Assertions;
-import com.google.android.exoplayer2.util.Util;
-
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
@@ -40,7 +31,14 @@ import android.widget.ExpandableListView;
 import android.widget.ExpandableListView.OnChildClickListener;
 import android.widget.TextView;
 import android.widget.Toast;
-
+import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.ParserException;
+import com.google.android.exoplayer2.upstream.DataSource;
+import com.google.android.exoplayer2.upstream.DataSourceInputStream;
+import com.google.android.exoplayer2.upstream.DataSpec;
+import com.google.android.exoplayer2.upstream.DefaultDataSource;
+import com.google.android.exoplayer2.util.Assertions;
+import com.google.android.exoplayer2.util.Util;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;

demo/src/main/java/com/google/android/exoplayer2/demo/TrackSelectionHelper.java

@@ -15,17 +15,6 @@
  */
 package com.google.android.exoplayer2.demo;
 
-import com.google.android.exoplayer2.Format;
-import com.google.android.exoplayer2.RendererCapabilities;
-import com.google.android.exoplayer2.source.TrackGroup;
-import com.google.android.exoplayer2.source.TrackGroupArray;
-import com.google.android.exoplayer2.trackselection.FixedTrackSelection;
-import com.google.android.exoplayer2.trackselection.MappingTrackSelector;
-import com.google.android.exoplayer2.trackselection.MappingTrackSelector.TrackInfo;
-import com.google.android.exoplayer2.trackselection.RandomTrackSelection;
-import com.google.android.exoplayer2.trackselection.TrackSelection;
-import com.google.android.exoplayer2.util.MimeTypes;
-
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.AlertDialog;
@@ -36,7 +25,16 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.CheckedTextView;
-
+import com.google.android.exoplayer2.Format;
+import com.google.android.exoplayer2.RendererCapabilities;
+import com.google.android.exoplayer2.source.TrackGroup;
+import com.google.android.exoplayer2.source.TrackGroupArray;
+import com.google.android.exoplayer2.trackselection.FixedTrackSelection;
+import com.google.android.exoplayer2.trackselection.MappingTrackSelector;
+import com.google.android.exoplayer2.trackselection.MappingTrackSelector.TrackInfo;
+import com.google.android.exoplayer2.trackselection.RandomTrackSelection;
+import com.google.android.exoplayer2.trackselection.TrackSelection;
+import com.google.android.exoplayer2.util.MimeTypes;
 import java.util.Arrays;
 import java.util.Locale;
 

extensions/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegAudioRenderer.java

@@ -15,6 +15,7 @@
  */
 package com.google.android.exoplayer2.ext.ffmpeg;
 
+import android.os.Handler;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.audio.AudioCapabilities;
@@ -23,8 +24,6 @@ import com.google.android.exoplayer2.audio.AudioTrack;
 import com.google.android.exoplayer2.audio.SimpleDecoderAudioRenderer;
 import com.google.android.exoplayer2.util.MimeTypes;
 
-import android.os.Handler;
-
 /**
  * Decodes and renders audio using FFmpeg.
  */

extensions/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegDecoder.java

@@ -19,7 +19,6 @@ import com.google.android.exoplayer2.decoder.DecoderInputBuffer;
 import com.google.android.exoplayer2.decoder.SimpleDecoder;
 import com.google.android.exoplayer2.decoder.SimpleOutputBuffer;
 import com.google.android.exoplayer2.util.MimeTypes;
-
 import java.nio.ByteBuffer;
 import java.util.List;
 

extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacExtractorTest.java

@@ -15,11 +15,10 @@
  */
 package com.google.android.exoplayer2.ext.flac;
 
+import android.test.InstrumentationTestCase;
 import com.google.android.exoplayer2.extractor.Extractor;
 import com.google.android.exoplayer2.testutil.TestUtil;
 
-import android.test.InstrumentationTestCase;
-
 /**
  * Unit test for {@link FlacExtractor}.
  */

extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacPlaybackTest.java

@@ -15,6 +15,10 @@
  */
 package com.google.android.exoplayer2.ext.flac;
 
+import android.content.Context;
+import android.net.Uri;
+import android.os.Looper;
+import android.test.InstrumentationTestCase;
 import com.google.android.exoplayer2.ExoPlaybackException;
 import com.google.android.exoplayer2.ExoPlayer;
 import com.google.android.exoplayer2.ExoPlayerFactory;
@@ -25,11 +29,6 @@ import com.google.android.exoplayer2.source.Timeline;
 import com.google.android.exoplayer2.trackselection.DefaultTrackSelector;
 import com.google.android.exoplayer2.upstream.DefaultDataSourceFactory;
 
-import android.content.Context;
-import android.net.Uri;
-import android.os.Looper;
-import android.test.InstrumentationTestCase;
-
 /**
  * Playback tests using {@link LibflacAudioRenderer}.
  */

extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/FlacDecoder.java

@@ -19,7 +19,6 @@ import com.google.android.exoplayer2.decoder.DecoderInputBuffer;
 import com.google.android.exoplayer2.decoder.SimpleDecoder;
 import com.google.android.exoplayer2.decoder.SimpleOutputBuffer;
 import com.google.android.exoplayer2.util.FlacStreamInfo;
-
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.util.List;

extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/FlacExtractor.java

@@ -27,7 +27,6 @@ import com.google.android.exoplayer2.extractor.TrackOutput;
 import com.google.android.exoplayer2.util.FlacStreamInfo;
 import com.google.android.exoplayer2.util.MimeTypes;
 import com.google.android.exoplayer2.util.ParsableByteArray;
-
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.util.Arrays;

extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/FlacJni.java

@@ -18,7 +18,6 @@ package com.google.android.exoplayer2.ext.flac;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.extractor.ExtractorInput;
 import com.google.android.exoplayer2.util.FlacStreamInfo;
-
 import java.io.IOException;
 import java.nio.ByteBuffer;
 

extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/LibflacAudioRenderer.java

@@ -15,6 +15,7 @@
  */
 package com.google.android.exoplayer2.ext.flac;
 
+import android.os.Handler;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.audio.AudioCapabilities;
 import com.google.android.exoplayer2.audio.AudioRendererEventListener;
@@ -22,8 +23,6 @@ import com.google.android.exoplayer2.audio.AudioTrack;
 import com.google.android.exoplayer2.audio.SimpleDecoderAudioRenderer;
 import com.google.android.exoplayer2.util.MimeTypes;
 
-import android.os.Handler;
-
 /**
  * Decodes and renders audio using the native Flac decoder.
  */

extensions/okhttp/src/main/java/com/google/android/exoplayer2/ext/okhttp/DefaultOkHttpDataSourceFactory.java

@@ -15,12 +15,11 @@
  */
 package com.google.android.exoplayer2.ext.okhttp;
 
+import android.content.Context;
 import com.google.android.exoplayer2.upstream.DataSource;
 import com.google.android.exoplayer2.upstream.DataSource.Factory;
 import com.google.android.exoplayer2.upstream.DefaultDataSource;
 import com.google.android.exoplayer2.upstream.TransferListener;
-
-import android.content.Context;
 import okhttp3.CacheControl;
 import okhttp3.OkHttpClient;
 

extensions/okhttp/src/main/java/com/google/android/exoplayer2/ext/okhttp/OkHttpDataSource.java

@@ -15,23 +15,13 @@
  */
 package com.google.android.exoplayer2.ext.okhttp;
 
+import android.net.Uri;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.upstream.DataSpec;
 import com.google.android.exoplayer2.upstream.HttpDataSource;
 import com.google.android.exoplayer2.upstream.TransferListener;
 import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.Predicate;
-
-import android.net.Uri;
-
-import okhttp3.CacheControl;
-import okhttp3.HttpUrl;
-import okhttp3.MediaType;
-import okhttp3.OkHttpClient;
-import okhttp3.Request;
-import okhttp3.RequestBody;
-import okhttp3.Response;
-
 import java.io.EOFException;
 import java.io.IOException;
 import java.io.InputStream;
@@ -40,6 +30,13 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicReference;
+import okhttp3.CacheControl;
+import okhttp3.HttpUrl;
+import okhttp3.MediaType;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.RequestBody;
+import okhttp3.Response;
 
 /**
  * An {@link HttpDataSource} that delegates to Square's {@link OkHttpClient}.

extensions/opus/src/androidTest/java/com/google/android/exoplayer2/ext/opus/OpusPlaybackTest.java

@@ -15,6 +15,10 @@
  */
 package com.google.android.exoplayer2.ext.opus;
 
+import android.content.Context;
+import android.net.Uri;
+import android.os.Looper;
+import android.test.InstrumentationTestCase;
 import com.google.android.exoplayer2.ExoPlaybackException;
 import com.google.android.exoplayer2.ExoPlayer;
 import com.google.android.exoplayer2.ExoPlayerFactory;
@@ -25,11 +29,6 @@ import com.google.android.exoplayer2.source.Timeline;
 import com.google.android.exoplayer2.trackselection.DefaultTrackSelector;
 import com.google.android.exoplayer2.upstream.DefaultDataSourceFactory;
 
-import android.content.Context;
-import android.net.Uri;
-import android.os.Looper;
-import android.test.InstrumentationTestCase;
-
 /**
  * Playback tests using {@link LibopusAudioRenderer}.
  */

extensions/opus/src/main/java/com/google/android/exoplayer2/ext/opus/LibopusAudioRenderer.java

@@ -15,6 +15,7 @@
  */
 package com.google.android.exoplayer2.ext.opus;
 
+import android.os.Handler;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.audio.AudioCapabilities;
 import com.google.android.exoplayer2.audio.AudioRendererEventListener;
@@ -22,8 +23,6 @@ import com.google.android.exoplayer2.audio.AudioTrack;
 import com.google.android.exoplayer2.audio.SimpleDecoderAudioRenderer;
 import com.google.android.exoplayer2.util.MimeTypes;
 
-import android.os.Handler;
-
 /**
  * Decodes and renders audio using the native Opus decoder.
  */

extensions/opus/src/main/java/com/google/android/exoplayer2/ext/opus/OpusDecoder.java

@@ -19,7 +19,6 @@ import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.decoder.DecoderInputBuffer;
 import com.google.android.exoplayer2.decoder.SimpleDecoder;
 import com.google.android.exoplayer2.decoder.SimpleOutputBuffer;
-
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.util.List;

extensions/vp9/src/androidTest/java/com/google/android/exoplayer2/ext/vp9/VpxPlaybackTest.java

@@ -15,6 +15,10 @@
  */
 package com.google.android.exoplayer2.ext.vp9;
 
+import android.content.Context;
+import android.net.Uri;
+import android.os.Looper;
+import android.test.InstrumentationTestCase;
 import com.google.android.exoplayer2.ExoPlaybackException;
 import com.google.android.exoplayer2.ExoPlayer;
 import com.google.android.exoplayer2.ExoPlayerFactory;
@@ -25,11 +29,6 @@ import com.google.android.exoplayer2.source.Timeline;
 import com.google.android.exoplayer2.trackselection.DefaultTrackSelector;
 import com.google.android.exoplayer2.upstream.DefaultDataSourceFactory;
 
-import android.content.Context;
-import android.net.Uri;
-import android.os.Looper;
-import android.test.InstrumentationTestCase;
-
 /**
  * Playback tests using {@link LibvpxVideoRenderer}.
  */

extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/LibvpxVideoRenderer.java

@@ -15,6 +15,11 @@
  */
 package com.google.android.exoplayer2.ext.vp9;
 
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
+import android.os.Handler;
+import android.os.SystemClock;
+import android.view.Surface;
 import com.google.android.exoplayer2.BaseRenderer;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.ExoPlaybackException;
@@ -28,12 +33,6 @@ import com.google.android.exoplayer2.util.TraceUtil;
 import com.google.android.exoplayer2.video.VideoRendererEventListener;
 import com.google.android.exoplayer2.video.VideoRendererEventListener.EventDispatcher;
 
-import android.graphics.Bitmap;
-import android.graphics.Canvas;
-import android.os.Handler;
-import android.os.SystemClock;
-import android.view.Surface;
-
 /**
  * Decodes and renders video using the native VP9 decoder.
  */

extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxDecoder.java

@@ -18,7 +18,6 @@ package com.google.android.exoplayer2.ext.vp9;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.decoder.DecoderInputBuffer;
 import com.google.android.exoplayer2.decoder.SimpleDecoder;
-
 import java.nio.ByteBuffer;
 
 /**

extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxOutputBuffer.java

@@ -16,7 +16,6 @@
 package com.google.android.exoplayer2.ext.vp9;
 
 import com.google.android.exoplayer2.decoder.OutputBuffer;
-
 import java.nio.ByteBuffer;
 
 /**

extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxRenderer.java

@@ -17,12 +17,10 @@ package com.google.android.exoplayer2.ext.vp9;
 
 import android.opengl.GLES20;
 import android.opengl.GLSurfaceView;
-
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.nio.FloatBuffer;
 import java.util.concurrent.atomic.AtomicReference;
-
 import javax.microedition.khronos.egl.EGLConfig;
 import javax.microedition.khronos.opengles.GL10;
 

library/src/androidTest/java/com/google/android/exoplayer2/CTest.java

@@ -17,7 +17,6 @@ package com.google.android.exoplayer2;
 
 import android.annotation.SuppressLint;
 import android.media.MediaCodec;
-
 import junit.framework.TestCase;
 
 /**

library/src/androidTest/java/com/google/android/exoplayer2/FormatTest.java

@@ -19,23 +19,20 @@ import static com.google.android.exoplayer2.C.WIDEVINE_UUID;
 import static com.google.android.exoplayer2.util.MimeTypes.VIDEO_MP4;
 import static com.google.android.exoplayer2.util.MimeTypes.VIDEO_WEBM;
 
-import com.google.android.exoplayer2.drm.DrmInitData;
-import com.google.android.exoplayer2.testutil.TestUtil;
-import com.google.android.exoplayer2.util.MimeTypes;
-import com.google.android.exoplayer2.util.Util;
-
 import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
 import android.media.MediaFormat;
 import android.os.Parcel;
-
-import junit.framework.TestCase;
-
+import com.google.android.exoplayer2.drm.DrmInitData;
+import com.google.android.exoplayer2.testutil.TestUtil;
+import com.google.android.exoplayer2.util.MimeTypes;
+import com.google.android.exoplayer2.util.Util;
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+import junit.framework.TestCase;
 
 /**
  * Unit test for {@link Format}.

library/src/androidTest/java/com/google/android/exoplayer2/drm/DrmInitDataTest.java

@@ -19,13 +19,11 @@ import static com.google.android.exoplayer2.C.PLAYREADY_UUID;
 import static com.google.android.exoplayer2.C.WIDEVINE_UUID;
 import static com.google.android.exoplayer2.util.MimeTypes.VIDEO_MP4;
 
+import android.os.Parcel;
+import android.test.MoreAsserts;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.drm.DrmInitData.SchemeData;
 import com.google.android.exoplayer2.testutil.TestUtil;
-
-import android.os.Parcel;
-import android.test.MoreAsserts;
-
 import junit.framework.TestCase;
 
 /**

library/src/androidTest/java/com/google/android/exoplayer2/extractor/DefaultExtractorInputTest.java

@@ -15,17 +15,14 @@
  */
 package com.google.android.exoplayer2.extractor;
 
+import android.net.Uri;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.testutil.FakeDataSource;
 import com.google.android.exoplayer2.upstream.DataSpec;
-
-import android.net.Uri;
-
-import junit.framework.TestCase;
-
 import java.io.EOFException;
 import java.io.IOException;
 import java.util.Arrays;
+import junit.framework.TestCase;
 
 /**
  * Test for {@link DefaultExtractorInput}.

library/src/androidTest/java/com/google/android/exoplayer2/extractor/ExtractorTest.java

@@ -16,7 +16,6 @@
 package com.google.android.exoplayer2.extractor;
 
 import com.google.android.exoplayer2.C;
-
 import junit.framework.TestCase;
 
 /**

library/src/androidTest/java/com/google/android/exoplayer2/extractor/flv/FlvExtractorTest.java

@@ -15,11 +15,10 @@
  */
 package com.google.android.exoplayer2.extractor.flv;
 
+import android.test.InstrumentationTestCase;
 import com.google.android.exoplayer2.extractor.Extractor;
 import com.google.android.exoplayer2.testutil.TestUtil;
 
-import android.test.InstrumentationTestCase;
-
 /**
  * Unit test for {@link FlvExtractor}.
  */

library/src/androidTest/java/com/google/android/exoplayer2/extractor/mkv/DefaultEbmlReaderTest.java

@@ -18,13 +18,11 @@ package com.google.android.exoplayer2.extractor.mkv;
 import com.google.android.exoplayer2.extractor.ExtractorInput;
 import com.google.android.exoplayer2.testutil.FakeExtractorInput;
 import com.google.android.exoplayer2.testutil.TestUtil;
-
-import junit.framework.TestCase;
-
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import junit.framework.TestCase;
 
 /**
  * Tests {@link DefaultEbmlReader}.

library/src/androidTest/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractorTest.java

@@ -15,11 +15,10 @@
  */
 package com.google.android.exoplayer2.extractor.mkv;
 
+import android.test.InstrumentationTestCase;
 import com.google.android.exoplayer2.extractor.Extractor;
 import com.google.android.exoplayer2.testutil.TestUtil;
 
-import android.test.InstrumentationTestCase;
-
 /**
  * Tests for {@link MatroskaExtractor}.
  */

library/src/androidTest/java/com/google/android/exoplayer2/extractor/mkv/VarintReaderTest.java

@@ -19,11 +19,9 @@ import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.extractor.ExtractorInput;
 import com.google.android.exoplayer2.testutil.FakeExtractorInput;
 import com.google.android.exoplayer2.testutil.FakeExtractorInput.SimulatedIOException;
-
-import junit.framework.TestCase;
-
 import java.io.EOFException;
 import java.io.IOException;
+import junit.framework.TestCase;
 
 /**
  * Tests for {@link VarintReader}.

library/src/androidTest/java/com/google/android/exoplayer2/extractor/mp3/Mp3ExtractorTest.java

@@ -15,11 +15,10 @@
  */
 package com.google.android.exoplayer2.extractor.mp3;
 
+import android.test.InstrumentationTestCase;
 import com.google.android.exoplayer2.extractor.Extractor;
 import com.google.android.exoplayer2.testutil.TestUtil;
 
-import android.test.InstrumentationTestCase;
-
 /**
  * Unit test for {@link Mp3Extractor}.
  */

library/src/androidTest/java/com/google/android/exoplayer2/extractor/mp3/XingSeekerTest.java

@@ -15,13 +15,12 @@
  */
 package com.google.android.exoplayer2.extractor.mp3;
 
+import android.test.InstrumentationTestCase;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.extractor.MpegAudioHeader;
 import com.google.android.exoplayer2.util.ParsableByteArray;
 import com.google.android.exoplayer2.util.Util;
 
-import android.test.InstrumentationTestCase;
-
 /**
  * Tests for {@link XingSeeker}.
  */

library/src/androidTest/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4ExtractorTest.java

@@ -15,11 +15,10 @@
  */
 package com.google.android.exoplayer2.extractor.mp4;
 
+import android.test.InstrumentationTestCase;
 import com.google.android.exoplayer2.extractor.Extractor;
 import com.google.android.exoplayer2.testutil.TestUtil;
 
-import android.test.InstrumentationTestCase;
-
 /**
  * Unit test for {@link FragmentedMp4Extractor}.
  */

library/src/androidTest/java/com/google/android/exoplayer2/extractor/mp4/Mp4ExtractorTest.java

@@ -15,11 +15,10 @@
  */
 package com.google.android.exoplayer2.extractor.mp4;
 
-import com.google.android.exoplayer2.extractor.Extractor;
-import com.google.android.exoplayer2.testutil.TestUtil;
-
 import android.annotation.TargetApi;
 import android.test.InstrumentationTestCase;
+import com.google.android.exoplayer2.extractor.Extractor;
+import com.google.android.exoplayer2.testutil.TestUtil;
 
 /**
  * Tests for {@link Mp4Extractor}.

library/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/DefaultOggSeekerTest.java

@@ -18,11 +18,9 @@ package com.google.android.exoplayer2.extractor.ogg;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.testutil.FakeExtractorInput;
 import com.google.android.exoplayer2.util.ParsableByteArray;
-
-import junit.framework.TestCase;
-
 import java.io.IOException;
 import java.util.Random;
+import junit.framework.TestCase;
 
 /**
  * Unit test for {@link DefaultOggSeeker}.

library/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/DefaultOggSeekerUtilMethodsTest.java

@@ -18,12 +18,10 @@ package com.google.android.exoplayer2.extractor.ogg;
 import com.google.android.exoplayer2.extractor.ExtractorInput;
 import com.google.android.exoplayer2.testutil.FakeExtractorInput;
 import com.google.android.exoplayer2.testutil.TestUtil;
-
-import junit.framework.TestCase;
-
 import java.io.EOFException;
 import java.io.IOException;
 import java.util.Random;
+import junit.framework.TestCase;
 
 /**
  * Unit test for {@link DefaultOggSeeker} utility methods.

library/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/OggExtractorTest.java

@@ -15,13 +15,11 @@
  */
 package com.google.android.exoplayer2.extractor.ogg;
 
+import android.test.InstrumentationTestCase;
 import com.google.android.exoplayer2.extractor.Extractor;
 import com.google.android.exoplayer2.testutil.FakeExtractorInput;
 import com.google.android.exoplayer2.testutil.TestUtil;
 import com.google.android.exoplayer2.testutil.TestUtil.ExtractorFactory;
-
-import android.test.InstrumentationTestCase;
-
 import java.io.IOException;
 
 /**

library/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/OggPacketTest.java

@@ -15,13 +15,11 @@
  */
 package com.google.android.exoplayer2.extractor.ogg;
 
+import android.test.InstrumentationTestCase;
+import android.test.MoreAsserts;
 import com.google.android.exoplayer2.testutil.FakeExtractorInput;
 import com.google.android.exoplayer2.testutil.TestUtil;
 import com.google.android.exoplayer2.util.ParsableByteArray;
-
-import android.test.InstrumentationTestCase;
-import android.test.MoreAsserts;
-
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.Random;

library/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/OggPageHeaderTest.java

@@ -18,10 +18,8 @@ package com.google.android.exoplayer2.extractor.ogg;
 import com.google.android.exoplayer2.testutil.FakeExtractorInput;
 import com.google.android.exoplayer2.testutil.FakeExtractorInput.SimulatedIOException;
 import com.google.android.exoplayer2.testutil.TestUtil;
-
-import junit.framework.TestCase;
-
 import java.io.IOException;
+import junit.framework.TestCase;
 
 /**
  * Unit test for {@link OggPageHeader}.

library/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/OggTestFile.java

@@ -16,11 +16,9 @@
 package com.google.android.exoplayer2.extractor.ogg;
 
 import com.google.android.exoplayer2.testutil.TestUtil;
-
-import junit.framework.Assert;
-
 import java.util.ArrayList;
 import java.util.Random;
+import junit.framework.Assert;
 
 /**
  * Generates test data.

library/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/VorbisBitArrayTest.java

@@ -16,7 +16,6 @@
 package com.google.android.exoplayer2.extractor.ogg;
 
 import com.google.android.exoplayer2.testutil.TestUtil;
-
 import junit.framework.TestCase;
 
 /**

library/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/VorbisReaderTest.java

@@ -20,10 +20,8 @@ import com.google.android.exoplayer2.extractor.ogg.VorbisReader.VorbisSetup;
 import com.google.android.exoplayer2.testutil.FakeExtractorInput;
 import com.google.android.exoplayer2.testutil.FakeExtractorInput.SimulatedIOException;
 import com.google.android.exoplayer2.util.ParsableByteArray;
-
-import junit.framework.TestCase;
-
 import java.io.IOException;
+import junit.framework.TestCase;
 
 /**
  * Unit test for {@link VorbisReader}.

library/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/VorbisUtilTest.java

@@ -17,7 +17,6 @@ package com.google.android.exoplayer2.extractor.ogg;
 
 import com.google.android.exoplayer2.ParserException;
 import com.google.android.exoplayer2.util.ParsableByteArray;
-
 import junit.framework.TestCase;
 
 /**

library/src/androidTest/java/com/google/android/exoplayer2/extractor/ts/AdtsExtractorTest.java

@@ -15,11 +15,10 @@
  */
 package com.google.android.exoplayer2.extractor.ts;
 
+import android.test.InstrumentationTestCase;
 import com.google.android.exoplayer2.extractor.Extractor;
 import com.google.android.exoplayer2.testutil.TestUtil;
 
-import android.test.InstrumentationTestCase;
-
 /**
  * Unit test for {@link AdtsExtractor}.
  */

library/src/androidTest/java/com/google/android/exoplayer2/extractor/ts/AdtsReaderTest.java

@@ -19,10 +19,8 @@ import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.testutil.FakeTrackOutput;
 import com.google.android.exoplayer2.testutil.TestUtil;
 import com.google.android.exoplayer2.util.ParsableByteArray;
-
-import junit.framework.TestCase;
-
 import java.util.Arrays;
+import junit.framework.TestCase;
 
 /**
  * Test for {@link AdtsReader}.

library/src/androidTest/java/com/google/android/exoplayer2/extractor/ts/PsExtractorTest.java

@@ -15,11 +15,10 @@
  */
 package com.google.android.exoplayer2.extractor.ts;
 
+import android.test.InstrumentationTestCase;
 import com.google.android.exoplayer2.extractor.Extractor;
 import com.google.android.exoplayer2.testutil.TestUtil;
 
-import android.test.InstrumentationTestCase;
-
 /**
  * Unit test for {@link PsExtractor}.
  */

library/src/androidTest/java/com/google/android/exoplayer2/extractor/ts/TsExtractorTest.java

@@ -15,11 +15,9 @@
  */
 package com.google.android.exoplayer2.extractor.ts;
 
+import android.test.InstrumentationTestCase;
 import com.google.android.exoplayer2.extractor.Extractor;
 import com.google.android.exoplayer2.testutil.TestUtil;
-
-import android.test.InstrumentationTestCase;
-
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.util.Random;

library/src/androidTest/java/com/google/android/exoplayer2/extractor/wav/WavExtractorTest.java

@@ -15,11 +15,10 @@
  */
 package com.google.android.exoplayer2.extractor.wav;
 
+import android.test.InstrumentationTestCase;
 import com.google.android.exoplayer2.extractor.Extractor;
 import com.google.android.exoplayer2.testutil.TestUtil;
 
-import android.test.InstrumentationTestCase;
-
 /**
  * Unit test for {@link WavExtractor}.
  */

library/src/androidTest/java/com/google/android/exoplayer2/metadata/id3/Id3DecoderTest.java

@@ -15,13 +15,10 @@
  */
 package com.google.android.exoplayer2.metadata.id3;
 
-import com.google.android.exoplayer2.metadata.MetadataDecoderException;
-
 import android.test.MoreAsserts;
-
-import junit.framework.TestCase;
-
+import com.google.android.exoplayer2.metadata.MetadataDecoderException;
 import java.util.List;
+import junit.framework.TestCase;
 
 /**
  * Test for {@link Id3Decoder}

library/src/androidTest/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParserTest.java

@@ -15,11 +15,9 @@
  */
 package com.google.android.exoplayer2.source.dash.manifest;
 
-import com.google.android.exoplayer2.testutil.TestUtil;
-
 import android.net.Uri;
 import android.test.InstrumentationTestCase;
-
+import com.google.android.exoplayer2.testutil.TestUtil;
 import java.io.IOException;
 
 /**

library/src/androidTest/java/com/google/android/exoplayer2/source/dash/manifest/RepresentationTest.java

@@ -18,7 +18,6 @@ package com.google.android.exoplayer2.source.dash.manifest;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.source.dash.manifest.SegmentBase.SingleSegmentBase;
 import com.google.android.exoplayer2.util.MimeTypes;
-
 import junit.framework.TestCase;
 
 /**

library/src/androidTest/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylistParserTest.java

@@ -15,16 +15,13 @@
  */
 package com.google.android.exoplayer2.source.hls.playlist;
 
-import com.google.android.exoplayer2.C;
-
 import android.net.Uri;
-
-import junit.framework.TestCase;
-
+import com.google.android.exoplayer2.C;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.nio.charset.Charset;
 import java.util.List;
+import junit.framework.TestCase;
 
 /**
  * Test for {@link HlsMasterPlaylistParserTest}

library/src/androidTest/java/com/google/android/exoplayer2/source/hls/playlist/HlsMediaPlaylistParserTest.java

@@ -15,18 +15,15 @@
  */
 package com.google.android.exoplayer2.source.hls.playlist;
 
-import com.google.android.exoplayer2.C;
-
 import android.net.Uri;
-
-import junit.framework.TestCase;
-
+import com.google.android.exoplayer2.C;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.Charset;
 import java.util.List;
 import java.util.Locale;
+import junit.framework.TestCase;
 
 /**
  * Test for {@link HlsMediaPlaylistParserTest}

library/src/androidTest/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsManifestParserTest.java

@@ -15,11 +15,9 @@
  */
 package com.google.android.exoplayer2.source.smoothstreaming.manifest;
 
-import com.google.android.exoplayer2.testutil.TestUtil;
-
 import android.net.Uri;
 import android.test.InstrumentationTestCase;
-
+import com.google.android.exoplayer2.testutil.TestUtil;
 import java.io.IOException;
 
 /**

library/src/androidTest/java/com/google/android/exoplayer2/text/subrip/SubripDecoderTest.java

@@ -15,10 +15,8 @@
  */
 package com.google.android.exoplayer2.text.subrip;
 
-import com.google.android.exoplayer2.testutil.TestUtil;
-
 import android.test.InstrumentationTestCase;
-
+import com.google.android.exoplayer2.testutil.TestUtil;
 import java.io.IOException;
 
 /**

library/src/androidTest/java/com/google/android/exoplayer2/text/ttml/TtmlDecoderTest.java

@@ -15,11 +15,6 @@
  */
 package com.google.android.exoplayer2.text.ttml;
 
-import com.google.android.exoplayer2.testutil.TestUtil;
-import com.google.android.exoplayer2.text.Cue;
-import com.google.android.exoplayer2.text.SubtitleDecoderException;
-import com.google.android.exoplayer2.util.ColorParser;
-
 import android.test.InstrumentationTestCase;
 import android.text.Layout;
 import android.text.Spannable;
@@ -33,7 +28,10 @@ import android.text.style.StrikethroughSpan;
 import android.text.style.StyleSpan;
 import android.text.style.TypefaceSpan;
 import android.text.style.UnderlineSpan;
-
+import com.google.android.exoplayer2.testutil.TestUtil;
+import com.google.android.exoplayer2.text.Cue;
+import com.google.android.exoplayer2.text.SubtitleDecoderException;
+import com.google.android.exoplayer2.util.ColorParser;
 import java.io.IOException;
 import java.util.List;
 import java.util.Map;

library/src/androidTest/java/com/google/android/exoplayer2/text/ttml/TtmlRenderUtilTest.java

@@ -17,7 +17,6 @@ package com.google.android.exoplayer2.text.ttml;
 
 import android.graphics.Color;
 import android.test.InstrumentationTestCase;
-
 import java.util.HashMap;
 import java.util.Map;
 

library/src/androidTest/java/com/google/android/exoplayer2/text/webvtt/CssParserTest.java

@@ -15,9 +15,8 @@
  */
 package com.google.android.exoplayer2.text.webvtt;
 
-import com.google.android.exoplayer2.util.ParsableByteArray;
-
 import android.test.InstrumentationTestCase;
+import com.google.android.exoplayer2.util.ParsableByteArray;
 
 /**
  * Unit test for {@link CssParser}.

library/src/androidTest/java/com/google/android/exoplayer2/text/webvtt/Mp4WebvttDecoderTest.java

@@ -18,10 +18,8 @@ package com.google.android.exoplayer2.text.webvtt;
 import com.google.android.exoplayer2.text.Cue;
 import com.google.android.exoplayer2.text.Subtitle;
 import com.google.android.exoplayer2.text.SubtitleDecoderException;
-
-import junit.framework.TestCase;
-
 import java.util.List;
+import junit.framework.TestCase;
 
 /**
  * Unit test for {@link Mp4WebvttDecoder}.

library/src/androidTest/java/com/google/android/exoplayer2/text/webvtt/WebvttCueParserTest.java

@@ -20,7 +20,6 @@ import android.test.InstrumentationTestCase;
 import android.text.Spanned;
 import android.text.style.StyleSpan;
 import android.text.style.UnderlineSpan;
-
 import java.util.Collections;
 
 /**

library/src/androidTest/java/com/google/android/exoplayer2/text/webvtt/WebvttDecoderTest.java

@@ -15,10 +15,6 @@
  */
 package com.google.android.exoplayer2.text.webvtt;
 
-import com.google.android.exoplayer2.testutil.TestUtil;
-import com.google.android.exoplayer2.text.Cue;
-import com.google.android.exoplayer2.text.SubtitleDecoderException;
-
 import android.graphics.Typeface;
 import android.test.InstrumentationTestCase;
 import android.text.Layout.Alignment;
@@ -28,7 +24,9 @@ import android.text.style.ForegroundColorSpan;
 import android.text.style.StyleSpan;
 import android.text.style.TypefaceSpan;
 import android.text.style.UnderlineSpan;
-
+import com.google.android.exoplayer2.testutil.TestUtil;
+import com.google.android.exoplayer2.text.Cue;
+import com.google.android.exoplayer2.text.SubtitleDecoderException;
 import java.io.IOException;
 import java.util.List;
 

library/src/androidTest/java/com/google/android/exoplayer2/text/webvtt/WebvttSubtitleTest.java

@@ -16,12 +16,10 @@
 package com.google.android.exoplayer2.text.webvtt;
 
 import com.google.android.exoplayer2.text.Cue;
-
-import junit.framework.TestCase;
-
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import junit.framework.TestCase;
 
 /**
  * Unit test for {@link WebvttSubtitle}.

library/src/androidTest/java/com/google/android/exoplayer2/upstream/ByteArrayDataSourceTest.java

@@ -16,10 +16,8 @@
 package com.google.android.exoplayer2.upstream;
 
 import com.google.android.exoplayer2.C;
-
-import junit.framework.TestCase;
-
 import java.io.IOException;
+import junit.framework.TestCase;
 
 /**
  * Unit tests for {@link ByteArrayDataSource}.

library/src/androidTest/java/com/google/android/exoplayer2/util/NalUnitUtilTest.java

@@ -17,10 +17,9 @@ package com.google.android.exoplayer2.util;
 
 import static com.google.android.exoplayer2.testutil.TestUtil.createByteArray;
 
-import junit.framework.TestCase;
-
 import java.nio.ByteBuffer;
 import java.util.Arrays;
+import junit.framework.TestCase;
 
 /**
  * Tests for {@link NalUnitUtil}.

library/src/androidTest/java/com/google/android/exoplayer2/util/ParsableByteArrayTest.java

@@ -15,11 +15,10 @@
  */
 package com.google.android.exoplayer2.util;
 
-import junit.framework.TestCase;
-
 import java.nio.ByteBuffer;
 import java.nio.charset.Charset;
 import java.util.Arrays;
+import junit.framework.TestCase;
 
 /**
  * Tests for {@link ParsableByteArray}.

library/src/androidTest/java/com/google/android/exoplayer2/util/UtilTest.java

@@ -15,11 +15,10 @@
  */
 package com.google.android.exoplayer2.util;
 
-import junit.framework.TestCase;
-
 import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.List;
+import junit.framework.TestCase;
 
 /**
  * Unit tests for {@link Util}.

library/src/main/java/com/google/android/exoplayer2/BaseRenderer.java

@@ -19,7 +19,6 @@ import com.google.android.exoplayer2.decoder.DecoderInputBuffer;
 import com.google.android.exoplayer2.source.SampleStream;
 import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.MediaClock;
-
 import java.io.IOException;
 
 /**

library/src/main/java/com/google/android/exoplayer2/C.java

@@ -15,12 +15,10 @@
  */
 package com.google.android.exoplayer2;
 
-import com.google.android.exoplayer2.util.Util;
-
 import android.media.AudioFormat;
 import android.media.MediaCodec;
 import android.view.Surface;
-
+import com.google.android.exoplayer2.util.Util;
 import java.util.UUID;
 
 /**

library/src/main/java/com/google/android/exoplayer2/ExoPlaybackException.java

@@ -17,7 +17,6 @@ package com.google.android.exoplayer2;
 
 import com.google.android.exoplayer2.source.MediaSource;
 import com.google.android.exoplayer2.util.Assertions;
-
 import java.io.IOException;
 
 /**

library/src/main/java/com/google/android/exoplayer2/ExoPlayerFactory.java

@@ -15,11 +15,10 @@
  */
 package com.google.android.exoplayer2;
 
-import com.google.android.exoplayer2.drm.DrmSessionManager;
-import com.google.android.exoplayer2.trackselection.TrackSelector;
-
 import android.content.Context;
 import android.os.Looper;
+import com.google.android.exoplayer2.drm.DrmSessionManager;
+import com.google.android.exoplayer2.trackselection.TrackSelector;
 
 /**
  * A factory for instantiating {@link ExoPlayer} instances.

library/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java

@@ -15,18 +15,16 @@
  */
 package com.google.android.exoplayer2;
 
-import com.google.android.exoplayer2.ExoPlayerImplInternal.PlaybackInfo;
-import com.google.android.exoplayer2.source.MediaSource;
-import com.google.android.exoplayer2.source.Timeline;
-import com.google.android.exoplayer2.trackselection.TrackSelector;
-import com.google.android.exoplayer2.util.Assertions;
-
 import android.annotation.SuppressLint;
 import android.os.Handler;
 import android.os.Looper;
 import android.os.Message;
 import android.util.Log;
-
+import com.google.android.exoplayer2.ExoPlayerImplInternal.PlaybackInfo;
+import com.google.android.exoplayer2.source.MediaSource;
+import com.google.android.exoplayer2.source.Timeline;
+import com.google.android.exoplayer2.trackselection.TrackSelector;
+import com.google.android.exoplayer2.util.Assertions;
 import java.util.concurrent.CopyOnWriteArraySet;
 
 /**

library/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java

@@ -15,6 +15,13 @@
  */
 package com.google.android.exoplayer2;
 
+import android.os.Handler;
+import android.os.HandlerThread;
+import android.os.Message;
+import android.os.Process;
+import android.os.SystemClock;
+import android.util.Log;
+import android.util.Pair;
 import com.google.android.exoplayer2.ExoPlayer.ExoPlayerMessage;
 import com.google.android.exoplayer2.source.MediaPeriod;
 import com.google.android.exoplayer2.source.MediaSource;
@@ -29,15 +36,6 @@ import com.google.android.exoplayer2.util.PriorityHandlerThread;
 import com.google.android.exoplayer2.util.StandaloneMediaClock;
 import com.google.android.exoplayer2.util.TraceUtil;
 import com.google.android.exoplayer2.util.Util;
-
-import android.os.Handler;
-import android.os.HandlerThread;
-import android.os.Message;
-import android.os.Process;
-import android.os.SystemClock;
-import android.util.Log;
-import android.util.Pair;
-
 import java.io.IOException;
 import java.util.ArrayList;
 

library/src/main/java/com/google/android/exoplayer2/Format.java

@@ -15,16 +15,14 @@
  */
 package com.google.android.exoplayer2;
 
-import com.google.android.exoplayer2.drm.DrmInitData;
-import com.google.android.exoplayer2.util.MimeTypes;
-import com.google.android.exoplayer2.util.Util;
-
 import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
 import android.media.MediaFormat;
 import android.os.Parcel;
 import android.os.Parcelable;
-
+import com.google.android.exoplayer2.drm.DrmInitData;
+import com.google.android.exoplayer2.util.MimeTypes;
+import com.google.android.exoplayer2.util.Util;
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.Arrays;

library/src/main/java/com/google/android/exoplayer2/Renderer.java

@@ -18,7 +18,6 @@ package com.google.android.exoplayer2;
 import com.google.android.exoplayer2.ExoPlayer.ExoPlayerComponent;
 import com.google.android.exoplayer2.source.SampleStream;
 import com.google.android.exoplayer2.util.MediaClock;
-
 import java.io.IOException;
 
 /**

library/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java

@@ -15,6 +15,15 @@
  */
 package com.google.android.exoplayer2;
 
+import android.annotation.TargetApi;
+import android.content.Context;
+import android.media.AudioManager;
+import android.media.MediaCodec;
+import android.media.PlaybackParams;
+import android.os.Handler;
+import android.util.Log;
+import android.view.Surface;
+import android.view.SurfaceHolder;
 import com.google.android.exoplayer2.audio.AudioCapabilities;
 import com.google.android.exoplayer2.audio.AudioRendererEventListener;
 import com.google.android.exoplayer2.audio.AudioTrack;
@@ -32,17 +41,6 @@ import com.google.android.exoplayer2.text.TextRenderer;
 import com.google.android.exoplayer2.trackselection.TrackSelector;
 import com.google.android.exoplayer2.video.MediaCodecVideoRenderer;
 import com.google.android.exoplayer2.video.VideoRendererEventListener;
-
-import android.annotation.TargetApi;
-import android.content.Context;
-import android.media.AudioManager;
-import android.media.MediaCodec;
-import android.media.PlaybackParams;
-import android.os.Handler;
-import android.util.Log;
-import android.view.Surface;
-import android.view.SurfaceHolder;
-
 import java.lang.reflect.Constructor;
 import java.util.ArrayList;
 import java.util.List;

library/src/main/java/com/google/android/exoplayer2/audio/Ac3Util.java

@@ -20,7 +20,6 @@ import com.google.android.exoplayer2.drm.DrmInitData;
 import com.google.android.exoplayer2.util.MimeTypes;
 import com.google.android.exoplayer2.util.ParsableBitArray;
 import com.google.android.exoplayer2.util.ParsableByteArray;
-
 import java.nio.ByteBuffer;
 
 /**

library/src/main/java/com/google/android/exoplayer2/audio/AudioCapabilities.java

@@ -22,7 +22,6 @@ import android.content.Intent;
 import android.content.IntentFilter;
 import android.media.AudioFormat;
 import android.media.AudioManager;
-
 import java.util.Arrays;
 
 /**

library/src/main/java/com/google/android/exoplayer2/audio/AudioCapabilitiesReceiver.java

@@ -15,14 +15,13 @@
  */
 package com.google.android.exoplayer2.audio;
 
-import com.google.android.exoplayer2.util.Assertions;
-import com.google.android.exoplayer2.util.Util;
-
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.media.AudioManager;
+import com.google.android.exoplayer2.util.Assertions;
+import com.google.android.exoplayer2.util.Util;
 
 /**
  * Receives broadcast events indicating changes to the device's audio capabilities, notifying a

library/src/main/java/com/google/android/exoplayer2/audio/AudioRendererEventListener.java

@@ -15,14 +15,13 @@
  */
 package com.google.android.exoplayer2.audio;
 
+import android.os.Handler;
+import android.os.SystemClock;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.Renderer;
 import com.google.android.exoplayer2.decoder.DecoderCounters;
 import com.google.android.exoplayer2.util.Assertions;
 
-import android.os.Handler;
-import android.os.SystemClock;
-
 /**
  * Listener of audio {@link Renderer} events.
  */

library/src/main/java/com/google/android/exoplayer2/audio/AudioTrack.java

@@ -15,11 +15,6 @@
  */
 package com.google.android.exoplayer2.audio;
 
-import com.google.android.exoplayer2.C;
-import com.google.android.exoplayer2.util.Assertions;
-import com.google.android.exoplayer2.util.MimeTypes;
-import com.google.android.exoplayer2.util.Util;
-
 import android.annotation.TargetApi;
 import android.media.AudioFormat;
 import android.media.AudioTimestamp;
@@ -27,7 +22,10 @@ import android.media.PlaybackParams;
 import android.os.ConditionVariable;
 import android.os.SystemClock;
 import android.util.Log;
-
+import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.util.Assertions;
+import com.google.android.exoplayer2.util.MimeTypes;
+import com.google.android.exoplayer2.util.Util;
 import java.lang.reflect.Method;
 import java.nio.ByteBuffer;
 

library/src/main/java/com/google/android/exoplayer2/audio/DtsUtil.java

@@ -19,7 +19,6 @@ import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.drm.DrmInitData;
 import com.google.android.exoplayer2.util.MimeTypes;
 import com.google.android.exoplayer2.util.ParsableBitArray;
-
 import java.nio.ByteBuffer;
 
 /**

library/src/main/java/com/google/android/exoplayer2/audio/MediaCodecAudioRenderer.java

@@ -15,6 +15,15 @@
  */
 package com.google.android.exoplayer2.audio;
 
+import android.annotation.TargetApi;
+import android.media.AudioManager;
+import android.media.MediaCodec;
+import android.media.MediaCrypto;
+import android.media.MediaFormat;
+import android.media.PlaybackParams;
+import android.media.audiofx.Virtualizer;
+import android.os.Handler;
+import android.os.SystemClock;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.ExoPlaybackException;
 import com.google.android.exoplayer2.Format;
@@ -27,17 +36,6 @@ import com.google.android.exoplayer2.mediacodec.MediaCodecUtil.DecoderQueryExcep
 import com.google.android.exoplayer2.util.MediaClock;
 import com.google.android.exoplayer2.util.MimeTypes;
 import com.google.android.exoplayer2.util.Util;
-
-import android.annotation.TargetApi;
-import android.media.AudioManager;
-import android.media.MediaCodec;
-import android.media.MediaCrypto;
-import android.media.MediaFormat;
-import android.media.PlaybackParams;
-import android.media.audiofx.Virtualizer;
-import android.os.Handler;
-import android.os.SystemClock;
-
 import java.nio.ByteBuffer;
 
 /**

library/src/main/java/com/google/android/exoplayer2/audio/SimpleDecoderAudioRenderer.java

@@ -15,6 +15,10 @@
  */
 package com.google.android.exoplayer2.audio;
 
+import android.media.AudioManager;
+import android.media.PlaybackParams;
+import android.os.Handler;
+import android.os.SystemClock;
 import com.google.android.exoplayer2.BaseRenderer;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.ExoPlaybackException;
@@ -29,11 +33,6 @@ import com.google.android.exoplayer2.util.MediaClock;
 import com.google.android.exoplayer2.util.MimeTypes;
 import com.google.android.exoplayer2.util.TraceUtil;
 
-import android.media.AudioManager;
-import android.media.PlaybackParams;
-import android.os.Handler;
-import android.os.SystemClock;
-
 /**
  * Decodes and renders audio using a {@link SimpleDecoder}.
  */

library/src/main/java/com/google/android/exoplayer2/decoder/CryptoInfo.java

@@ -15,9 +15,8 @@
  */
 package com.google.android.exoplayer2.decoder;
 
-import com.google.android.exoplayer2.util.Util;
-
 import android.annotation.TargetApi;
+import com.google.android.exoplayer2.util.Util;
 
 /**
  * Compatibility wrapper around {@link android.media.MediaCodec.CryptoInfo}.

library/src/main/java/com/google/android/exoplayer2/decoder/DecoderInputBuffer.java

@@ -16,7 +16,6 @@
 package com.google.android.exoplayer2.decoder;
 
 import com.google.android.exoplayer2.C;
-
 import java.nio.ByteBuffer;
 
 /**

library/src/main/java/com/google/android/exoplayer2/decoder/SimpleDecoder.java

@@ -17,7 +17,6 @@ package com.google.android.exoplayer2.decoder;
 
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.util.Assertions;
-
 import java.util.LinkedList;
 
 /**

library/src/main/java/com/google/android/exoplayer2/drm/DrmInitData.java

@@ -15,14 +15,12 @@
  */
 package com.google.android.exoplayer2.drm;
 
+import android.os.Parcel;
+import android.os.Parcelable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.drm.DrmInitData.SchemeData;
 import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.Util;
-
-import android.os.Parcel;
-import android.os.Parcelable;
-
 import java.util.Arrays;
 import java.util.Comparator;
 import java.util.List;

library/src/main/java/com/google/android/exoplayer2/drm/HttpMediaDrmCallback.java

@@ -15,18 +15,16 @@
  */
 package com.google.android.exoplayer2.drm;
 
-import com.google.android.exoplayer2.C;
-import com.google.android.exoplayer2.upstream.DataSourceInputStream;
-import com.google.android.exoplayer2.upstream.DataSpec;
-import com.google.android.exoplayer2.upstream.HttpDataSource;
-import com.google.android.exoplayer2.util.Util;
-
 import android.annotation.TargetApi;
 import android.media.MediaDrm.KeyRequest;
 import android.media.MediaDrm.ProvisionRequest;
 import android.net.Uri;
 import android.text.TextUtils;
-
+import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.upstream.DataSourceInputStream;
+import com.google.android.exoplayer2.upstream.DataSpec;
+import com.google.android.exoplayer2.upstream.HttpDataSource;
+import com.google.android.exoplayer2.util.Util;
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;

library/src/main/java/com/google/android/exoplayer2/drm/MediaDrmCallback.java

@@ -17,7 +17,6 @@ package com.google.android.exoplayer2.drm;
 
 import android.annotation.TargetApi;
 import android.media.MediaDrm;
-
 import java.util.UUID;
 
 /**

library/src/main/java/com/google/android/exoplayer2/drm/StreamingDrmSessionManager.java

@@ -15,12 +15,6 @@
  */
 package com.google.android.exoplayer2.drm;
 
-import com.google.android.exoplayer2.C;
-import com.google.android.exoplayer2.drm.DrmInitData.SchemeData;
-import com.google.android.exoplayer2.extractor.mp4.PsshAtomUtil;
-import com.google.android.exoplayer2.util.Assertions;
-import com.google.android.exoplayer2.util.Util;
-
 import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
 import android.media.DeniedByServerException;
@@ -36,7 +30,11 @@ import android.os.HandlerThread;
 import android.os.Looper;
 import android.os.Message;
 import android.text.TextUtils;
-
+import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.drm.DrmInitData.SchemeData;
+import com.google.android.exoplayer2.extractor.mp4.PsshAtomUtil;
+import com.google.android.exoplayer2.util.Assertions;
+import com.google.android.exoplayer2.util.Util;
 import java.util.HashMap;
 import java.util.UUID;
 

library/src/main/java/com/google/android/exoplayer2/extractor/DefaultExtractorInput.java

@@ -18,7 +18,6 @@ package com.google.android.exoplayer2.extractor;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.upstream.DataSource;
 import com.google.android.exoplayer2.util.Assertions;
-
 import java.io.EOFException;
 import java.io.IOException;
 import java.util.Arrays;

library/src/main/java/com/google/android/exoplayer2/extractor/DefaultTrackOutput.java

@@ -24,7 +24,6 @@ import com.google.android.exoplayer2.upstream.Allocator;
 import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.ParsableByteArray;
 import com.google.android.exoplayer2.util.Util;
-
 import java.io.EOFException;
 import java.io.IOException;
 import java.nio.ByteBuffer;

library/src/main/java/com/google/android/exoplayer2/extractor/DummyTrackOutput.java

@@ -18,7 +18,6 @@ package com.google.android.exoplayer2.extractor;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.util.ParsableByteArray;
-
 import java.io.EOFException;
 import java.io.IOException;
 

library/src/main/java/com/google/android/exoplayer2/extractor/Extractor.java

@@ -16,7 +16,6 @@
 package com.google.android.exoplayer2.extractor;
 
 import com.google.android.exoplayer2.C;
-
 import java.io.IOException;
 
 /**

library/src/main/java/com/google/android/exoplayer2/extractor/ExtractorInput.java

@@ -16,7 +16,6 @@
 package com.google.android.exoplayer2.extractor;
 
 import com.google.android.exoplayer2.C;
-
 import java.io.EOFException;
 import java.io.IOException;
 

library/src/main/java/com/google/android/exoplayer2/extractor/GaplessInfoHolder.java

@@ -16,7 +16,6 @@
 package com.google.android.exoplayer2.extractor;
 
 import com.google.android.exoplayer2.Format;
-
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 

library/src/main/java/com/google/android/exoplayer2/extractor/TrackOutput.java

@@ -18,7 +18,6 @@ package com.google.android.exoplayer2.extractor;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.util.ParsableByteArray;
-
 import java.io.EOFException;
 import java.io.IOException;
 

library/src/main/java/com/google/android/exoplayer2/extractor/flv/AudioTagPayloadReader.java

@@ -15,15 +15,13 @@
  */
 package com.google.android.exoplayer2.extractor.flv;
 
+import android.util.Pair;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.extractor.TrackOutput;
 import com.google.android.exoplayer2.util.CodecSpecificDataUtil;
 import com.google.android.exoplayer2.util.MimeTypes;
 import com.google.android.exoplayer2.util.ParsableByteArray;
-
-import android.util.Pair;
-
 import java.util.Collections;
 
 /**

library/src/main/java/com/google/android/exoplayer2/extractor/flv/FlvExtractor.java

@@ -23,7 +23,6 @@ import com.google.android.exoplayer2.extractor.PositionHolder;
 import com.google.android.exoplayer2.extractor.SeekMap;
 import com.google.android.exoplayer2.util.ParsableByteArray;
 import com.google.android.exoplayer2.util.Util;
-
 import java.io.IOException;
 
 /**