diff --git a/libvlc/src/org/videolan/libvlc/media/VideoView.java b/libvlc/src/org/videolan/libvlc/media/VideoView.java index 6a16bca876dfc28fb9a050a13d7a680ed00736c2..d3ba4b1d6e8e6d341d75598769c1138acc996b48 100644 --- a/libvlc/src/org/videolan/libvlc/media/VideoView.java +++ b/libvlc/src/org/videolan/libvlc/media/VideoView.java @@ -146,7 +146,6 @@ public class VideoView extends SurfaceView public void stopPlayback() { } - @TargetApi(Build.VERSION_CODES.FROYO) public void suspend() { } diff --git a/libvlc/src/org/videolan/libvlc/util/VLCUtil.java b/libvlc/src/org/videolan/libvlc/util/VLCUtil.java index faf565008ce56551141b6ccd1e396a90cf48767e..3819a93ce27e0f7708807684cf419aca1a86815e 100644 --- a/libvlc/src/org/videolan/libvlc/util/VLCUtil.java +++ b/libvlc/src/org/videolan/libvlc/util/VLCUtil.java @@ -59,13 +59,10 @@ public class VLCUtil { } @SuppressWarnings("deprecation") - @TargetApi(Build.VERSION_CODES.FROYO) public static String[] getABIList() { - final boolean hasABI2 = Build.VERSION.SDK_INT >= Build.VERSION_CODES.FROYO; - final String[] abis = new String[hasABI2 ? 2 : 1]; + final String[] abis = new String[2]; abis[0] = android.os.Build.CPU_ABI; - if (hasABI2) - abis[1] = android.os.Build.CPU_ABI2; + abis[1] = android.os.Build.CPU_ABI2; return abis; } diff --git a/vlc-android/src/org/videolan/vlc/PlaybackService.java b/vlc-android/src/org/videolan/vlc/PlaybackService.java index 72de1be6470345b8b9694d28c289e2f2b5918820..77d22efaa0fc88e9c9aa51e960fa7c84042413ac 100644 --- a/vlc-android/src/org/videolan/vlc/PlaybackService.java +++ b/vlc-android/src/org/videolan/vlc/PlaybackService.java @@ -325,7 +325,6 @@ public class PlaybackService extends Service implements IVLCVout.Callback { private final OnAudioFocusChangeListener mAudioFocusListener = createOnAudioFocusChangeListener(); - @TargetApi(Build.VERSION_CODES.FROYO) private OnAudioFocusChangeListener createOnAudioFocusChangeListener() { return new OnAudioFocusChangeListener() { private boolean mLossTransient = false; @@ -377,7 +376,6 @@ public class PlaybackService extends Service implements IVLCVout.Callback { }; } - @TargetApi(Build.VERSION_CODES.FROYO) private void changeAudioFocus(boolean acquire) { final AudioManager am = (AudioManager)getSystemService(AUDIO_SERVICE); if (am == null) @@ -394,7 +392,7 @@ public class PlaybackService extends Service implements IVLCVout.Callback { } } else { if (mHasAudioFocus) { - final int result = am.abandonAudioFocus(mAudioFocusListener); + am.abandonAudioFocus(mAudioFocusListener); am.setParameters("bgm_state=false"); mHasAudioFocus = false; } diff --git a/vlc-android/src/org/videolan/vlc/gui/MainActivity.java b/vlc-android/src/org/videolan/vlc/gui/MainActivity.java index 245da9367588a31957c5b70e4d719a61939953bd..a2cc75b885a47c504b43e1bb468e04f61f4f5619 100644 --- a/vlc-android/src/org/videolan/vlc/gui/MainActivity.java +++ b/vlc-android/src/org/videolan/vlc/gui/MainActivity.java @@ -92,7 +92,6 @@ import org.videolan.vlc.media.MediaDatabase; import org.videolan.vlc.media.MediaLibrary; import org.videolan.vlc.media.MediaUtils; import org.videolan.vlc.util.Permissions; -import org.videolan.vlc.util.Util; import org.videolan.vlc.util.VLCInstance; import org.videolan.vlc.util.WeakHandler; @@ -521,7 +520,6 @@ public class MainActivity extends AudioPlayerContainerActivity implements Filter /** Create menu from XML */ - @TargetApi(Build.VERSION_CODES.FROYO) @Override public boolean onCreateOptionsMenu(Menu menu) { mMenu = menu; 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 eb4390a570c331528b6370c94833c37f9e00d3dc..11f24bc8ee9546323562b479da74d345c2bdff45 100644 --- a/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java +++ b/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java @@ -689,7 +689,6 @@ public class VideoPlayerActivity extends AppCompatActivity implements IVLCVout.C mHelper.onStop(); } - @TargetApi(android.os.Build.VERSION_CODES.FROYO) private void restoreBrightness() { if (mRestoreAutoBrightness != -1f) { int brightness = (int) (mRestoreAutoBrightness*255f); @@ -3072,15 +3071,11 @@ public class VideoPlayerActivity extends AppCompatActivity implements IVLCVout.C private int getScreenRotation(){ WindowManager wm = (WindowManager) VLCApplication.getAppContext().getSystemService(Context.WINDOW_SERVICE); Display display = wm.getDefaultDisplay(); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.FROYO /* Android 2.2 has getRotation */) { - try { - Method m = display.getClass().getDeclaredMethod("getRotation"); - return (Integer) m.invoke(display); - } catch (Exception e) { - return Surface.ROTATION_0; - } - } else { - return display.getOrientation(); + try { + Method m = display.getClass().getDeclaredMethod("getRotation"); + return (Integer) m.invoke(display); + } catch (Exception e) { + return Surface.ROTATION_0; } } diff --git a/vlc-android/src/org/videolan/vlc/util/VLCInstance.java b/vlc-android/src/org/videolan/vlc/util/VLCInstance.java index d2ee1aad498b3ddc1a9a5bec959fc4029e1010ed..f978241f254e49d53157d2f90a659f2730da00d7 100644 --- a/vlc-android/src/org/videolan/vlc/util/VLCInstance.java +++ b/vlc-android/src/org/videolan/vlc/util/VLCInstance.java @@ -24,7 +24,6 @@ import android.app.Activity; import android.content.Context; import android.content.Intent; import android.content.res.AssetManager; -import android.os.Build; import android.util.Log; import org.videolan.libvlc.LibVLC; @@ -34,11 +33,6 @@ import org.videolan.vlc.VLCCrashHandler; import org.videolan.vlc.gui.CompatErrorActivity; import org.videolan.vlc.gui.NativeCrashActivity; -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStream; - public class VLCInstance { public final static String TAG = "VLC/UiTools/VLCInstance"; @@ -54,49 +48,6 @@ public class VLCInstance { } }; - public static void linkCompatLib(Context context) { - final File outDir = new File(context.getFilesDir(), "compat"); - if (!outDir.exists()) - outDir.mkdir(); - final File outFile = new File(outDir, "libcompat.7.so"); - - /* The file may had been already copied from the asset, try to load it */ - if (outFile.exists()) { - try { - System.load(outFile.getPath()); - return; - } catch (UnsatisfiedLinkError ule) { - /* the file can be invalid, try to copy it again */ - } - } - - /* copy libcompat.7.so from assert to a data dir */ - InputStream is = null; - FileOutputStream fos = null; - boolean success = false; - try { - is = VLCApplication.getAppResources().getAssets().open("libcompat.7.so"); - fos = new FileOutputStream(outFile); - final byte[] buffer = new byte[16*1024]; - int read; - while ((read = is.read(buffer)) != -1) - fos.write(buffer, 0, read); - success = true; - } catch (IOException e) { - } finally { - Util.close(is); - Util.close(fos); - } - - /* load the lib coming from the asset */ - if (success) { - try { - System.load(outFile.getPath()); - } catch (UnsatisfiedLinkError ule) { - } - } - } - /** A set of utility functions for the VLC application */ public synchronized static LibVLC get() throws IllegalStateException { if (sLibVLC == null) { @@ -107,10 +58,6 @@ public class VLCInstance { Log.e(TAG, VLCUtil.getErrorMsg()); throw new IllegalStateException("LibVLC initialisation failed: " + VLCUtil.getErrorMsg()); } - if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.FROYO) { - Log.w(TAG, "linking with true compat lib..."); - linkCompatLib(context); - } sLibVLC = new LibVLC(context, VLCOptions.getLibOptions()); LibVLC.setOnNativeCrashListener(new LibVLC.OnNativeCrashListener() {