Merge "Fix 5389072: NPE in MediaController.updateFloatingWindowLayout()."

This commit is contained in:
Chih-Chung Chang
2011-09-28 22:14:06 -07:00
committed by Android (Google) Code Review

View File

@@ -113,15 +113,12 @@ public class MediaController extends FrameLayout {
super(context); super(context);
mContext = context; mContext = context;
mUseFastForward = useFastForward; mUseFastForward = useFastForward;
initFloatingWindowLayout();
initFloatingWindow(); initFloatingWindow();
} }
public MediaController(Context context) { public MediaController(Context context) {
super(context); this(context, true);
mContext = context;
mUseFastForward = true;
initFloatingWindow();
initFloatingWindowLayout();
} }
private void initFloatingWindow() { private void initFloatingWindow() {