diff options
| author | Thomas Martitz <kugel@rockbox.org> | 2011-08-14 08:55:16 +0000 |
|---|---|---|
| committer | Thomas Martitz <kugel@rockbox.org> | 2011-08-14 08:55:16 +0000 |
| commit | c6ca81329ab260699013a5a5ed99c0e7549cd94e (patch) | |
| tree | 3032fc3ed44cc0f0a4427b817f70066df9b3ad4f /android | |
| parent | 5c6fe5da9c9676005f55e12aa9da867678ff8e5c (diff) | |
Android: Fix a few java warnings. Upgrade ndk platform to 2.0 (don't support 1.6 anymore).
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30293 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'android')
| -rw-r--r-- | android/AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | android/src/org/rockbox/RockboxPCM.java | 5 | ||||
| -rw-r--r-- | android/src/org/rockbox/monitors/HeadphoneMonitor.java | 2 |
3 files changed, 2 insertions, 7 deletions
diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml index c32f76c0d0..fa4f494288 100644 --- a/android/AndroidManifest.xml +++ b/android/AndroidManifest.xml @@ -80,7 +80,7 @@ </application> - <uses-sdk android:minSdkVersion="4" /> + <uses-sdk android:minSdkVersion="11" /> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"></uses-permission> <uses-permission android:name="android.permission.READ_PHONE_STATE"></uses-permission> </manifest> diff --git a/android/src/org/rockbox/RockboxPCM.java b/android/src/org/rockbox/RockboxPCM.java index 5ed2a9050d..f77bf3bb8f 100644 --- a/android/src/org/rockbox/RockboxPCM.java +++ b/android/src/org/rockbox/RockboxPCM.java @@ -138,15 +138,13 @@ public class RockboxPCM extends AudioTrack /* 1 sample is 2 bytes, 2 samples are 1 frame */ return (bytes/4); } - - @SuppressWarnings("unused") + private int frames2bytes(int frames) { /* 1 frame is 2 samples, 1 sample is 2 bytes */ return (frames*4); } - @SuppressWarnings("unused") private void play_pause(boolean pause) { RockboxService service = RockboxService.get_instance(); @@ -204,7 +202,6 @@ public class RockboxPCM extends AudioTrack return super.setStereoVolume(leftVolume, rightVolume); } - @SuppressWarnings("unused") private void set_volume(int volume) { Logger.d("java:set_volume("+volume+")"); diff --git a/android/src/org/rockbox/monitors/HeadphoneMonitor.java b/android/src/org/rockbox/monitors/HeadphoneMonitor.java index 72a2f262f2..6b58b1dd80 100644 --- a/android/src/org/rockbox/monitors/HeadphoneMonitor.java +++ b/android/src/org/rockbox/monitors/HeadphoneMonitor.java @@ -28,8 +28,6 @@ import android.content.IntentFilter; public class HeadphoneMonitor extends BroadcastReceiver { - @SuppressWarnings("unused") - public HeadphoneMonitor(Context c) { IntentFilter hpFilter = new IntentFilter(Intent.ACTION_HEADSET_PLUG); |