From: Dongwon Kang Date: Fri, 2 Mar 2018 18:08:53 +0000 (-0800) Subject: Remove unused imports in MediaPlayer2. X-Git-Tag: android-x86-9.0-r1~188^2~10^2~1 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=47cab8322a01edee503f10e9d5cbec2a5b5cffc3;p=android-x86%2Fframeworks-base.git Remove unused imports in MediaPlayer2. Test: build. Change-Id: I2f2a05ef4fc41d14f91e6805217852adf5bbb28e --- diff --git a/media/java/android/media/MediaPlayer2.java b/media/java/android/media/MediaPlayer2.java index 0d472abe9f9c..0cc744186a75 100644 --- a/media/java/android/media/MediaPlayer2.java +++ b/media/java/android/media/MediaPlayer2.java @@ -22,17 +22,6 @@ import android.annotation.NonNull; import android.annotation.Nullable; import android.content.Context; import android.graphics.SurfaceTexture; -import android.media.MediaDrm; -import android.media.MediaFormat; -import android.media.MediaPlayer2Impl; -import android.media.MediaPlayerBase; -import android.media.MediaTimeProvider; -import android.media.PlaybackParams; -import android.media.SubtitleController; -import android.media.SubtitleController.Anchor; -import android.media.SubtitleData; -import android.media.SubtitleTrack.RenderingWidget; -import android.media.SyncParams; import android.net.Uri; import android.os.Handler; import android.os.Parcel; @@ -43,14 +32,13 @@ import android.view.SurfaceHolder; import java.io.FileDescriptor; import java.io.IOException; import java.io.InputStream; -import java.lang.AutoCloseable; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; -import java.util.concurrent.Executor; import java.util.List; import java.util.Map; import java.util.Set; import java.util.UUID; +import java.util.concurrent.Executor; /** @@ -2019,12 +2007,12 @@ public abstract class MediaPlayer2 extends MediaPlayerBase public static final int MEDIA_CALL_DESELECT_TRACK = 2; /** The player just completed a call {@code loopCurrent}. - * @see android.media.MediaPlayer2.MediaPlayer2EventCallback.CallComplete + * @see android.media.MediaPlayer2.MediaPlayer2EventCallback#onCallComplete */ public static final int MEDIA_CALL_LOOP_CURRENT = 3; /** The player just completed a call {@code pause}. - * @see android.media.MediaPlayer2.MediaPlayer2EventCallback.CallComplete + * @see android.media.MediaPlayer2.MediaPlayer2EventCallback#onCallComplete */ public static final int MEDIA_CALL_PAUSE = 4; diff --git a/media/java/android/media/MediaPlayer2Impl.java b/media/java/android/media/MediaPlayer2Impl.java index 50e354317162..2d92d64e6a96 100644 --- a/media/java/android/media/MediaPlayer2Impl.java +++ b/media/java/android/media/MediaPlayer2Impl.java @@ -35,16 +35,16 @@ import android.os.Message; import android.os.Parcel; import android.os.Parcelable; import android.os.PersistableBundle; -import android.os.Process; import android.os.PowerManager; +import android.os.Process; import android.os.SystemProperties; import android.provider.Settings; import android.system.ErrnoException; import android.system.Os; import android.system.OsConstants; +import android.util.ArrayMap; import android.util.Log; import android.util.Pair; -import android.util.ArrayMap; import android.view.Surface; import android.view.SurfaceHolder; import android.widget.VideoView; @@ -63,10 +63,7 @@ import java.io.FileDescriptor; import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; -import java.lang.Runnable; import java.lang.ref.WeakReference; -import java.net.CookieHandler; -import java.net.CookieManager; import java.net.HttpCookie; import java.net.HttpURLConnection; import java.net.URL; @@ -74,8 +71,6 @@ import java.nio.ByteOrder; import java.util.ArrayList; import java.util.Arrays; import java.util.BitSet; -import java.util.Collections; -import java.util.concurrent.Executor; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -83,6 +78,7 @@ import java.util.Scanner; import java.util.Set; import java.util.UUID; import java.util.Vector; +import java.util.concurrent.Executor; /**