Merge "Fix nullpointer in updateContent"

            try {

                uploadToCanvas(canvas);

            } catch (RuntimeException e) {

                mContentValid = true;

                mContentValid = false;

                e.printStackTrace();

            }

        } else if (!mContentValid) {

            Bitmap bitmap = getBitmap();

            if (bitmap != null) {

                int format = GLUtils.getInternalFormat(bitmap);

                int type = GLUtils.getType(bitmap);

                canvas.texSubImage2D(this, mBorder, mBorder, bitmap, format, type);

                freeBitmap();

                mContentValid = true;

            } else {

                mContentValid = false;

            }

        }

    }