From ec1fc92e37e32e19ac263b2063c36d64b083f64b Mon Sep 17 00:00:00 2001
From: Umair Javed <umair.javed66@gmail.com>
Date: Fri, 13 Jul 2018 13:24:36 +0500
Subject: [PATCH] Added initialisation checks in pcm audio service (#18934)

---
 cocos/audio/android/PcmAudioService.cpp | 17 ++++++++++++-----
 cocos/audio/android/PcmAudioService.h   |  1 +
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/cocos/audio/android/PcmAudioService.cpp b/cocos/audio/android/PcmAudioService.cpp
index 5866a29ec4..e6aa23c848 100644
--- a/cocos/audio/android/PcmAudioService.cpp
+++ b/cocos/audio/android/PcmAudioService.cpp
@@ -47,7 +47,7 @@ public:
 PcmAudioService::PcmAudioService(SLEngineItf engineItf, SLObjectItf outputMixObject)
         : _engineItf(engineItf), _outputMixObj(outputMixObject), _playObj(nullptr),
           _playItf(nullptr), _volumeItf(nullptr), _bufferQueueItf(nullptr), _numChannels(-1),
-          _sampleRate(-1), _bufferSizeInBytes(0), _controller(nullptr)
+          _sampleRate(-1), _bufferSizeInBytes(0), _controller(nullptr), _isInitialised(false)
 {
 }
 
@@ -175,19 +175,26 @@ bool PcmAudioService::init(AudioMixerController* controller, int numChannels, in
     r = (*_playItf)->SetPlayState(_playItf, SL_PLAYSTATE_PLAYING);
     SL_RETURN_VAL_IF_FAILED(r, false, "SetPlayState failed");
 
+    _isInitialised = true;
     return true;
 }
 
 void PcmAudioService::pause()
 {
-    SLresult r = (*_playItf)->SetPlayState(_playItf, SL_PLAYSTATE_PAUSED);
-    SL_RETURN_IF_FAILED(r, "PcmAudioService::pause failed");
+    if (_isInitialised)
+    {
+        SLresult r = (*_playItf)->SetPlayState(_playItf, SL_PLAYSTATE_PAUSED);
+        SL_RETURN_IF_FAILED(r, "PcmAudioService::pause failed");
+    }
 }
 
 void PcmAudioService::resume()
 {
-    SLresult r = (*_playItf)->SetPlayState(_playItf, SL_PLAYSTATE_PLAYING);
-    SL_RETURN_IF_FAILED(r, "PcmAudioService::resume failed");
+    if (_isInitialised)
+    {
+        SLresult r = (*_playItf)->SetPlayState(_playItf, SL_PLAYSTATE_PLAYING);
+        SL_RETURN_IF_FAILED(r, "PcmAudioService::resume failed");
+    }
 }
 
 }} // namespace cocos2d { namespace experimental {
diff --git a/cocos/audio/android/PcmAudioService.h b/cocos/audio/android/PcmAudioService.h
index ff9038bc99..27559f2c7f 100644
--- a/cocos/audio/android/PcmAudioService.h
+++ b/cocos/audio/android/PcmAudioService.h
@@ -71,6 +71,7 @@ private:
     int _numChannels;
     int _sampleRate;
     int _bufferSizeInBytes;
+    bool _isInitialised;
 
     AudioMixerController* _controller;