}
public void unregisterMediaController(MediaController mediaController) {
- if (mService.getMediaController() == mediaController) {
+ if (mediaController != null && mediaController == mService.getMediaController()) {
mService.setMediaContoller(null);
}