Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change 1677 into donut

Browse Source 
* changes:
  Findbugs fixes.
This commit is contained in:
Android (Google) Code Review
2009-05-14 13:30:58 -07:00
parent 2a5cfe5192 d282ac8610
commit 109b21bab5
3 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
media/java/android/media/AudioManager.java
View File

@@ -39,11 +39,6 @@ public class AudioManager {
private final Context mContext; private final Context mContext;
private final Handler mHandler; 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 String TAG = "AudioManager";
private static boolean DEBUG = false; private static boolean DEBUG = false;
private static boolean localLOGV = DEBUG || android.util.Config.LOGV; private static boolean localLOGV = DEBUG || android.util.Config.LOGV;

4
media/java/android/media/MediaFile.java
View File

@@ -31,7 +31,7 @@ import java.util.Iterator;
*/ */
public class MediaFile { public class MediaFile {
// comma separated list of all file extensions supported by the media scanner // comma separated list of all file extensions supported by the media scanner
public static String sFileExtensions; public final static String sFileExtensions;
// Audio file types // Audio file types
public static final int FILE_TYPE_MP3 = 1; public static final int FILE_TYPE_MP3 = 1;
@@ -93,7 +93,7 @@ public class MediaFile {
= new HashMap<String, Integer>(); = new HashMap<String, Integer>();
static void addFileType(String extension, int fileType, String mimeType) { static void addFileType(String extension, int fileType, String mimeType) {
sFileTypeMap.put(extension, new MediaFileType(fileType, mimeType)); sFileTypeMap.put(extension, new MediaFileType(fileType, mimeType));
sMimeTypeMap.put(mimeType, new Integer(fileType)); sMimeTypeMap.put(mimeType, Integer.valueOf(fileType));
} }
static { static {
addFileType("MP3", FILE_TYPE_MP3, "audio/mpeg"); addFileType("MP3", FILE_TYPE_MP3, "audio/mpeg");

4
media/java/android/media/SoundPool.java
View File

@@ -149,7 +149,9 @@ public class SoundPool
fd.close(); fd.close();
} }
} }
} catch (java.io.IOException e) {} } catch (java.io.IOException e) {
Log.d(TAG, "error loading " + path);
}
return id; return id;
} }