aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/com
diff options
context:
space:
mode:
authorAng Li <angli@google.com>2017-07-14 09:53:33 -0700
committerGitHub <noreply@github.com>2017-07-14 09:53:33 -0700
commit80d6246f4e0f5dc75fc3d9fdf3db1d4c203ccd85 (patch)
treef51f9b690fa980b04a1fac6360f8c4cf97e6bff5 /src/main/java/com
parentfd5d5cc78ac7814a1e986ee29e8769db277fbc94 (diff)
downloadmobly-bundled-snippets-80d6246f4e0f5dc75fc3d9fdf3db1d4c203ccd85.tar.gz
Run linter on MediaSnippet. (#67)
Diffstat (limited to 'src/main/java/com')
-rw-r--r--src/main/java/com/google/android/mobly/snippet/bundled/MediaSnippet.java60
1 files changed, 29 insertions, 31 deletions
diff --git a/src/main/java/com/google/android/mobly/snippet/bundled/MediaSnippet.java b/src/main/java/com/google/android/mobly/snippet/bundled/MediaSnippet.java
index ee2a214..58b38ac 100644
--- a/src/main/java/com/google/android/mobly/snippet/bundled/MediaSnippet.java
+++ b/src/main/java/com/google/android/mobly/snippet/bundled/MediaSnippet.java
@@ -16,7 +16,6 @@
package com.google.android.mobly.snippet.bundled;
-
import android.media.AudioAttributes;
import android.media.AudioManager;
import android.media.MediaPlayer;
@@ -29,40 +28,39 @@ import java.io.IOException;
/* Snippet class to control media playback. */
public class MediaSnippet implements Snippet {
- private final MediaPlayer mPlayer;
+ private final MediaPlayer mPlayer;
- public MediaSnippet() {
- mPlayer = new MediaPlayer();
- }
+ public MediaSnippet() {
+ mPlayer = new MediaPlayer();
+ }
- @Rpc(description = "Resets snippet media player to an idle state, regardless of current state.")
- public void mediaReset() {
- mPlayer.reset();
- }
+ @Rpc(description = "Resets snippet media player to an idle state, regardless of current state.")
+ public void mediaReset() {
+ mPlayer.reset();
+ }
- @Rpc(description = "Play an audio file stored at a specified file path in external storage.")
- public void mediaPlayAudioFile(String mediaFilePath) throws IOException {
- mediaReset();
- if (Build.VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP) {
- mPlayer.setAudioAttributes(
- new AudioAttributes.Builder()
- .setContentType(AudioAttributes.CONTENT_TYPE_MUSIC)
- .setUsage(AudioAttributes.USAGE_MEDIA)
- .build()
- );
- } else {
- mPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC);
+ @Rpc(description = "Play an audio file stored at a specified file path in external storage.")
+ public void mediaPlayAudioFile(String mediaFilePath) throws IOException {
+ mediaReset();
+ if (Build.VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP) {
+ mPlayer.setAudioAttributes(
+ new AudioAttributes.Builder()
+ .setContentType(AudioAttributes.CONTENT_TYPE_MUSIC)
+ .setUsage(AudioAttributes.USAGE_MEDIA)
+ .build());
+ } else {
+ mPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC);
+ }
+ mPlayer.setDataSource(mediaFilePath);
+ mPlayer.prepare(); // Synchronous call blocks until the player is ready for playback.
+ mPlayer.start();
}
- mPlayer.setDataSource(mediaFilePath);
- mPlayer.prepare(); // Synchronous call blocks until the player is ready for playback.
- mPlayer.start();
- }
- @Rpc(description = "Stops media playback.")
- public void mediaStop() throws IOException {
- mPlayer.stop();
- }
+ @Rpc(description = "Stops media playback.")
+ public void mediaStop() throws IOException {
+ mPlayer.stop();
+ }
- @Override
- public void shutdown() {}
+ @Override
+ public void shutdown() {}
}