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

Commit 4e6c1da4 authored by Teng-Hui Zhu's avatar Teng-Hui Zhu Committed by Android Git Automerger
Browse files

am 5a9bbc34: am b5141a9f: am 90bdb69b: Merge "fix one NPE when webChromeClient... 

am 5a9bbc34: am b5141a9f: am 90bdb69b: Merge "fix one NPE when webChromeClient don\'t have progress view support" into honeycomb-mr2

* commit '5a9bbc34':
  fix one NPE when webChromeClient don't have progress view support
parents 8b7eede0 5a9bbc34

core/java/android/webkit/HTML5VideoFullScreen.java

+6 −4
Original line number Original line Diff line number Diff line
@@ -318,11 +318,13 @@ public class HTML5VideoFullScreen extends HTML5VideoView 




    @Override

    @Override

    protected void switchProgressView(boolean playerBuffering) {

    protected void switchProgressView(boolean playerBuffering) {

        if (mProgressView != null) {

            if (playerBuffering) {

            if (playerBuffering) {

                mProgressView.setVisibility(View.VISIBLE);

                mProgressView.setVisibility(View.VISIBLE);

            } else {

            } else {

                mProgressView.setVisibility(View.GONE);

                mProgressView.setVisibility(View.GONE);

            }

            }

        }

        return;

        return;

    }

    }

}
 
}