From d3235f0cd9d2e572fa424996940683375d74289a Mon Sep 17 00:00:00 2001 From: Sami Kalliomaki Date: Tue, 2 Aug 2016 15:44:04 +0200 Subject: [PATCH] Re-order and remove unused Java imports. R=tommi@webrtc.org Review URL: https://codereview.webrtc.org/2203723002 . Cr-Commit-Position: refs/heads/master@{#13608} --- .../src/org/webrtc/CameraEnumerationTest.java | 1 - .../android/java/src/org/webrtc/EglBase10.java | 2 +- .../android/java/src/org/webrtc/EglBase14.java | 2 -- .../java/src/org/webrtc/GlRectDrawer.java | 5 ----- .../android/java/src/org/webrtc/GlShader.java | 2 -- .../src/org/webrtc/MediaCodecVideoDecoder.java | 4 +--- .../src/org/webrtc/MediaCodecVideoEncoder.java | 4 +--- .../java/src/org/webrtc/NetworkMonitor.java | 2 -- .../org/webrtc/NetworkMonitorAutoDetect.java | 4 ---- .../java/src/org/webrtc/RtpParameters.java | 1 - .../src/org/webrtc/SurfaceTextureHelper.java | 1 - .../src/org/webrtc/SurfaceViewRenderer.java | 2 -- .../java/src/org/webrtc/VideoRendererGui.java | 17 ++++++++--------- .../Camera1CapturerUsingByteBufferTest.java | 2 -- .../Camera1CapturerUsingTextureTest.java | 2 -- .../src/org/webrtc/Camera2CapturerTest.java | 2 -- .../org/webrtc/MediaCodecVideoEncoderTest.java | 4 ++-- .../src/org/webrtc/NetworkMonitorTest.java | 1 - .../src/org/webrtc/PeerConnectionTest.java | 6 ++---- .../src/org/webrtc/RendererCommonTest.java | 11 +++++------ webrtc/base/java/src/org/webrtc/Logging.java | 2 +- .../appspot/apprtc/AppRTCProximitySensor.java | 3 ++- .../appspot/apprtc/PeerConnectionClient.java | 1 - .../appspot/apprtc/DirectRTCClientTest.java | 18 ++++++++---------- .../appspot/apprtc/TCPChannelClientTest.java | 10 ++++------ .../apprtc/util/LooperExecutorTest.java | 10 +++++----- .../apprtc/test/PeerConnectionClientTest.java | 1 - .../src/org/webrtc/voiceengine/BuildInfo.java | 1 - .../webrtc/voiceengine/WebRtcAudioEffects.java | 5 ++--- .../webrtc/voiceengine/WebRtcAudioManager.java | 5 ++--- .../webrtc/voiceengine/WebRtcAudioRecord.java | 10 +++++----- .../webrtc/voiceengine/WebRtcAudioTrack.java | 6 +++--- .../webrtc/voiceengine/WebRtcAudioUtils.java | 9 ++------- 33 files changed, 54 insertions(+), 102 deletions(-) diff --git a/webrtc/androidjunit/src/org/webrtc/CameraEnumerationTest.java b/webrtc/androidjunit/src/org/webrtc/CameraEnumerationTest.java index b1ebb6c360..031cdfd5c9 100644 --- a/webrtc/androidjunit/src/org/webrtc/CameraEnumerationTest.java +++ b/webrtc/androidjunit/src/org/webrtc/CameraEnumerationTest.java @@ -13,7 +13,6 @@ package org.webrtc; import static org.junit.Assert.assertEquals; import static org.webrtc.CameraEnumerationAndroid.getClosestSupportedFramerateRange; -import org.webrtc.CameraEnumerationAndroid.CaptureFormat; import org.webrtc.CameraEnumerationAndroid.CaptureFormat.FramerateRange; import org.junit.Test; diff --git a/webrtc/api/android/java/src/org/webrtc/EglBase10.java b/webrtc/api/android/java/src/org/webrtc/EglBase10.java index 0d7b61d587..af3266fc0c 100644 --- a/webrtc/api/android/java/src/org/webrtc/EglBase10.java +++ b/webrtc/api/android/java/src/org/webrtc/EglBase10.java @@ -11,8 +11,8 @@ package org.webrtc; import android.graphics.Canvas; -import android.graphics.SurfaceTexture; import android.graphics.Rect; +import android.graphics.SurfaceTexture; import android.view.Surface; import android.view.SurfaceHolder; diff --git a/webrtc/api/android/java/src/org/webrtc/EglBase14.java b/webrtc/api/android/java/src/org/webrtc/EglBase14.java index 71d6d99873..3398c11eb4 100644 --- a/webrtc/api/android/java/src/org/webrtc/EglBase14.java +++ b/webrtc/api/android/java/src/org/webrtc/EglBase14.java @@ -20,8 +20,6 @@ import android.opengl.EGLExt; import android.opengl.EGLSurface; import android.view.Surface; -import org.webrtc.Logging; - /** * Holds EGL state and utility methods for handling an EGL14 EGLContext, an EGLDisplay, * and an EGLSurface. diff --git a/webrtc/api/android/java/src/org/webrtc/GlRectDrawer.java b/webrtc/api/android/java/src/org/webrtc/GlRectDrawer.java index cfadff108a..0595e2be21 100644 --- a/webrtc/api/android/java/src/org/webrtc/GlRectDrawer.java +++ b/webrtc/api/android/java/src/org/webrtc/GlRectDrawer.java @@ -13,12 +13,7 @@ package org.webrtc; import android.opengl.GLES11Ext; import android.opengl.GLES20; -import org.webrtc.GlShader; -import org.webrtc.GlUtil; - -import java.nio.ByteBuffer; import java.nio.FloatBuffer; -import java.util.Arrays; import java.util.IdentityHashMap; import java.util.Map; diff --git a/webrtc/api/android/java/src/org/webrtc/GlShader.java b/webrtc/api/android/java/src/org/webrtc/GlShader.java index fb5e4c2f67..be1063531b 100644 --- a/webrtc/api/android/java/src/org/webrtc/GlShader.java +++ b/webrtc/api/android/java/src/org/webrtc/GlShader.java @@ -12,8 +12,6 @@ package org.webrtc; import android.opengl.GLES20; -import org.webrtc.Logging; - import java.nio.FloatBuffer; // Helper class for handling OpenGL shaders and shader programs. diff --git a/webrtc/api/android/java/src/org/webrtc/MediaCodecVideoDecoder.java b/webrtc/api/android/java/src/org/webrtc/MediaCodecVideoDecoder.java index 02235fe3c7..63871f840e 100644 --- a/webrtc/api/android/java/src/org/webrtc/MediaCodecVideoDecoder.java +++ b/webrtc/api/android/java/src/org/webrtc/MediaCodecVideoDecoder.java @@ -19,16 +19,14 @@ import android.os.Build; import android.os.SystemClock; import android.view.Surface; -import org.webrtc.Logging; - import java.nio.ByteBuffer; import java.util.Arrays; import java.util.HashSet; import java.util.LinkedList; import java.util.List; +import java.util.Queue; import java.util.Set; import java.util.concurrent.CountDownLatch; -import java.util.Queue; import java.util.concurrent.TimeUnit; // Java-side of peerconnection_jni.cc:MediaCodecVideoDecoder. diff --git a/webrtc/api/android/java/src/org/webrtc/MediaCodecVideoEncoder.java b/webrtc/api/android/java/src/org/webrtc/MediaCodecVideoEncoder.java index f79e3171da..da8fb41711 100644 --- a/webrtc/api/android/java/src/org/webrtc/MediaCodecVideoEncoder.java +++ b/webrtc/api/android/java/src/org/webrtc/MediaCodecVideoEncoder.java @@ -12,8 +12,8 @@ package org.webrtc; import android.annotation.TargetApi; import android.media.MediaCodec; -import android.media.MediaCodecInfo.CodecCapabilities; import android.media.MediaCodecInfo; +import android.media.MediaCodecInfo.CodecCapabilities; import android.media.MediaCodecList; import android.media.MediaFormat; import android.opengl.GLES20; @@ -21,8 +21,6 @@ import android.os.Build; import android.os.Bundle; import android.view.Surface; -import org.webrtc.Logging; - import java.nio.ByteBuffer; import java.util.Arrays; import java.util.HashSet; diff --git a/webrtc/api/android/java/src/org/webrtc/NetworkMonitor.java b/webrtc/api/android/java/src/org/webrtc/NetworkMonitor.java index 76a1bb5769..01b9428eb9 100644 --- a/webrtc/api/android/java/src/org/webrtc/NetworkMonitor.java +++ b/webrtc/api/android/java/src/org/webrtc/NetworkMonitor.java @@ -14,8 +14,6 @@ import static org.webrtc.NetworkMonitorAutoDetect.ConnectionType; import static org.webrtc.NetworkMonitorAutoDetect.INVALID_NET_ID; import static org.webrtc.NetworkMonitorAutoDetect.NetworkInformation; -import org.webrtc.Logging; - import android.content.Context; import android.os.Build; diff --git a/webrtc/api/android/java/src/org/webrtc/NetworkMonitorAutoDetect.java b/webrtc/api/android/java/src/org/webrtc/NetworkMonitorAutoDetect.java index 15a2a5c266..c437b44329 100644 --- a/webrtc/api/android/java/src/org/webrtc/NetworkMonitorAutoDetect.java +++ b/webrtc/api/android/java/src/org/webrtc/NetworkMonitorAutoDetect.java @@ -13,16 +13,12 @@ package org.webrtc; import static android.net.NetworkCapabilities.NET_CAPABILITY_INTERNET; import static android.net.NetworkCapabilities.TRANSPORT_CELLULAR; - -import org.webrtc.Logging; - import android.Manifest.permission; import android.annotation.SuppressLint; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; -import android.content.pm.PackageManager; import android.net.ConnectivityManager; import android.net.ConnectivityManager.NetworkCallback; import android.net.LinkAddress; diff --git a/webrtc/api/android/java/src/org/webrtc/RtpParameters.java b/webrtc/api/android/java/src/org/webrtc/RtpParameters.java index 4aa10fbce6..170874b974 100644 --- a/webrtc/api/android/java/src/org/webrtc/RtpParameters.java +++ b/webrtc/api/android/java/src/org/webrtc/RtpParameters.java @@ -10,7 +10,6 @@ package org.webrtc; -import java.util.List; import java.util.LinkedList; /** diff --git a/webrtc/api/android/java/src/org/webrtc/SurfaceTextureHelper.java b/webrtc/api/android/java/src/org/webrtc/SurfaceTextureHelper.java index 5677209a98..a38b0e46f0 100644 --- a/webrtc/api/android/java/src/org/webrtc/SurfaceTextureHelper.java +++ b/webrtc/api/android/java/src/org/webrtc/SurfaceTextureHelper.java @@ -21,7 +21,6 @@ import android.os.SystemClock; import java.nio.ByteBuffer; import java.nio.FloatBuffer; import java.util.concurrent.Callable; -import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; /** diff --git a/webrtc/api/android/java/src/org/webrtc/SurfaceViewRenderer.java b/webrtc/api/android/java/src/org/webrtc/SurfaceViewRenderer.java index 6c8af2488a..fd02fd583a 100644 --- a/webrtc/api/android/java/src/org/webrtc/SurfaceViewRenderer.java +++ b/webrtc/api/android/java/src/org/webrtc/SurfaceViewRenderer.java @@ -20,8 +20,6 @@ import android.util.AttributeSet; import android.view.SurfaceHolder; import android.view.SurfaceView; -import org.webrtc.Logging; - import java.util.concurrent.CountDownLatch; import javax.microedition.khronos.egl.EGLContext; diff --git a/webrtc/api/android/java/src/org/webrtc/VideoRendererGui.java b/webrtc/api/android/java/src/org/webrtc/VideoRendererGui.java index e292bac2ef..5aa16abeef 100644 --- a/webrtc/api/android/java/src/org/webrtc/VideoRendererGui.java +++ b/webrtc/api/android/java/src/org/webrtc/VideoRendererGui.java @@ -10,13 +10,7 @@ package org.webrtc; -import java.util.ArrayList; -import java.util.concurrent.CountDownLatch; - -import javax.microedition.khronos.egl.EGLConfig; -import javax.microedition.khronos.egl.EGL10; -import javax.microedition.khronos.egl.EGLContext; -import javax.microedition.khronos.opengles.GL10; +import org.webrtc.VideoRenderer.I420Frame; import android.annotation.SuppressLint; import android.graphics.Point; @@ -25,8 +19,13 @@ import android.opengl.EGL14; import android.opengl.GLES20; import android.opengl.GLSurfaceView; -import org.webrtc.Logging; -import org.webrtc.VideoRenderer.I420Frame; +import java.util.ArrayList; +import java.util.concurrent.CountDownLatch; + +import javax.microedition.khronos.egl.EGL10; +import javax.microedition.khronos.egl.EGLConfig; +import javax.microedition.khronos.egl.EGLContext; +import javax.microedition.khronos.opengles.GL10; /** * Efficiently renders YUV frames using the GPU for CSC. diff --git a/webrtc/api/androidtests/src/org/webrtc/Camera1CapturerUsingByteBufferTest.java b/webrtc/api/androidtests/src/org/webrtc/Camera1CapturerUsingByteBufferTest.java index e473e97651..2b68702feb 100644 --- a/webrtc/api/androidtests/src/org/webrtc/Camera1CapturerUsingByteBufferTest.java +++ b/webrtc/api/androidtests/src/org/webrtc/Camera1CapturerUsingByteBufferTest.java @@ -10,8 +10,6 @@ package org.webrtc; -import org.webrtc.CameraEnumerationAndroid.CaptureFormat; - import android.content.Context; import android.test.InstrumentationTestCase; import android.test.suitebuilder.annotation.LargeTest; diff --git a/webrtc/api/androidtests/src/org/webrtc/Camera1CapturerUsingTextureTest.java b/webrtc/api/androidtests/src/org/webrtc/Camera1CapturerUsingTextureTest.java index 473b3d43c4..b8d31bdf58 100644 --- a/webrtc/api/androidtests/src/org/webrtc/Camera1CapturerUsingTextureTest.java +++ b/webrtc/api/androidtests/src/org/webrtc/Camera1CapturerUsingTextureTest.java @@ -10,8 +10,6 @@ package org.webrtc; -import org.webrtc.CameraEnumerationAndroid.CaptureFormat; - import android.content.Context; import android.test.InstrumentationTestCase; import android.test.suitebuilder.annotation.LargeTest; diff --git a/webrtc/api/androidtests/src/org/webrtc/Camera2CapturerTest.java b/webrtc/api/androidtests/src/org/webrtc/Camera2CapturerTest.java index 0dc1080d8f..f7f900be3f 100644 --- a/webrtc/api/androidtests/src/org/webrtc/Camera2CapturerTest.java +++ b/webrtc/api/androidtests/src/org/webrtc/Camera2CapturerTest.java @@ -10,8 +10,6 @@ package org.webrtc; -import org.webrtc.CameraEnumerationAndroid.CaptureFormat; - import android.content.Context; import android.hardware.camera2.CameraAccessException; import android.hardware.camera2.CameraDevice; diff --git a/webrtc/api/androidtests/src/org/webrtc/MediaCodecVideoEncoderTest.java b/webrtc/api/androidtests/src/org/webrtc/MediaCodecVideoEncoderTest.java index aad254b9fc..2666d01735 100644 --- a/webrtc/api/androidtests/src/org/webrtc/MediaCodecVideoEncoderTest.java +++ b/webrtc/api/androidtests/src/org/webrtc/MediaCodecVideoEncoderTest.java @@ -9,6 +9,8 @@ */ package org.webrtc; +import org.webrtc.MediaCodecVideoEncoder.OutputBufferInfo; + import android.annotation.TargetApi; import android.opengl.GLES11Ext; import android.opengl.GLES20; @@ -17,8 +19,6 @@ import android.test.ActivityTestCase; import android.test.suitebuilder.annotation.SmallTest; import android.util.Log; -import org.webrtc.MediaCodecVideoEncoder.OutputBufferInfo; - import java.nio.ByteBuffer; @TargetApi(Build.VERSION_CODES.ICE_CREAM_SANDWICH_MR1) diff --git a/webrtc/api/androidtests/src/org/webrtc/NetworkMonitorTest.java b/webrtc/api/androidtests/src/org/webrtc/NetworkMonitorTest.java index 785f37fe17..7fd6487190 100644 --- a/webrtc/api/androidtests/src/org/webrtc/NetworkMonitorTest.java +++ b/webrtc/api/androidtests/src/org/webrtc/NetworkMonitorTest.java @@ -24,7 +24,6 @@ import android.net.wifi.WifiManager; import android.os.Build; import android.os.Handler; import android.os.Looper; -import android.telephony.TelephonyManager; import android.test.ActivityTestCase; import android.test.UiThreadTest; import android.test.suitebuilder.annotation.MediumTest; diff --git a/webrtc/api/androidtests/src/org/webrtc/PeerConnectionTest.java b/webrtc/api/androidtests/src/org/webrtc/PeerConnectionTest.java index 510c8951bd..47806432a8 100644 --- a/webrtc/api/androidtests/src/org/webrtc/PeerConnectionTest.java +++ b/webrtc/api/androidtests/src/org/webrtc/PeerConnectionTest.java @@ -10,12 +10,12 @@ package org.webrtc; -import org.webrtc.Metrics; import org.webrtc.Metrics.HistogramInfo; import org.webrtc.PeerConnection.IceConnectionState; import org.webrtc.PeerConnection.IceGatheringState; import org.webrtc.PeerConnection.SignalingState; +import android.test.ActivityTestCase; import android.test.suitebuilder.annotation.MediumTest; import java.io.File; @@ -23,18 +23,16 @@ import java.lang.ref.WeakReference; import java.nio.ByteBuffer; import java.nio.charset.Charset; import java.util.Arrays; +import java.util.HashSet; import java.util.IdentityHashMap; import java.util.LinkedList; import java.util.List; -import java.util.HashSet; import java.util.Map; import java.util.TreeSet; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; /** End-to-end tests for PeerConnection.java. */ -import android.test.ActivityTestCase; - public class PeerConnectionTest extends ActivityTestCase { private static final int TIMEOUT_SECONDS = 20; private TreeSet threadsBeforeTest = null; diff --git a/webrtc/api/androidtests/src/org/webrtc/RendererCommonTest.java b/webrtc/api/androidtests/src/org/webrtc/RendererCommonTest.java index fa55dc0741..cff3a8cab8 100644 --- a/webrtc/api/androidtests/src/org/webrtc/RendererCommonTest.java +++ b/webrtc/api/androidtests/src/org/webrtc/RendererCommonTest.java @@ -10,17 +10,16 @@ package org.webrtc; -import android.test.ActivityTestCase; -import android.test.MoreAsserts; -import android.test.suitebuilder.annotation.SmallTest; - -import android.graphics.Point; - import static org.webrtc.RendererCommon.ScalingType.*; import static org.webrtc.RendererCommon.getDisplaySize; import static org.webrtc.RendererCommon.getLayoutMatrix; import static org.webrtc.RendererCommon.rotateTextureMatrix; +import android.graphics.Point; +import android.test.ActivityTestCase; +import android.test.MoreAsserts; +import android.test.suitebuilder.annotation.SmallTest; + public final class RendererCommonTest extends ActivityTestCase { @SmallTest static public void testDisplaySizeNoFrame() { diff --git a/webrtc/base/java/src/org/webrtc/Logging.java b/webrtc/base/java/src/org/webrtc/Logging.java index 684e5bc5b2..7d073b35d5 100644 --- a/webrtc/base/java/src/org/webrtc/Logging.java +++ b/webrtc/base/java/src/org/webrtc/Logging.java @@ -13,8 +13,8 @@ package org.webrtc; import java.io.PrintWriter; import java.io.StringWriter; import java.util.EnumSet; -import java.util.logging.Logger; import java.util.logging.Level; +import java.util.logging.Logger; /** Java wrapper for WebRTC logging. */ public class Logging { diff --git a/webrtc/examples/androidapp/src/org/appspot/apprtc/AppRTCProximitySensor.java b/webrtc/examples/androidapp/src/org/appspot/apprtc/AppRTCProximitySensor.java index 4e1263d650..ebbb06699f 100644 --- a/webrtc/examples/androidapp/src/org/appspot/apprtc/AppRTCProximitySensor.java +++ b/webrtc/examples/androidapp/src/org/appspot/apprtc/AppRTCProximitySensor.java @@ -10,6 +10,8 @@ package org.appspot.apprtc; +import org.appspot.apprtc.util.AppRTCUtils; + import android.content.Context; import android.hardware.Sensor; import android.hardware.SensorEvent; @@ -18,7 +20,6 @@ import android.hardware.SensorManager; import android.os.Build; import android.util.Log; -import org.appspot.apprtc.util.AppRTCUtils; import org.webrtc.ThreadUtils; /** diff --git a/webrtc/examples/androidapp/src/org/appspot/apprtc/PeerConnectionClient.java b/webrtc/examples/androidapp/src/org/appspot/apprtc/PeerConnectionClient.java index 479b1140d1..238d123dea 100644 --- a/webrtc/examples/androidapp/src/org/appspot/apprtc/PeerConnectionClient.java +++ b/webrtc/examples/androidapp/src/org/appspot/apprtc/PeerConnectionClient.java @@ -28,7 +28,6 @@ import org.webrtc.DataChannel; import org.webrtc.EglBase; import org.webrtc.IceCandidate; import org.webrtc.Logging; -import org.webrtc.MediaCodecVideoEncoder; import org.webrtc.MediaConstraints; import org.webrtc.MediaConstraints.KeyValuePair; import org.webrtc.MediaStream; diff --git a/webrtc/examples/androidjunit/src/org/appspot/apprtc/DirectRTCClientTest.java b/webrtc/examples/androidjunit/src/org/appspot/apprtc/DirectRTCClientTest.java index 9a18107a6b..12cdb57e4e 100644 --- a/webrtc/examples/androidjunit/src/org/appspot/apprtc/DirectRTCClientTest.java +++ b/webrtc/examples/androidjunit/src/org/appspot/apprtc/DirectRTCClientTest.java @@ -10,16 +10,6 @@ package org.appspot.apprtc; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.robolectric.RobolectricTestRunner; -import org.robolectric.annotation.Config; -import org.webrtc.IceCandidate; -import org.webrtc.SessionDescription; - -import java.util.regex.Matcher; - import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; @@ -30,6 +20,14 @@ import static org.mockito.Mockito.timeout; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; +import org.robolectric.annotation.Config; +import org.webrtc.IceCandidate; +import org.webrtc.SessionDescription; + /** * Test for DirectRTCClient. Test is very simple and only tests the overall sanity of the class * behaviour. diff --git a/webrtc/examples/androidjunit/src/org/appspot/apprtc/TCPChannelClientTest.java b/webrtc/examples/androidjunit/src/org/appspot/apprtc/TCPChannelClientTest.java index bdfcf76787..b4a6a50a4b 100644 --- a/webrtc/examples/androidjunit/src/org/appspot/apprtc/TCPChannelClientTest.java +++ b/webrtc/examples/androidjunit/src/org/appspot/apprtc/TCPChannelClientTest.java @@ -10,6 +10,10 @@ package org.appspot.apprtc; +import static org.junit.Assert.fail; +import static org.mockito.Mockito.timeout; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.verifyNoMoreInteractions; import org.junit.After; import org.junit.Before; @@ -21,16 +25,10 @@ import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowLog; -import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; -import static org.junit.Assert.fail; -import static org.mockito.Mockito.timeout; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyNoMoreInteractions; - @RunWith(RobolectricTestRunner.class) @Config(manifest = Config.NONE) public class TCPChannelClientTest { diff --git a/webrtc/examples/androidjunit/src/org/appspot/apprtc/util/LooperExecutorTest.java b/webrtc/examples/androidjunit/src/org/appspot/apprtc/util/LooperExecutorTest.java index 31c97ae31a..aecf6b168a 100644 --- a/webrtc/examples/androidjunit/src/org/appspot/apprtc/util/LooperExecutorTest.java +++ b/webrtc/examples/androidjunit/src/org/appspot/apprtc/util/LooperExecutorTest.java @@ -10,6 +10,11 @@ package org.appspot.apprtc.util; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.verifyNoMoreInteractions; +import static org.robolectric.Robolectric.shadowOf; + import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -20,11 +25,6 @@ import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowLooper; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyNoMoreInteractions; -import static org.robolectric.Robolectric.shadowOf; - @RunWith(RobolectricTestRunner.class) @Config(manifest = Config.NONE) public class LooperExecutorTest { diff --git a/webrtc/examples/androidtests/src/org/appspot/apprtc/test/PeerConnectionClientTest.java b/webrtc/examples/androidtests/src/org/appspot/apprtc/test/PeerConnectionClientTest.java index 09815dedeb..85052ea3e2 100644 --- a/webrtc/examples/androidtests/src/org/appspot/apprtc/test/PeerConnectionClientTest.java +++ b/webrtc/examples/androidtests/src/org/appspot/apprtc/test/PeerConnectionClientTest.java @@ -33,7 +33,6 @@ import org.webrtc.VideoRenderer; import java.util.LinkedList; import java.util.List; import java.util.concurrent.CountDownLatch; -import java.util.concurrent.Executor; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; diff --git a/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/BuildInfo.java b/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/BuildInfo.java index 9f025c4f4b..95ff585947 100644 --- a/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/BuildInfo.java +++ b/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/BuildInfo.java @@ -11,7 +11,6 @@ package org.webrtc.voiceengine; import android.os.Build; -import android.util.Log; public final class BuildInfo { public static String getDevice() { diff --git a/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioEffects.java b/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioEffects.java index 255e92d9ec..042f0baf66 100644 --- a/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioEffects.java +++ b/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioEffects.java @@ -10,6 +10,8 @@ package org.webrtc.voiceengine; +import org.webrtc.Logging; + import android.annotation.TargetApi; import android.media.audiofx.AcousticEchoCanceler; import android.media.audiofx.AudioEffect; @@ -18,10 +20,7 @@ import android.media.audiofx.AutomaticGainControl; import android.media.audiofx.NoiseSuppressor; import android.os.Build; -import org.webrtc.Logging; - import java.util.List; - import java.util.UUID; // This class wraps control of three different platform effects. Supported diff --git a/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioManager.java b/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioManager.java index 6a9ed12749..ae119fce1b 100644 --- a/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioManager.java +++ b/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioManager.java @@ -10,6 +10,8 @@ package org.webrtc.voiceengine; +import org.webrtc.Logging; + import android.annotation.TargetApi; import android.content.Context; import android.content.pm.PackageManager; @@ -19,9 +21,6 @@ import android.media.AudioRecord; import android.media.AudioTrack; import android.os.Build; -import org.webrtc.Logging; - -import java.lang.Math; import java.util.Timer; import java.util.TimerTask; diff --git a/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioRecord.java b/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioRecord.java index d5ab84023f..a13a7d552b 100644 --- a/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioRecord.java +++ b/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioRecord.java @@ -10,9 +10,8 @@ package org.webrtc.voiceengine; -import java.lang.System; -import java.nio.ByteBuffer; -import java.util.concurrent.TimeUnit; +import org.webrtc.Logging; +import org.webrtc.ThreadUtils; import android.content.Context; import android.media.AudioFormat; @@ -20,8 +19,9 @@ import android.media.AudioRecord; import android.media.MediaRecorder.AudioSource; import android.os.Process; -import org.webrtc.Logging; -import org.webrtc.ThreadUtils; +import java.lang.System; +import java.nio.ByteBuffer; +import java.util.concurrent.TimeUnit; public class WebRtcAudioRecord { private static final boolean DEBUG = false; diff --git a/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioTrack.java b/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioTrack.java index 62d5cce59b..3e003294aa 100644 --- a/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioTrack.java +++ b/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioTrack.java @@ -10,8 +10,7 @@ package org.webrtc.voiceengine; -import java.lang.Thread; -import java.nio.ByteBuffer; +import org.webrtc.Logging; import android.annotation.TargetApi; import android.content.Context; @@ -20,7 +19,8 @@ import android.media.AudioManager; import android.media.AudioTrack; import android.os.Process; -import org.webrtc.Logging; +import java.lang.Thread; +import java.nio.ByteBuffer; public class WebRtcAudioTrack { private static final boolean DEBUG = false; diff --git a/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioUtils.java b/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioUtils.java index fecefc75c3..63eb13be30 100644 --- a/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioUtils.java +++ b/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioUtils.java @@ -10,19 +10,14 @@ package org.webrtc.voiceengine; +import org.webrtc.Logging; + import android.content.Context; import android.content.pm.PackageManager; -import android.media.audiofx.AcousticEchoCanceler; -import android.media.audiofx.AudioEffect; -import android.media.audiofx.AudioEffect.Descriptor; -import android.media.AudioManager; import android.os.Build; import android.os.Process; -import org.webrtc.Logging; - import java.lang.Thread; -import java.util.ArrayList; import java.util.Arrays; import java.util.List;