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

Merge \"Fix disabling lockscreen for demo users.\" into nyc-mr1-dev

Browse Source 
am: 407fd1ea62

Change-Id: I5625a9ef9fd35ee0cbf6cad7651f7a39eee8f059
This commit is contained in:
Sudheer Shanka
2016-07-13 23:15:03 +00:00
committed by android-build-merger
parent cacf91e466 407fd1ea62
commit 3b098778c6
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
media/java/android/media/MediaPlayer.java
View File

@@ -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);