aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Merge remote-tracking branch 'remotes/quic/caf/github/master' into tip"HEADreplicant-6.0-0004-transitionreplicant-6.0-0004-rc6replicant-6.0-0004-rc5-transitionreplicant-6.0-0004-rc5replicant-6.0-0004-rc4replicant-6.0-0004-rc3replicant-6.0-0004-rc2replicant-6.0-0004-rc1replicant-6.0-0004replicant-6.0-0003replicant-6.0-0002replicant-6.0-0001staging/cm-12.1staging/cm-12.0-cafstable/cm-13.0-ZNH5Ystable/cm-13.0-ZNH2KBstable/cm-13.0-ZNH2Kstable/cm-13.0-ZNH0Estable/cm-12.1-YOG7Dstable/cm-12.1-YOG4Pstable/cm-12.1-YOG3Cstable/cm-12.0-YNG4Nstable/cm-12.0-YNG3Cstable/cm-12.0-YNG1TAstable/cm-12.0-YNG1Tstable/cm-12.0-YNG1Icm-13.0cm-12.1cm-12.0Linux Build Service Account2014-08-279-288/+94
|\
| * Merge remote-tracking branch 'remotes/quic/caf/github/master' into tippramod kotreshappa2014-08-269-288/+94
|/| | | | | | | Change-Id: Icd434f687a963a7d99e606dffc7b7ba83ba20dad
| * Release version 4.0.0ANT-Shane2014-08-255-226/+33
| | | | | | | | | | | | Includes: -Android L compatibility fix - remove ANT and ANT_ADMIN permissions -new readme with changelog
| * Fix Android L 'Duplicate Permission' errorANT-Shane2014-08-201-12/+0
| | | | | | | | Removed ANT and ANT_ADMIN permissions also defined in ANT Radio Service to avoid INSTALL_FAILED_DUPLICATE_PERMISSION error introduced by Android L.
| * Release v3.2.0ANT-Shane2014-01-245-51/+62
| | | | | | | | | | | | | | | | -FIXED Unsynchronized access to mCallback in AntHalService causing NullPointerException in some situations -UPDATE Application Launcher icon to grey version for visibility on dark and light backgrounds -UPDATE gitignore file
* | Merge "Merge remote-tracking branch 'remotes/quic/caf/github/master' into local"Linux Build Service Account2013-11-273-19/+11
|\ \
| * | Merge remote-tracking branch 'remotes/quic/caf/github/master' into localBhakthavatsala Raghavendra2013-11-223-19/+11
|/| | | |/
| * Updating Version to 3.1.1ANT-Shane2013-11-182-4/+10
| |
| * Disable requiresBluetoothOn for all platformsBeenish Khurshid2013-11-151-15/+1
| | | | | | | | | | | | | | | | QComm no longer requires BT to be on for ANT to enable. Issue:ANTDROID-2223 Change-Id: I62fbca5c0149e52f805c4fb246b53d20fd8a511e Type: Bug Fix
* | Merge "Merge branch 'caf' into tip"Linux Build Service Account2013-09-045-42/+436
|\ \
| * | Merge branch 'caf' into tipSatish kumar sugasi2013-09-035-42/+436
|/| | | |/
| * Android_System_ANTHALService_3-1-0Khurshid2013-07-194-77/+115
| |
| * Merge branch 'master' of github.com:ant-wireless/Android_ANTHALServiceKhurshid2013-07-180-0/+0
| |\
| | * Merge pull request #3 from bkhurshi/masterbkhurshi2013-07-185-2/+160
| | |\ | | | | | | | | Enable Bluetooth when ANT is enabled if required by chip. Only reads first HCI packet if multiple concatenated on read from file. Process flow control message while rx callback is not set. Don't send flow control packet to rx callback.
| * | | Android_System_ANTHALService_3-0-1Khurshid2013-07-183-3/+201
| | |/ | |/|
| * | ANTDROID-1987: Enable Bluetooth when ANT is enabled if required by chip.Khurshid2013-07-185-2/+160
| |/
* | Merge "Merge remote-tracking branch 'remotes/quic/caf/github/master' into tip"Linux Build Service Account2013-02-222-188/+45
|\ \
| * | Merge remote-tracking branch 'remotes/quic/caf/github/master' into tipSatish kumar sugasi2013-02-212-188/+45
|/| | | |/
| * Pull in Android_System_Package_3-0-0Rohan Martin2013-02-202-188/+45
| | | | | | (Android_System_ANTHALService_3-0-0)
* | Merge "Merge remote-tracking branch 'remotes/origin/caf/github/master'"Linux Build Service Account2012-12-1423-0/+2011
|\ \
| * | Merge remote-tracking branch 'remotes/origin/caf/github/master'Satish kumar sugasi2012-12-0823-0/+2011
|/| | | |/
| * Merge pull request #2 from rohan-martin/masterRohan Martin2012-12-054-50/+291
| |\ | | | | | | Android_System_Package_2-0-0
| | * Pull in Android_System_ANTHALService_2-1-0Rohan Martin2012-12-052-3/+3
| | |
| | * Merge pull request #1 from rohan-martin/dsicvsRohan Martin2012-11-163-49/+290
| | |\ | | | | | | | | Pull in Android_System_ANTHALService_2-0-1
| | | * Pull in Android_System_ANTHALService_2-0-1Rohan Martin2012-11-163-49/+290
| | |/
| * | Merge pull request #1 from rohan-martin/masterRohan Martin2012-11-0222-0/+1752
| |\| | | | | | | Break system package down to standalone repositories for inclusion in Android source
| | * Broke Android_System_package in to individual repositoriesRohan Martin2012-11-0122-0/+1752
| |/
| * Initial commitRohan Martin2012-11-012-0/+18
|
* Initial empty repositoryGit User Service Account2012-12-060-0/+0