summaryrefslogtreecommitdiff
path: root/library/main/src
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2017-05-31 21:12:18 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-05-31 21:12:20 +0000
commit5e12def0e205065561e1e64c849bcc7e1df2cccb (patch)
tree70ab56d38ba83f10bddc0017398fb353ec20ea0f /library/main/src
parent198bd0ddb15ad479e0d0d7214645a3c067f271a1 (diff)
parentffb2d8f2de805c6e717053caef48db1839e00d64 (diff)
downloadsetupwizard-5e12def0e205065561e1e64c849bcc7e1df2cccb.tar.gz
Merge "Make IllustrationVideoView's MediaPlayer protected"
Diffstat (limited to 'library/main/src')
-rw-r--r--library/main/src/com/android/setupwizardlib/view/IllustrationVideoView.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/library/main/src/com/android/setupwizardlib/view/IllustrationVideoView.java b/library/main/src/com/android/setupwizardlib/view/IllustrationVideoView.java
index 6ca31bb..9f1d2e7 100644
--- a/library/main/src/com/android/setupwizardlib/view/IllustrationVideoView.java
+++ b/library/main/src/com/android/setupwizardlib/view/IllustrationVideoView.java
@@ -53,7 +53,7 @@ public class IllustrationVideoView extends TextureView implements Animatable,
protected float mAspectRatio = 1.0f; // initial guess until we know
- @VisibleForTesting MediaPlayer mMediaPlayer;
+ protected MediaPlayer mMediaPlayer;
private @RawRes int mVideoResId = 0;