summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorMarco Nelissen <marcone@google.com>2009-05-14 13:18:16 -0700
committerMarco Nelissen <marcone@google.com>2009-05-14 13:18:16 -0700
commitd282ac8610f72d964105efefe41120a5340f1ce0 (patch)
treeeae769ab0c257ebaf722421a6ea76f6d8afb0a4f /media
parent4a8fb93f5e320f5bd5c1dd272339ae499e4b4ec4 (diff)
downloadframeworks_base-d282ac8610f72d964105efefe41120a5340f1ce0.zip
frameworks_base-d282ac8610f72d964105efefe41120a5340f1ce0.tar.gz
frameworks_base-d282ac8610f72d964105efefe41120a5340f1ce0.tar.bz2
Findbugs fixes.
Diffstat (limited to 'media')
-rw-r--r--media/java/android/media/AudioManager.java5
-rw-r--r--media/java/android/media/MediaFile.java4
-rw-r--r--media/java/android/media/SoundPool.java4
3 files changed, 5 insertions, 8 deletions
diff --git a/media/java/android/media/AudioManager.java b/media/java/android/media/AudioManager.java
index e43c9c4..cfdf5e3 100644
--- a/media/java/android/media/AudioManager.java
+++ b/media/java/android/media/AudioManager.java
@@ -39,11 +39,6 @@ public class AudioManager {
private final Context mContext;
private final Handler mHandler;
- // used to listen for updates to the sound effects settings so we don't
- // poll it for every UI sound
- private ContentObserver mContentObserver;
-
-
private static String TAG = "AudioManager";
private static boolean DEBUG = false;
private static boolean localLOGV = DEBUG || android.util.Config.LOGV;
diff --git a/media/java/android/media/MediaFile.java b/media/java/android/media/MediaFile.java
index f05842d..8be11df 100644
--- a/media/java/android/media/MediaFile.java
+++ b/media/java/android/media/MediaFile.java
@@ -31,7 +31,7 @@ import java.util.Iterator;
*/
public class MediaFile {
// comma separated list of all file extensions supported by the media scanner
- public static String sFileExtensions;
+ public final static String sFileExtensions;
// Audio file types
public static final int FILE_TYPE_MP3 = 1;
@@ -93,7 +93,7 @@ public class MediaFile {
= new HashMap<String, Integer>();
static void addFileType(String extension, int fileType, String mimeType) {
sFileTypeMap.put(extension, new MediaFileType(fileType, mimeType));
- sMimeTypeMap.put(mimeType, new Integer(fileType));
+ sMimeTypeMap.put(mimeType, Integer.valueOf(fileType));
}
static {
addFileType("MP3", FILE_TYPE_MP3, "audio/mpeg");
diff --git a/media/java/android/media/SoundPool.java b/media/java/android/media/SoundPool.java
index b13c2e6..3803d9d 100644
--- a/media/java/android/media/SoundPool.java
+++ b/media/java/android/media/SoundPool.java
@@ -149,7 +149,9 @@ public class SoundPool
fd.close();
}
}
- } catch (java.io.IOException e) {}
+ } catch (java.io.IOException e) {
+ Log.d(TAG, "error loading " + path);
+ }
return id;
}