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

Commit 7a963e18 authored by Wei Jia's avatar Wei Jia Committed by android-build-merger
Browse files

Merge \\"Fix disabling lockscreen for demo users.\\" into nyc-mr1-dev am: 407fd1ea 

am: 3b098778

Change-Id: I66a5393837e3ec0286be28f766a603da844ce6fc
parents 5817a9d6 3b098778

media/java/android/media/MediaPlayer.java

+1 −1
Original line number Diff line number Diff line
@@ -3494,7 +3494,7 @@ public class MediaPlayer extends PlayerBase 
         * @param extra an extra code, specific to the info. Typically

         * implementation dependent.

         * @return True if the method handled the info, false if it didn't.

         * Returning false, or not having an OnErrorListener at all, will

         * Returning false, or not having an OnInfoListener at all, will

         * cause the info to be discarded.

         */

        boolean onInfo(MediaPlayer mp, int what, int extra);