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

2011-09-28 22:14:06 -07:00
parent 43e7972f41 02dd17da36
commit bdb38c14b9
1 changed files with 2 additions and 5 deletions
--- a/core/java/android/widget/MediaController.java
+++ b/core/java/android/widget/MediaController.java
@@ -113,15 +113,12 @@ public class MediaController extends FrameLayout {
        super(context);
        mContext = context;
        mUseFastForward = useFastForward;
+        initFloatingWindowLayout();
        initFloatingWindow();
    }

    public MediaController(Context context) {
-        super(context);
-        mContext = context;
-        mUseFastForward = true;
-        initFloatingWindow();
-        initFloatingWindowLayout();
+        this(context, true);
    }

    private void initFloatingWindow() {