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

Author: Chih-Chung Chang

core/java/android/widget/MediaController.java

@@ -113,15 +113,12 @@ public MediaController(Context context, boolean useFastForward) {
         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() {