Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bdb38c14 authored by Chih-Chung Chang's avatar Chih-Chung Chang Committed by Android (Google) Code Review
Browse files

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

parents 43e7972f 02dd17da

core/java/android/widget/MediaController.java

+2 −5
Original line number Diff line number Diff line
@@ -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() {