Merge lp:~karni/ubuntuone-android-music/fix-music-stutter into lp:ubuntuone-android-music

[Michał Karnicki]

Hold high performance WiFi lock on devices with API >= 12 (HONEYCOMB_MR1), in case the screen is off and WiFi performance may decrease.

See:
http://developer.android.com/reference/android/net/wifi/WifiManager.html#WIFI_MODE_FULL_HIGH_PERF

[Chad Miller (cmiller)]

review: Approve

=== modified file 'project.properties'
--- project.properties	2012-03-02 19:31:24 +0000
+++ project.properties	2012-05-16 11:10:22 +0000
@@ -9,4 +9,4 @@
 
 android.library.reference.1=../../ubuntuone-android-sso/ubuntuone-android-sso
 # Project target.
-target=android-8
+target=android-12
 
=== modified file 'src/net/sourceforge/subsonic/androidapp/service/DownloadServiceImpl.java'
--- src/net/sourceforge/subsonic/androidapp/service/DownloadServiceImpl.java	2011-10-24 19:10:31 +0000
+++ src/net/sourceforge/subsonic/androidapp/service/DownloadServiceImpl.java	2012-05-16 11:10:22 +0000
@@ -159,7 +159,7 @@
         wakeLock.setReferenceCounted(false);
         
         WifiManager wm = (WifiManager)getSystemService(Context.WIFI_SERVICE);
-        wifiLock = wm.createWifiLock(this.getClass().getName());
+        wifiLock = wm.createWifiLock(Util.getWifiLockFlag(), this.getClass().getName());
         wifiLock.setReferenceCounted(false);
 
         instance = this;
 
=== modified file 'src/net/sourceforge/subsonic/androidapp/util/Util.java'
--- src/net/sourceforge/subsonic/androidapp/util/Util.java	2012-04-17 14:43:06 +0000
+++ src/net/sourceforge/subsonic/androidapp/util/Util.java	2012-05-16 11:10:22 +0000
@@ -65,7 +65,10 @@
 import android.media.AudioManager;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
+import android.net.wifi.WifiManager;
 import android.os.Build;
+import android.os.Build.VERSION;
+import android.os.Build.VERSION_CODES;
 import android.os.Environment;
 import android.os.Handler;
 import android.util.Log;
@@ -873,4 +876,17 @@
                 })
                 .show();
     }
+    
+    private static int wifiLockFlag = WifiManager.WIFI_MODE_FULL; 
+    
+    static {
+    	int sdk = Integer.valueOf(VERSION.SDK);
+    	if (sdk >= VERSION_CODES.HONEYCOMB_MR1) {
+    		wifiLockFlag = WifiManager.WIFI_MODE_FULL_HIGH_PERF;
+    	}
+    }
+    
+    public static int getWifiLockFlag() {
+    	return wifiLockFlag;
+    }
 }