Android improvements:

runtime/embedders/openglui/android/android_sound_handler.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "embedders/openglui/android/android_sound_handler.h"
 
 #include "embedders/openglui/android/android_resource.h"
 #include "embedders/openglui/common/log.h"
 
 AndroidSoundHandler::AndroidSoundHandler(android_app* application)
@@ skipping 37 matching lines @@
         }
       }
     }
   }
   LOGI("Failed to start SoundService");
   Stop();
   return -1;
 }
 
 void AndroidSoundHandler::Stop() {
-  StopBackground();
-  if (output_mix_ != NULL) {
-    (*output_mix_)->Destroy(output_mix_);
-    output_mix_ = NULL;
-  }
-  if (engine_ != NULL) {
-    (*engine_)->Destroy(engine_);
-    engine_ = NULL;
-    engine_if_ = NULL;
-  }
+  LOGI("Stopping SoundService");
   if (sample_player_ != NULL) {
+    LOGI("Destroying sample player");
     (*sample_player_)->Destroy(sample_player_);
     sample_player_ = NULL;
     sample_player_if_ = NULL;
     sample_player_queue_ = NULL;
   }
   samples_.clear();
+  if (output_mix_ != NULL) {
+    LOGI("Destroying output mix");
+    (*output_mix_)->Destroy(output_mix_);
+    output_mix_ = NULL;
+  }
+  if (engine_ != NULL) {
+    LOGI("Destroying engine");
+    (*engine_)->Destroy(engine_);
+    engine_ = NULL;
+    engine_if_ = NULL;
+  }
+}
+
+int32_t AndroidSoundHandler::SetBackgroundPlayerState(int state) {
+  if (background_player_if_ != NULL) {
+    SLuint32 state;
+    (*background_player_)->GetState(background_player_, &state);
+    if (state == SL_OBJECT_STATE_REALIZED) {
+      (*background_player_if_)->SetPlayState(background_player_if_,
+                                             state);
+      return 0;
+    }
+  }
+  return -1;
+}
+
+int32_t AndroidSoundHandler::Pause() {
+  return SetBackgroundPlayerState(SL_PLAYSTATE_PAUSED);
+}
+
+
+int32_t AndroidSoundHandler::Resume() {
+  return SetBackgroundPlayerState(SL_PLAYSTATE_PLAYING);
 }
 
 int32_t AndroidSoundHandler::CreateAudioPlayer(SLEngineItf engine_if,
                                         const SLInterfaceID extra_if,
                                         SLDataSource data_source,
                                         SLDataSink data_sink,
                                         SLObjectItf& player_out,
                                         SLPlayItf& player_if_out) {
   const SLuint32 SoundPlayerIIDCount = 2;
   const SLInterfaceID SoundPlayerIIDs[] = { SL_IID_PLAY, extra_if };
@@ skipping 79 matching lines @@
           SetPlayState(background_player_if_, SL_PLAYSTATE_PLAYING) !=
           SL_RESULT_SUCCESS) {
     LOGE("Couldn't start playing");
     return -1;
   }
   LOGI("Started playing");
   return 0;
 }
 
 void AndroidSoundHandler::StopBackground() {
-  if (background_player_if_ != NULL) {
-    SLuint32 state;
-    (*background_player_)->GetState(background_player_, &state);
-    if (state == SL_OBJECT_STATE_REALIZED) {
-      (*background_player_if_)->SetPlayState(background_player_if_,
-                                           SL_PLAYSTATE_PAUSED);
-
-      (*background_player_)->Destroy(background_player_);
-      background_player_ = NULL;
-      background_player_if_ = NULL;
-      background_player_seek_if_ = NULL;
-    }
+  if (Pause() == 0) {
+    (*background_player_)->Destroy(background_player_);
+    background_player_ = NULL;
+    background_player_if_ = NULL;
+    background_player_seek_if_ = NULL;
   }
 }
 
 int32_t AndroidSoundHandler::StartSamplePlayer() {
   SLDataLocator_AndroidSimpleBufferQueue data_locator_in = {
     SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE,
     1
   };
 
   SLDataFormat_PCM data_format= {
@@ skipping 53 matching lines @@
           return 0;
         }
         LOGE("Enqueueing sample failed");
       }
     }
   }
   return -1;
 }