The Android Automerger
888824cc0d
merge in lmp-release history after reset to b1982b75c4
2014-09-20 06:12:10 -07:00
Sean Wan
0c6e249cba
am b1982b75
: am 60d31a0f
: am 3c648e37
: Update comment to use correct GPS file for wearable.
...
* commit 'b1982b75c4f3d9c812d9c49ca294132430c7cd8d':
Update comment to use correct GPS file for wearable.
2014-09-19 22:26:43 +00:00
Sean Wan
b1982b75c4
am 60d31a0f
: am 3c648e37
: Update comment to use correct GPS file for wearable.
...
* commit '60d31a0fc0724d4538d105a800a1565e5f843130':
Update comment to use correct GPS file for wearable.
2014-09-19 22:02:37 +00:00
Sean Wan
60d31a0fc0
am 3c648e37
: Update comment to use correct GPS file for wearable.
...
* commit '3c648e373a44237c1924fc886daf8418a6e9f4cf':
Update comment to use correct GPS file for wearable.
2014-09-19 21:49:11 +00:00
Sean Wan
3c648e373a
Update comment to use correct GPS file for wearable.
...
Change-Id: I91c4363dbcc6cada8d6e9599d1b15e77febee0e5
2014-09-19 14:33:51 -07:00
Lorenzo Colitti
a9e8374c72
Include the VPN server IP address in the VPN state file.
...
This will be used by LegacyVpnRunner to create a throw route
pointing at it.
Bug: 17462989
Change-Id: I3ebf0cec726dd12b2c57ba5d66775f8c02b25b70
2014-09-19 13:27:56 +09:00
Lajos Molnar
435d9cde27
resolved conflicts for merge of 67d8bd66
to lmp-dev-plus-aosp
...
Change-Id: I2e9aab90ac53bb32630598f50cc26f6e46acf6d6
2014-09-18 20:09:39 -07:00
Lajos Molnar
67d8bd66aa
surfaceflinger: add getDisplayStats() method
...
This is used by media service to schedule video frames at the
proper time, based on precise vsync timings.
Bug: 14659809
Change-Id: I1a90603f3dc09dca9aa4f90a3aa845fab56e0a5e
2014-09-18 17:03:20 -07:00
The Android Automerger
dcb16082dd
merge in lmp-release history after reset to 5bbf73ced3
2014-09-18 06:12:20 -07:00
The Android Automerger
1255b81a87
merge in lmp-release history after reset to 5bbf73ced3
2014-09-17 06:13:11 -07:00
Yevgeny Rouban
b0d8d00b29
Allow more than one dex2oat extra option
...
All extra options are provided as one argument to dex2oat.
The patch splits all options to individual ones.
Change-Id: Ied65bb9cf38b114611e88a8d5d86305021700d0b
Signed-off-by: Serguei Katkov <serguei.i.katkov@intel.com>
Signed-off-by: Yevgeny Rouban <yevgeny.y.rouban@intel.com>
2014-09-17 10:58:35 +00:00
Dan Albert
1474f8864f
Don't check if this == NULL.
...
Entering a method with this == NULL is undefined behavior. Clang whines
about this.
Change-Id: Ibde628395ca10dfef0d2f59e81280576f104b83c
2014-09-16 17:52:06 -07:00
The Android Automerger
7b463a21f7
merge in lmp-release history after reset to 5bbf73ced3
2014-09-16 06:13:06 -07:00
Unsuk Jung
556888b8ba
am 5bbf73ce
: Merge "Fix typo for android.hardware.audio.output feature in handheld device config" into lmp-dev
...
* commit '5bbf73ced30c168176fbcf87b15021ecca2fb90e':
Fix typo for android.hardware.audio.output feature in handheld device config
2014-09-16 08:57:57 +00:00
Aravind Akella
c8a1b36745
am e225f6fd
: Merge "SensorService fixes." into lmp-dev
...
* commit 'e225f6fd4a3f17c2705f1d69b176db475a3cc821':
SensorService fixes.
2014-09-16 08:57:56 +00:00
Ihab Awad
9b1543ad2f
am 5430cead
: Add system feature for ConnectionService API support (2/3)
...
* commit '5430cead9f7bc2a5a9947a2b9ffd5029a1f55408':
Add system feature for ConnectionService API support (2/3)
2014-09-16 08:38:38 +00:00
Unsuk Jung
5bbf73ced3
Merge "Fix typo for android.hardware.audio.output feature in handheld device config" into lmp-dev
2014-09-15 23:42:54 +00:00
Aravind Akella
e225f6fd4a
Merge "SensorService fixes." into lmp-dev
2014-09-15 22:09:53 +00:00
Aravind Akella
0ec2066e47
SensorService fixes.
...
i) Initialize sensor_event.flags to zero or wake_up flag before sending dropped flush_complete_events. This will avoid unnecessary acks.
Currently it is not set to anything which may result in garbage values for flags field.
ii) Change the dump format of SensorEventConnection.
iii) Add const to method signatures wherever applicable.
Bug id: https://b2.corp.google.com/issues/17498626
Change-Id: Ia736ffb01c366540aab73cdcf596ce852c052593
2014-09-15 20:32:21 +00:00
Ihab Awad
5430cead9f
Add system feature for ConnectionService API support (2/3)
...
Bug: 17445268
Change-Id: Ib96e50e2558d2744f74419fd022f3f20d578a2de
2014-09-15 09:13:10 -07:00
The Android Automerger
a9a104def3
merge in lmp-release history after reset to 2ab32d6915
2014-09-15 06:13:42 -07:00
The Android Automerger
22d7949df3
merge in lmp-release history after reset to 2ab32d6915
2014-09-14 06:12:39 -07:00
The Android Automerger
77e252057f
merge in lmp-release history after reset to 5e7504bb77
2014-09-13 08:43:26 -07:00
The Android Automerger
9582d66692
merge in lmp-release history after reset to 2ab32d6915
2014-09-13 06:13:31 -07:00
Amith Yamasani
85c0a0938c
am 2ab32d69
: Rename managed_profiles feature to managed_users
...
* commit '2ab32d6915eee0e0c175f0c5ae9d78ab0a90791d':
Rename managed_profiles feature to managed_users
2014-09-13 02:35:52 +00:00
Unsuk Jung
edaee1a927
Fix typo for android.hardware.audio.output feature in handheld device config
...
Bug: 15318046
Change-Id: I6437a2e87a909a8ef4ce6fcdc56ff06c5599a15a
2014-09-12 15:49:32 -07:00
Amith Yamasani
2ab32d6915
Rename managed_profiles feature to managed_users
...
Bug: 17392243
Change-Id: Ib60d1563ecdda9a979196ef51e849be2f9e9f841
2014-09-12 14:21:03 -07:00
Dan Albert
4355c0c986
am e1e3d278
: Merge "Clean cruft out of makefiles."
...
* commit 'e1e3d278549eb6389eb0b5fa3f13a4ac079a55a2':
Clean cruft out of makefiles.
2014-09-12 16:22:03 +00:00
Dan Albert
9e8b528926
resolved conflicts for merge of 07c9557f
to lmp-dev-plus-aosp
...
Change-Id: Ic212ab2ee90b1cc7db7203210b047c870bb5c476
2014-09-12 09:00:50 -07:00
Hans Boehm
e03abcd61b
am 4a7001ca
: Merge "Work around C11 const atomic restrictions."
...
* commit '4a7001cae482e3c9410001360374c8fe9d5a2846':
Work around C11 const atomic restrictions.
2014-09-12 15:54:52 +00:00
Jeff Brown
6f3e466b14
am 70b9e6c8
: Merge "Make dumpstate vibrate immediately." into lmp-dev
...
* commit '70b9e6c8f3221bbbeefc85c70746541a5b318afc':
Make dumpstate vibrate immediately.
2014-09-12 05:36:59 +00:00
Aravind Akella
3d0daa57f5
am 8493b79e
: SensorService fixes
...
* commit '8493b79e1cff92450076ca7450c4bf4e434a6816':
SensorService fixes
2014-09-12 05:36:58 +00:00
Dan Albert
e1e3d27854
Merge "Clean cruft out of makefiles."
2014-09-12 01:57:54 +00:00
Dan Albert
b79dfe6721
Clean cruft out of makefiles.
...
Cleans up manual uses of stlport and bionic (and removes uses of private
bionic headers).
Change-Id: I157309d702e59152adfa3450939082248ae4c043
2014-09-11 18:49:47 -07:00
Chih-Hung Hsieh
07c9557f60
Merge "Fix warnings on unused variables and parameters."
2014-09-12 00:13:40 +00:00
Chih-Hung Hsieh
99d9fb15b4
Fix warnings on unused variables and parameters.
...
BUG: 17474723
Change-Id: If40f5e765090cfb970e4129b78b1e74cf8bad217
2014-09-11 16:57:59 -07:00
Hans Boehm
4a7001cae4
Merge "Work around C11 const atomic restrictions."
2014-09-11 22:52:53 +00:00
Jeff Brown
70b9e6c8f3
Merge "Make dumpstate vibrate immediately." into lmp-dev
2014-09-11 22:32:05 +00:00
Hans Boehm
c0df68bb80
Work around C11 const atomic restrictions.
...
Cast away the const qualifier in BBinder::findObject. C11, unlike C++11,
does not allow loads from const atomics. This is widely regarded as
a bug (see WG14 DR 459). This is a hack to work around it until it's
officially fixed in the spec.
load_const_atomic was adapted from commit
1e8587a479fd8b1ce9b594298a93f517816e8f15
I don't think we want to dignify this by putting it into a header file.
Bug:17067219
Change-Id: Icbfcbda2722e6f80d2bb065a0bb3ec7634bcacb2
2014-09-11 14:49:09 -07:00
Jeff Brown
1dc94e3156
Make dumpstate vibrate immediately.
...
Previously, the vibration was not performed until after stacks
were gathered which takes a long time. Moved the vibration
to happen earlier so we provide better user feedback for the
three-button salute when collecting a bug report.
Deleted some dead code for playing begin/end sounds.
Improved the timing measurement code to help track down why
bug reports are so slow. (They take over a minute now which
can cause us to lose valuable diagnostic information.)
Bug: 17474152
Change-Id: Iac73f7993d7dc85196aad96f459b22fd4a710f94
2014-09-11 14:19:04 -07:00
The Android Automerger
5e7504bb77
merge in lmp-release history after reset to 9e691c1093
2014-09-11 06:12:53 -07:00
Dan Albert
c16acacd6d
am 7d587c31
: (-s ours) Merge "Silence warnings about unused parameters."
...
* commit '7d587c31d5c9a2f76f69073036f521dc75045656':
Silence warnings about unused parameters.
2014-09-11 03:44:14 +00:00
Dan Albert
7d587c31d5
Merge "Silence warnings about unused parameters."
2014-09-11 02:32:24 +00:00
Aravind Akella
8493b79e1c
SensorService fixes
...
i) Significant Motion multiple clients fix. Make a copy of
mActiveConnections vector before cleaning up SensorEventConnections
when one-shot sensors trigger.
ii) Maintain a mapping between flush_complete_events and
SensorEventConnections to accurately map flush() API calls and
corresponding flush_complete_events
iii) Remove all references to 1_1 and 1_2 HALs.
iv) Dynamically allocate sensor_event buffers in SensorService main
threadLoop.
Bug: 17412359
Change-Id: If3c3986197660cafef2d2e0b4dc7582e229cf1c4
2014-09-10 18:24:18 -07:00
The Android Automerger
a136a0c9c2
merge in lmp-release history after reset to 9e691c1093
2014-09-10 06:11:45 -07:00
Adam Connors
f521c53cf7
am 9e691c10
: Merge "Add feature flags for verified boot and securely remove users." into lmp-dev
...
* commit '9e691c1093fa9c00d82f5a33f5382c2610734ca6':
Add feature flags for verified boot and securely remove users.
2014-09-10 10:26:21 +00:00
Adam Connors
9e691c1093
Merge "Add feature flags for verified boot and securely remove users." into lmp-dev
2014-09-10 10:07:49 +00:00
Dan Albert
5746f14978
am fb017a4c
: Merge "Fix clang warnings about struct vs. class."
...
* commit 'fb017a4c3b23741f737093c3fcb78087bbe5e73c':
Fix clang warnings about struct vs. class.
2014-09-10 01:43:11 +00:00
Jeff Tinker
f7a8f90ad4
am 1173137a
: Merge "Add support for max res decode" into lmp-dev
...
* commit '1173137af3fb93c7708fb7b1109c5b37db72d783':
Add support for max res decode
2014-09-10 00:51:52 +00:00
Dan Albert
fb017a4c3b
Merge "Fix clang warnings about struct vs. class."
2014-09-10 00:40:04 +00:00