From 02dd17da3685652b5235ca48bd6882e65997434a Mon Sep 17 00:00:00 2001 From: Chih-Chung Chang Date: Thu, 29 Sep 2011 12:49:04 +0800 Subject: [PATCH] Fix 5389072: NPE in MediaController.updateFloatingWindowLayout(). There was another constructor which we didn't add the call to initialize the layout. Change-Id: I1519c9afd7d6333736fe19d256f55a2f4cdc60c3 --- core/java/android/widget/MediaController.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/core/java/android/widget/MediaController.java b/core/java/android/widget/MediaController.java index 90ece5d7207e8..f2ea3fc1d6d2c 100644 --- 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() {