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

Commit 18a38b9f authored by James Dong's avatar James Dong Committed by Android (Google) Code Review
Browse files

Merge "Removed obsolete opencore related comments"

parents 7784d151 7ae82ce1

media/java/android/media/MediaPlayer.java

+0 −2
Original line number Original line Diff line number Diff line
@@ -1883,8 +1883,6 @@ public class MediaPlayer 
              return;

              return;





            case MEDIA_ERROR:

            case MEDIA_ERROR:

                // For PV specific error values (msg.arg2) look in

                // opencore/pvmi/pvmf/include/pvmf_return_codes.h

                Log.e(TAG, "Error (" + msg.arg1 + "," + msg.arg2 + ")");

                Log.e(TAG, "Error (" + msg.arg1 + "," + msg.arg2 + ")");

                boolean error_was_handled = false;

                boolean error_was_handled = false;

                if (mOnErrorListener != null) {

                if (mOnErrorListener != null) {

media/java/android/media/MediaScanner.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -75,7 +75,7 @@ import libcore.io.Libcore; 
 * - the processDirectory() JNI method wraps the provided mediascanner client in a native

 * - the processDirectory() JNI method wraps the provided mediascanner client in a native

 *   'MyMediaScannerClient' class, then calls processDirectory() on the native MediaScanner

 *   'MyMediaScannerClient' class, then calls processDirectory() on the native MediaScanner

 *   object (which got created when the Java MediaScanner was created).

 *   object (which got created when the Java MediaScanner was created).

 * - native MediaScanner.processDirectory() (currently part of opencore) calls

 * - native MediaScanner.processDirectory() calls

 *   doProcessDirectory(), which recurses over the folder, and calls

 *   doProcessDirectory(), which recurses over the folder, and calls

 *   native MyMediaScannerClient.scanFile() for every file whose extension matches.

 *   native MyMediaScannerClient.scanFile() for every file whose extension matches.

 * - native MyMediaScannerClient.scanFile() calls back on Java MediaScannerClient.scanFile,

 * - native MyMediaScannerClient.scanFile() calls back on Java MediaScannerClient.scanFile,