Merge "Merge remote-tracking branch 'remotes/quic/caf/github/master' into local"
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 28b95be..dd9cfc2 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -16,8 +16,8 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.dsi.ant.server"
- android:versionName="3.1.0"
- android:versionCode="030100"
+ android:versionName="3.1.1"
+ android:versionCode="030101"
android:sharedUserId="android.uid.system">
<uses-sdk
diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt
index 82df96b..9f4f8f4 100644
--- a/ReleaseNotes.txt
+++ b/ReleaseNotes.txt
@@ -1,6 +1,6 @@
AntHalService - Release Notes
-v3.1.0
-2013-07-19
+v3.1.1
+2013-11-18
Copyright 2011 Dynastream Innovations
@@ -27,6 +27,12 @@
=============================================================
2. REVISION HISTORY
+v.3.1.1: 2013-11-18 : Android_System_ANTHALService_3-1-0
+Improvement
+ [ANTDROID-2223] - Disable "Need BT On for ANT" logic by default
+
+-------------------------------------------------------------
+
v3.1.0 : 2013-07-19 : Android_System_ANTHALService_3-1-0
Task
diff --git a/src/com/dsi/ant/server/AntService.java b/src/com/dsi/ant/server/AntService.java
index 1ed828f..92e4e67 100644
--- a/src/com/dsi/ant/server/AntService.java
+++ b/src/com/dsi/ant/server/AntService.java
@@ -117,21 +117,7 @@
* Checks if Bluetooth needs to be turned on for ANT to enable
*/
private boolean requiresBluetoothOn() {
- return isQcomPlatform();
- }
-
- /**
- * Checks if the current platform is QCom
- */
- private boolean isQcomPlatform()
- {
- if ((SystemProperties.get("ro.board.platform").equals("msm8974"))
- || (SystemProperties.get("ro.board.platform").equals("msm8610"))
- || (SystemProperties.get("ro.board.platform").equals("msm8226"))) {
-
- return true;
- }
- return false;
+ return false; // Set to true if require bluetooth on for ANT functionality
}
public static boolean startService(Context context)