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

* commit 'bdb38c14b920474552c310001cd267f5a6ba81eb': Fix 5389072: NPE in MediaController.updateFloatingWindowLayout().
2011-09-28 22:15:39 -07:00
parent 008a34b980 bdb38c14b9
commit 73fdc6c3f1
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() {