[Android] Rename exit method

Geoffrey Métais git at videolan.org
Wed May 20 15:42:59 CEST 2015


vlc-ports/android | branch: master | Geoffrey Métais <geoffrey.metais at gmail.com> | Wed May 20 15:42:09 2015 +0200| [aa3072ec49667b9511b1c8059a430d00ee5d5c0f] | committer: Geoffrey Métais

Rename exit method

exit sounds like java System.exit()

> http://git.videolan.org/gitweb.cgi/vlc-ports/android.git/?a=commit;h=aa3072ec49667b9511b1c8059a430d00ee5d5c0f
---

 .../org/videolan/vlc/gui/video/VideoPlayerActivity.java    |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java b/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java
index a0fe143..52e0e08 100644
--- a/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java
+++ b/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java
@@ -893,7 +893,7 @@ public class VideoPlayerActivity extends AppCompatActivity implements IVideoPlay
                 mBattery.setText(String.format("%d%%", batteryLevel));
             }
             else if (action.equalsIgnoreCase(VLCApplication.SLEEP_INTENT)) {
-                exit();
+                exitOK();
             }
         }
     };
@@ -909,7 +909,7 @@ public class VideoPlayerActivity extends AppCompatActivity implements IVideoPlay
         finish();
     }
 
-    private void exit() {
+    private void exitOK() {
         exit(RESULT_OK);
     }
 
@@ -996,7 +996,7 @@ public class VideoPlayerActivity extends AppCompatActivity implements IVideoPlay
         } else if (BuildConfig.tv && mShowing && !mIsLocked) {
             hideOverlay(true);
         } else
-            exit();
+            exitOK();
     }
 
     @Override
@@ -1053,7 +1053,7 @@ public class VideoPlayerActivity extends AppCompatActivity implements IVideoPlay
             return true;
         case KeyEvent.KEYCODE_S:
         case KeyEvent.KEYCODE_MEDIA_STOP:
-            exit();
+            exitOK();
             return true;
         case KeyEvent.KEYCODE_DPAD_UP:
         case KeyEvent.KEYCODE_DPAD_DOWN:
@@ -1609,7 +1609,7 @@ public class VideoPlayerActivity extends AppCompatActivity implements IVideoPlay
         } else {
             /* Exit player when reaching the end */
             mEndReached = true;
-            exit();
+            exitOK();
         }
     }
 
@@ -1696,7 +1696,7 @@ public class VideoPlayerActivity extends AppCompatActivity implements IVideoPlay
             }
             startActivity(i);
         }
-        exit();
+        exitOK();
     }
 
     @TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR1)



More information about the Android mailing list