Linux Build Service Account
a01c9c6b63
Merge "Merge branch jb_mr1 into jb_2.6"
2013-06-13 12:11:32 -07:00
Dante Russo
85f672fa71
Merge branch jb_mr1 into jb_2.6
...
Merged from from label
AU_LINUX_ANDROID_JB_MR1.04.02.02.049.306
Change-Id: Ie2f7fd3d25f8f28f5d1b6e733974bb5f75999ee8
2013-06-11 14:58:24 -07:00
Dante Russo
838f00b1ef
jb_2.6 bring up changes.
...
Enable gps.conf and remove dependancy on libgeofence.so
Change-Id: I3f58f0b6afcb017504af51699b7030db07051402
2013-06-07 11:05:04 -07:00
Iliyan Malchev
2a9f38e7bf
Merge "gps: geofence hal integration" into jb-mr2-dev
2013-04-10 18:20:17 +00:00
Ying Wang
ce5efcc57f
Add liblog
...
Bug: 8580410
Change-Id: Ife86cba2312cf83f263b07bfe8f3b655ec7d1a70
2013-04-09 21:59:18 -07:00
Dante Russo
23d1e163c3
gps: geofence hal integration
...
Change-Id: Ia5b9c4d12c85d7d7c06b2b6037a568a43f0e8b2c
2013-04-09 21:11:27 -07:00
Mekala Natarajan
c65fed0353
gps: Runtime detection between apq v/s mdm gps support
...
Change-Id: Icfb6edcb8a885bbaa55091b851fb2620d65045f8
Signed-off-by: Ed Tam <etam@google.com>
2013-03-31 21:51:43 -07:00
Kevin Tang
ade0338d23
moved most of the GPS HAL back to aosp
...
This part of the HAL compiles without the need for
additional dependency
Change-Id: I36873579ef1b20c2441603729d2de83da6775319
2013-03-26 15:01:37 -07:00
Kevin Tang
52f4c8ca93
add LOCAL_MODULE_OWNER := qcom to gps modules
...
Port back of an earlier patch applied to the GPS HAL
that was moved out of aosp (change id of the patch was
Icc302c91da4104679d2548e4527d0aee430f3761
Change-Id: I133f92e316872c60830df5553f31d34ecd9d7a84
2013-03-26 14:58:19 -07:00
Kevin Tang
34ee095517
Revert "remove loc_api from hardware/qcom/gps"
...
This reverts commit 0d257cc5d3
.
Change-Id: I80c00022b5ab562ade9a9c8ca5abd0087d897c9e
2013-03-26 14:45:46 -07:00
Jean-Baptiste Queru
63e3dc43c4
am 3dac3016
: am 65102c39
: am 47210994
: (-s ours) am c2f34af0
: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '3dac30160988d39e6621ee470e079d6fad47fecb':
2013-03-11 13:38:20 -07:00
Jean-Baptiste Queru
3dac301609
am 65102c39
: am 47210994
: (-s ours) am c2f34af0
: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '65102c394d1b3bb8915e2a391b78775d8bbc7b6d':
2013-03-11 13:06:34 -07:00
Jean-Baptiste Queru
65102c394d
am 47210994
: (-s ours) am c2f34af0
: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '4721099487857d9fb02c6c3ad9e540f6526afa00':
2013-03-11 12:41:55 -07:00
Jean-Baptiste Queru
4721099487
am c2f34af0
: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit 'c2f34af0d9ab20a3827ef9402d14343100a224a7':
2013-03-11 12:27:37 -07:00
Jean-Baptiste Queru
c2f34af0d9
Reconcile with jb-mr1-release - do not merge
2013-03-11 12:20:38 -07:00
Iliyan Malchev
0d257cc5d3
remove loc_api from hardware/qcom/gps
...
Change-Id: I2a1e928dc38de45c7421e2ef7a406ca969eafc97
Signed-off-by: Iliyan Malchev <malchev@google.com>
2013-02-06 22:49:06 -08:00
The Android Open Source Project
11db31880d
am f62a0fad
: (-s ours) am c5a129e1
: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
...
* commit 'f62a0fad06aa7e5c968e6bda086701753d508ba0':
2012-11-27 17:34:21 -08:00
The Android Open Source Project
f62a0fad06
am c5a129e1
: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
...
* commit 'c5a129e11702e2878b3f17be1cfb27e841f7b9ce':
2012-11-27 11:39:20 -08:00
The Android Open Source Project
c5a129e117
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
...
Change-Id: Ifb0a30557854004e5a4c90944908a91d70ceb8c6
2012-11-27 07:33:48 -08:00
The Android Open Source Project
40b45d7a94
am 16e52e06
: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '16e52e065457fa480e0b684500bc1023ad40bc36':
2012-10-31 09:22:33 -07:00
The Android Open Source Project
16e52e0654
Reconcile with jb-mr1-release - do not merge
...
Change-Id: Ie52cdeb09f0af68d833ccb50e63d72ab5a5efea2
2012-10-31 09:17:34 -07:00
Iliyan Malchev
f0af7289cb
am 8ba1fbee
: am c74962df
: chmod uga-x
...
* commit '8ba1fbeef87f451a06919b1d596b79ce09b3daa7':
chmod uga-x
2012-10-29 17:15:55 -07:00
Iliyan Malchev
8ba1fbeef8
am c74962df
: chmod uga-x
...
* commit 'c74962df0d30bdb176472a1775a794fd93b1cd7a':
chmod uga-x
2012-10-29 14:31:34 -07:00
The Android Automerger
283486517d
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-29 11:20:06 -07:00
Iliyan Malchev
c74962df0d
chmod uga-x
...
find -type f -perm +111 -name \*.[ch]\* -exec chmod uga-x {} \;
Bug: 7428209
Change-Id: I991e3fb62a46f4b4cd727ef4b6a4472b4015ce33
Signed-off-by: Iliyan Malchev <malchev@google.com>
2012-10-27 14:22:13 -07:00
The Android Automerger
6f1ee47d21
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-19 06:59:46 -07:00
woojin.shin
6fa8714c3a
am 22809b1a
: am 9365bf1f
: gps: fix for no gps signals after modem reset
...
* commit '22809b1a09d3b5817e2a31ecc5d1e2294f6f7dae':
gps: fix for no gps signals after modem reset
2012-10-18 14:54:44 -07:00
woojin.shin
22809b1a09
am 9365bf1f
: gps: fix for no gps signals after modem reset
...
* commit '9365bf1ffd633b65bad7f95af90dcbb53e41652b':
gps: fix for no gps signals after modem reset
2012-10-18 14:52:12 -07:00
woojin.shin
9365bf1ffd
gps: fix for no gps signals after modem reset
...
This fixes the problem that GPS doesn't work until reboot after modem reset.
Bug: 7216911
Change-Id: Ibfee6a28850490548da2e0ccaefdabe9b826b5e9
Signed-off-by: Iliyan Malchev <malchev@google.com>
2012-10-18 13:50:31 -07:00
The Android Open Source Project
d2d637cd6d
am 6f441d38
: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '6f441d38d863a64a463ae3c5ec188e7e2962b9e2':
disabled agps state machine delete in cleanup
gps: report session begin/end on gps start/stop
2012-10-02 09:24:27 -07:00
The Android Open Source Project
6f441d38d8
Reconcile with jb-mr1-release - do not merge
...
Change-Id: Ifbd9be57ffd54239f7d0b9271f262042394b938e
2012-10-02 09:18:57 -07:00
Mekala Natarajan
fb4152c14b
disabled agps state machine delete in cleanup
...
The current cleanup mismatches agps_init(), so that it the agps state
machines will get deleted in the cleanup but never get recreated next
time apgs_init() is called.
Bug 7216641
Change-Id: Iddba9fd0d90c790e658f14c42c8a25d22b8749c0
2012-09-27 18:21:50 -07:00
Ajay Dudani
d12dd7f6cc
gps: report session begin/end on gps start/stop
...
Since modem does not consistently send
SESSON_END/ENGINE_OFF event, always report
SESSION_END on stop gps and SESSION_BEGIN on
start gps so that the icon is turned on/off
correctly.
Bug 7185242
Change-Id: Ib3954529056a653d7057aedb489be1ccee9eaf1d
2012-09-27 18:21:24 -07:00
Brian Muramatsu
586a62cda0
Merge "gps: report session begin/end on gps start/stop" into jb-mr1-dev
2012-09-26 18:41:16 -07:00
Mekala Natarajan
205590ae1b
disabled agps state machine delete in cleanup
...
The current cleanup mismatches agps_init(), so that it the agps state
machines will get deleted in the cleanup but never get recreated next
time apgs_init() is called.
Bug 7216641
Change-Id: Iddba9fd0d90c790e658f14c42c8a25d22b8749c0
2012-09-26 17:21:33 -07:00
Ajay Dudani
56de3d4311
gps: report session begin/end on gps start/stop
...
Since modem does not consistently send
SESSON_END/ENGINE_OFF event, always report
SESSION_END on stop gps and SESSION_BEGIN on
start gps so that the icon is turned on/off
correctly.
Bug 7185242
Change-Id: Ib3954529056a653d7057aedb489be1ccee9eaf1d
2012-09-26 16:38:31 -07:00
Ajay Dudani
6f36c0ec74
Silence more gps function tracing logs
...
Change-Id: I33f672950f59ad739362263d212424f8f55ab88b
2012-09-21 19:13:34 -07:00
Ajay Dudani
ca3538229b
gps: Fix typo in checking for qmi-framework
...
b/7175603
This caused one of the gps related libraries to be not built in the full tree,
causing GPS failure
Change-Id: Iff51c1a588a22f0b46b075ebf27d2b6493b97e40
Signed-off-by: Iliyan Malchev <malchev@google.com>
2012-09-16 15:51:00 -07:00
Ajay Dudani
197fe088f7
dynamically build and load adapter libs
...
This is to support bringup efforts. This change will decouple
the dependencies between GPS HAL and proprietary QMI headers,
so that we can build HAL without any proprietary repos.
Change-Id: I7b836d09f4ac6b1a1bdb38f8d6a2bfb90bb5bf01
Signed-off-by: Iliyan Malchev <malchev@google.com>
2012-09-15 13:44:20 -07:00
Ajay Dudani
ac8fa07a02
gps: control session state evt from HAL, not modem
...
Suppress the registering for QMI_LOC_EVENT_MASK_FIX_SESSION_STATE_V02
event from modem, that is normally responsible for generating
GPS_STATUS_SESSION_BEGIN and GPS_STATUS_SESSION_END, and instead
initiate these events from hal from when we get GPS_STATUS_ENGINE_ON
and GPS_STATUS_ENGINE_OFF.
Change-Id: I9d220bef7ee4f989a3982d888ed46279861f612d
2012-09-14 17:49:49 -07:00
Ajay Dudani
0620ede4b3
Reduce default logging verbosity to error & warning logs only
...
Change-Id: I3da98ccc8e1dfc1d0ef9f51bd96d22fc385ba529
2012-09-10 22:03:14 -07:00
woojin.shin
0a49d62c7a
gps: enable nmea callback
...
Add code for calling NMEA callback for receiving NMEA.
Change-Id: I04689cbc166e3db9d4479bf85636363a87176468
2012-08-21 09:04:45 -07:00
Ajay Dudani
f77c85bb51
gps: Initial implementation of msm gps hal
...
Change-Id: Icf126a0bbb9dec414144b9b405694e41777920d5
2012-07-09 15:43:56 -07:00
Mike Lockwood
80698b8a3d
Merge remote-tracking branch 'goog/ics-aah'
2012-04-03 10:47:43 -07:00
Nick Kralevich
7573253c26
remove HAL_MODULE_INFO_SYM const
...
HAL_MODULE_INFO_SYM was declared as read-only, but
the struct is written to by libhardware. This causes
a segfault when -Wl,-z,relro is enabled.
Fixed.
Change-Id: Ied24f54a294ea705b06754a419823d595e3def62
2012-03-01 17:07:59 -08:00
Steve Block
8b3fe9b3cf
Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE
...
See https://android-git.corp.google.com/g/#/c/157220
Bug: 5449033
Change-Id: I9d2c4a1a9b0edda94f2eeacc1f4d270bf4d66804
2012-01-08 10:17:54 +00:00
Steve Block
2ce3102288
Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGE
...
See https://android-git.corp.google.com/g/157065
Bug: 5449033
Change-Id: Ia13cca6426a15037e01069954308e95f31c17336
2012-01-05 23:27:52 +00:00
Steve Block
b72262b057
Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE
...
See https://android-git.corp.google.com/g/156801
Bug: 5449033
Change-Id: I3fc8b0f9a0da503ff9e79a166a08e13e0ce9730d
2012-01-04 20:07:13 +00:00
Steve Block
b80e8ff4f8
Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE
...
See https://android-git.corp.google.com/g/156016
Bug: 5449033
Change-Id: I5a8da519f9d62f6b2978313462e32cba4cec6304
2012-01-03 22:31:41 +00:00
Ed Heyl
a8ee4007d3
keep previous history after reset to mr1 plus aah changes (ics-aah-wip)
2011-10-28 19:05:54 +00:00