diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2013-11-27 04:46:02 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2013-11-27 04:46:02 -0800 |
| commit | 5c9ec1753dfcb83b98c26354d92d05f4be4fd808 (patch) | |
| tree | e4cbe9844b46ae5f8537e5f829d24c545bba9b38 | |
| parent | 7d9b3d460d4614975cff3f1391462ca6ec4e8080 (diff) | |
| parent | a272d423058aefeac919e6c8d27bcbe5128235df (diff) | |
| download | android_external_ant-wireless_ant_service-5c9ec1753dfcb83b98c26354d92d05f4be4fd808.tar.gz android_external_ant-wireless_ant_service-5c9ec1753dfcb83b98c26354d92d05f4be4fd808.tar.bz2 android_external_ant-wireless_ant_service-5c9ec1753dfcb83b98c26354d92d05f4be4fd808.zip | |
Merge "Merge remote-tracking branch 'remotes/quic/caf/github/master' into local"
| -rw-r--r-- | AndroidManifest.xml | 4 | ||||
| -rw-r--r-- | ReleaseNotes.txt | 10 | ||||
| -rw-r--r-- | src/com/dsi/ant/server/AntService.java | 16 |
3 files changed, 11 insertions, 19 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 28b95be..dd9cfc2 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -16,8 +16,8 @@ limitations under the License. --> <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 @@ messages, enable, disable and get the enebaled state. ============================================================= 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 @@ public class AntService extends Service * 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) |