Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 109b21ba authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 1677 into donut

* changes:
  Findbugs fixes.
parents 2a5cfe51 d282ac86
Loading
Loading
Loading
Loading
+0 −5
Original line number Diff line number Diff line
@@ -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;
+2 −2
Original line number Diff line number Diff line
@@ -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");
+3 −1
Original line number Diff line number Diff line
@@ -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;
    }