summaryrefslogtreecommitdiffstats
path: root/core/java/android/widget/MediaController.java
diff options
context:
space:
mode:
authorChih-Chung Chang <chihchung@google.com>2011-09-29 12:49:04 +0800
committerChih-Chung Chang <chihchung@google.com>2011-09-29 12:49:04 +0800
commit02dd17da3685652b5235ca48bd6882e65997434a (patch)
treec8746fc03a737d05f46c208f1b7c1a9b59ac60f7 /core/java/android/widget/MediaController.java
parenta53d19dc6dc25e00c898fc7e53276b864ea91936 (diff)
downloadframeworks_base-02dd17da3685652b5235ca48bd6882e65997434a.zip
frameworks_base-02dd17da3685652b5235ca48bd6882e65997434a.tar.gz
frameworks_base-02dd17da3685652b5235ca48bd6882e65997434a.tar.bz2
Fix 5389072: NPE in MediaController.updateFloatingWindowLayout().
There was another constructor which we didn't add the call to initialize the layout. Change-Id: I1519c9afd7d6333736fe19d256f55a2f4cdc60c3
Diffstat (limited to 'core/java/android/widget/MediaController.java')
-rw-r--r--core/java/android/widget/MediaController.java7
1 files changed, 2 insertions, 5 deletions
diff --git a/core/java/android/widget/MediaController.java b/core/java/android/widget/MediaController.java
index 90ece5d..f2ea3fc 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() {