Remove the deprecated things from Config.java. These haven't been working since before 1.0.

Change-Id: Ic2e8fa68797ea9d486f4117f3d82c98233cdab1e

6 files changed, 9 insertions, 15 deletions

diff --git a/media/java/android/media/AmrInputStream.java b/media/java/android/media/AmrInputStream.java
index d40ca5a..bc68472 100644
--- a/media/java/android/media/AmrInputStream.java
+++ b/media/java/android/media/AmrInputStream.java
@@ -16,7 +16,6 @@
 
 package android.media;
 
-import android.util.Config;
 import android.util.Log;
 
 import java.io.InputStream;
diff --git a/media/java/android/media/AudioManager.java b/media/java/android/media/AudioManager.java
index cc2ffa0..e1daede 100644
--- a/media/java/android/media/AudioManager.java
+++ b/media/java/android/media/AudioManager.java
@@ -50,8 +50,7 @@ public class AudioManager {
     private long mVolumeKeyUpTime;
     private int  mVolumeControlStream = -1;
     private static String TAG = "AudioManager";
-    private static boolean DEBUG = false;
-    private static boolean localLOGV = DEBUG || android.util.Config.LOGV;
+    private static boolean localLOGV = false;
 
     /**
      * Broadcast intent, a hint for applications that audio is about to become
diff --git a/media/java/android/media/MediaScanner.java b/media/java/android/media/MediaScanner.java
index 02f3902..51e715d 100644
--- a/media/java/android/media/MediaScanner.java
+++ b/media/java/android/media/MediaScanner.java
@@ -46,7 +46,6 @@ import android.sax.Element;
 import android.sax.ElementListener;
 import android.sax.RootElement;
 import android.text.TextUtils;
-import android.util.Config;
 import android.util.Log;
 import android.util.Xml;
 
@@ -1082,7 +1081,7 @@ public class MediaScanner
             }
 
             for (String fileToDelete : existingFiles) {
-                if (Config.LOGV)
+                if (false)
                     Log.v(TAG, "fileToDelete is " + fileToDelete);
                 try {
                     (new File(fileToDelete)).delete();
@@ -1200,7 +1199,7 @@ public class MediaScanner
             postscan(directories);
             long end = System.currentTimeMillis();
 
-            if (Config.LOGD) {
+            if (false) {
                 Log.d(TAG, " prescan time: " + (prescan - start) + "ms\n");
                 Log.d(TAG, "    scan time: " + (scan - prescan) + "ms\n");
                 Log.d(TAG, "postscan time: " + (end - scan) + "ms\n");
diff --git a/media/java/android/media/MediaScannerConnection.java b/media/java/android/media/MediaScannerConnection.java
index 503b5f4..969da39 100644
--- a/media/java/android/media/MediaScannerConnection.java
+++ b/media/java/android/media/MediaScannerConnection.java
@@ -25,7 +25,6 @@ import android.media.IMediaScannerService;
 import android.net.Uri;
 import android.os.IBinder;
 import android.os.RemoteException;
-import android.util.Config;
 import android.util.Log;
 
 
@@ -126,13 +125,13 @@ public class MediaScannerConnection implements ServiceConnection {
     public void disconnect() {
         synchronized (this) {
             if (mConnected) {
-                if (Config.LOGV) {
+                if (false) {
                     Log.v(TAG, "Disconnecting from Media Scanner");
                 }
                 try {
                     mContext.unbindService(this);
                 } catch (IllegalArgumentException ex) {
-                    if (Config.LOGV) {
+                    if (false) {
                         Log.v(TAG, "disconnect failed: " + ex);
                     }
                 }
@@ -164,12 +163,12 @@ public class MediaScannerConnection implements ServiceConnection {
                 throw new IllegalStateException("not connected to MediaScannerService");
             }
             try {
-                if (Config.LOGV) {
+                if (false) {
                     Log.v(TAG, "Scanning file " + path);
                 }
                 mService.requestScanFile(path, mimeType, mListener);
             } catch (RemoteException e) {
-                if (Config.LOGD) {
+                if (false) {
                     Log.d(TAG, "Failed to scan file " + path);
                 }
             }
@@ -240,7 +239,7 @@ public class MediaScannerConnection implements ServiceConnection {
      * Part of the ServiceConnection interface.  Do not call.
      */
     public void onServiceConnected(ComponentName className, IBinder service) {
-        if (Config.LOGV) {
+        if (false) {
             Log.v(TAG, "Connected to Media Scanner");
         }
         synchronized (this) {
@@ -255,7 +254,7 @@ public class MediaScannerConnection implements ServiceConnection {
      * Part of the ServiceConnection interface.  Do not call.
      */
     public void onServiceDisconnected(ComponentName className) {
-        if (Config.LOGV) {
+        if (false) {
             Log.v(TAG, "Disconnected from Media Scanner");
         }
         synchronized (this) {
diff --git a/media/java/android/media/ResampleInputStream.java b/media/java/android/media/ResampleInputStream.java
index e26eae5..b025e25 100644
--- a/media/java/android/media/ResampleInputStream.java
+++ b/media/java/android/media/ResampleInputStream.java
@@ -16,7 +16,6 @@
 
 package android.media;
 
-import android.util.Config;
 import android.util.Log;
 
 import java.io.InputStream;
diff --git a/media/tests/SoundPoolTest/src/com/android/SoundPoolTest.java b/media/tests/SoundPoolTest/src/com/android/SoundPoolTest.java
index df1b375..33db2dd 100644
--- a/media/tests/SoundPoolTest/src/com/android/SoundPoolTest.java
+++ b/media/tests/SoundPoolTest/src/com/android/SoundPoolTest.java
@@ -28,7 +28,6 @@ import android.media.AudioSystem;
 import android.media.AudioManager;
 import android.media.SoundPool;
 import android.media.SoundPool.OnLoadCompleteListener;
-import android.util.Config;
 import android.util.Log;
 import java.util.HashMap;
 import java.lang.Math;