PD#146618: fix wrong next file index and add permission check before play

Change-Id: I09717a79478be721dd044b4e30286d25f6d9ad02

1 files changed, 5 insertions, 4 deletions

diff --git a/src/com/droidlogic/videoplayer/VideoPlayer.java b/src/com/droidlogic/videoplayer/VideoPlayer.java
index 9064c17..314cd32 100644
--- a/src/com/droidlogic/videoplayer/VideoPlayer.java
+++ b/src/com/droidlogic/videoplayer/VideoPlayer.java
@@ -2259,10 +2259,11 @@ public class VideoPlayer extends Activity {
         }
 
         private void playFile (String path) {
-            LOGI (TAG, "[playFile]resume mode:" + mOption.getResumeMode() + ",path:" + path);
-            if (mOption == null) {
+            if (mOption == null || path == null || !mPermissionGranted) {
                 return;
             }
+            LOGI(TAG, "[playFile]resume mode:" + mOption.getResumeMode() + ",path:" + path);
+
             resetVariate();
             if (mResumePlay.getEnable() == true) {
                 setVideoPath (path);
@@ -2371,7 +2372,7 @@ public class VideoPlayer extends Activity {
                 mStateBac = STATE_STOP;
                 mPath = mPlayList.moveprev();
                 //sendPlayFileMsg();
-                playFile(mPlayList.moveprev());
+                playFile(mPath);
             }
             else {
                 LOGI (TAG, "[playPrev]mState=STATE_PREPARING, error status do nothing only waitting");
@@ -2391,7 +2392,7 @@ public class VideoPlayer extends Activity {
                 mStateBac = STATE_STOP;
                 mPath = mPlayList.movenext();
                 //sendPlayFileMsg();
-                playFile(mPlayList.movenext());
+                playFile(mPath);
             }
             else {
                 LOGI (TAG, "[playNext]mState=STATE_PREPARING, error status do nothing only waitting");