diff options
author | aurimas@chromium.org <aurimas@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-10 19:28:13 +0000 |
---|---|---|
committer | aurimas@chromium.org <aurimas@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-10 19:28:13 +0000 |
commit | 6f221ce75d467f34aaf57ceab5216f2884bb082a (patch) | |
tree | 071d4ca764845c63a0698609535101c23b8c9843 /media | |
parent | ae454be777000ccb6eb13785bdbd60c0433be7e6 (diff) | |
download | chromium_src-6f221ce75d467f34aaf57ceab5216f2884bb082a.zip chromium_src-6f221ce75d467f34aaf57ceab5216f2884bb082a.tar.gz chromium_src-6f221ce75d467f34aaf57ceab5216f2884bb082a.tar.bz2 |
Fixing all Java import ordering issues.
BUG=320711
TBR=isherman@chromium.org
NOTRY=true
Review URL: https://codereview.chromium.org/110963003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@239823 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
7 files changed, 17 insertions, 28 deletions
diff --git a/media/base/android/java/src/org/chromium/media/AudioManagerAndroid.java b/media/base/android/java/src/org/chromium/media/AudioManagerAndroid.java index 0c37c0a..03197b5 100644 --- a/media/base/android/java/src/org/chromium/media/AudioManagerAndroid.java +++ b/media/base/android/java/src/org/chromium/media/AudioManagerAndroid.java @@ -17,23 +17,19 @@ import android.media.AudioFormat; import android.media.AudioManager; import android.media.AudioRecord; import android.media.AudioTrack; -import android.net.Uri; import android.os.Build; import android.os.Handler; import android.os.Looper; import android.os.Process; import android.provider.Settings; -import android.provider.Settings.System; import android.util.Log; +import org.chromium.base.CalledByNative; +import org.chromium.base.JNINamespace; + import java.util.ArrayList; import java.util.Arrays; -import java.util.HashSet; import java.util.List; -import java.util.Set; - -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; @JNINamespace("media") class AudioManagerAndroid { diff --git a/media/base/android/java/src/org/chromium/media/AudioRecordInput.java b/media/base/android/java/src/org/chromium/media/AudioRecordInput.java index 0752731..69ef83e 100644 --- a/media/base/android/java/src/org/chromium/media/AudioRecordInput.java +++ b/media/base/android/java/src/org/chromium/media/AudioRecordInput.java @@ -4,17 +4,17 @@ package org.chromium.media; -import android.content.Context; import android.media.AudioFormat; import android.media.AudioRecord; import android.media.MediaRecorder.AudioSource; import android.os.Process; import android.util.Log; -import java.nio.ByteBuffer; import org.chromium.base.CalledByNative; import org.chromium.base.JNINamespace; +import java.nio.ByteBuffer; + // Owned by its native counterpart declared in audio_record_input.h. Refer to // that class for general comments. @JNINamespace("media") diff --git a/media/base/android/java/src/org/chromium/media/MediaCodecBridge.java b/media/base/android/java/src/org/chromium/media/MediaCodecBridge.java index 6639349..ce52b3b 100644 --- a/media/base/android/java/src/org/chromium/media/MediaCodecBridge.java +++ b/media/base/android/java/src/org/chromium/media/MediaCodecBridge.java @@ -17,16 +17,14 @@ import android.os.Bundle; import android.util.Log; import android.view.Surface; -import java.io.IOException; +import org.chromium.base.CalledByNative; +import org.chromium.base.JNINamespace; + import java.nio.ByteBuffer; import java.util.ArrayList; -import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; - /** * A wrapper of the MediaCodec class to facilitate exception capturing and * audio rendering. diff --git a/media/base/android/java/src/org/chromium/media/MediaDrmBridge.java b/media/base/android/java/src/org/chromium/media/MediaDrmBridge.java index 075fca7..59044e4 100644 --- a/media/base/android/java/src/org/chromium/media/MediaDrmBridge.java +++ b/media/base/android/java/src/org/chromium/media/MediaDrmBridge.java @@ -12,16 +12,15 @@ import android.os.Handler; import android.util.Log; import org.apache.http.HttpResponse; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.client.HttpClient; import org.apache.http.client.ClientProtocolException; +import org.apache.http.client.HttpClient; +import org.apache.http.client.methods.HttpPost; import org.apache.http.impl.client.DefaultHttpClient; import org.apache.http.util.EntityUtils; import org.chromium.base.CalledByNative; import org.chromium.base.JNINamespace; import java.io.IOException; -import java.lang.RuntimeException; import java.util.ArrayDeque; import java.util.HashMap; import java.util.UUID; diff --git a/media/base/android/java/src/org/chromium/media/MediaPlayerListener.java b/media/base/android/java/src/org/chromium/media/MediaPlayerListener.java index c302585..995f56d 100644 --- a/media/base/android/java/src/org/chromium/media/MediaPlayerListener.java +++ b/media/base/android/java/src/org/chromium/media/MediaPlayerListener.java @@ -4,9 +4,7 @@ package org.chromium.media; -import android.Manifest.permission; import android.content.Context; -import android.content.pm.PackageManager; import android.media.AudioManager; import android.media.MediaPlayer; diff --git a/media/base/android/java/src/org/chromium/media/VideoCapture.java b/media/base/android/java/src/org/chromium/media/VideoCapture.java index b17cfa1..d62ee20 100644 --- a/media/base/android/java/src/org/chromium/media/VideoCapture.java +++ b/media/base/android/java/src/org/chromium/media/VideoCapture.java @@ -15,13 +15,13 @@ import android.util.Log; import android.view.Surface; import android.view.WindowManager; +import org.chromium.base.CalledByNative; +import org.chromium.base.JNINamespace; + import java.io.IOException; -import java.util.concurrent.locks.ReentrantLock; import java.util.Iterator; import java.util.List; - -import org.chromium.base.CalledByNative; -import org.chromium.base.JNINamespace; +import java.util.concurrent.locks.ReentrantLock; @JNINamespace("media") public class VideoCapture implements PreviewCallback, OnFrameAvailableListener { diff --git a/media/base/android/java/src/org/chromium/media/WebAudioMediaCodecBridge.java b/media/base/android/java/src/org/chromium/media/WebAudioMediaCodecBridge.java index a570e9e..170b273 100644 --- a/media/base/android/java/src/org/chromium/media/WebAudioMediaCodecBridge.java +++ b/media/base/android/java/src/org/chromium/media/WebAudioMediaCodecBridge.java @@ -5,7 +5,6 @@ package org.chromium.media; import android.content.Context; -import android.media.AudioFormat; import android.media.MediaCodec; import android.media.MediaCodec.BufferInfo; import android.media.MediaExtractor; @@ -13,13 +12,12 @@ import android.media.MediaFormat; import android.os.ParcelFileDescriptor; import android.util.Log; -import java.io.IOException; -import java.io.File; -import java.nio.ByteBuffer; - import org.chromium.base.CalledByNative; import org.chromium.base.JNINamespace; +import java.io.File; +import java.nio.ByteBuffer; + @JNINamespace("media") class WebAudioMediaCodecBridge { static final String LOG_TAG = "WebAudioMediaCodec"; |