Narayan Kamath
7f8ecd6dba
am cde4b13a
: Merge "Allow more than one dex2oat extra option"
...
* commit 'cde4b13a12a0bc8a7bd031f5d5c1b2b2bdd13335':
Allow more than one dex2oat extra option
2014-10-01 11:18:25 +00:00
Narayan Kamath
cde4b13a12
Merge "Allow more than one dex2oat extra option"
2014-10-01 11:06:03 +00:00
Aravind Akella
b17044adcf
am 71e351d9
: Merge "Revert "Fix sockfd leakage in SensorService. Remove sockfd from Looper when the connection is removed from mActiveConnections."" into lmp-dev
...
* commit '71e351d96b551ccdbc39b52a0c66da86cae83701':
Revert "Fix sockfd leakage in SensorService. Remove sockfd from Looper when the connection is removed from mActiveConnections."
2014-09-27 06:17:21 +00:00
Aravind Akella
71e351d96b
Merge "Revert "Fix sockfd leakage in SensorService. Remove sockfd from Looper when the connection is removed from mActiveConnections."" into lmp-dev
2014-09-27 02:09:30 +00:00
Aravind Akella
678f4fce90
Revert "Fix sockfd leakage in SensorService. Remove sockfd from Looper when the connection is removed from mActiveConnections."
...
This reverts commit 5105960d49
.
Change-Id: I4d39ded2e50ef8a8e0aac27e438876203385a1f0
2014-09-27 02:06:32 +00:00
Michael Wright
2344006b6e
am 4b20d402
: Merge "Only mark repeated keys as PASS_TO_USER if the original key was." into lmp-dev
...
* commit '4b20d40218a25adcad21cc135a3103b4e04940f3':
Only mark repeated keys as PASS_TO_USER if the original key was.
2014-09-26 05:10:08 +00:00
Jesse Hall
53e6b95d05
am 728a8da1
: Merge "surfaceflinger: Check sideband stream changed to trigger sideband Layer update." into lmp-dev
...
* commit '728a8da14638e718ede11a7a894705524fc9d171':
surfaceflinger: Check sideband stream changed to trigger sideband Layer update.
2014-09-26 05:10:07 +00:00
Michael Wright
4b20d40218
Merge "Only mark repeated keys as PASS_TO_USER if the original key was." into lmp-dev
2014-09-26 01:38:57 +00:00
Michael Wright
2e732956ad
Only mark repeated keys as PASS_TO_USER if the original key was.
...
Bug: 17629695
Change-Id: Ic569aba4149c6cc321c2cf8aede7c5e8a1196234
2014-09-25 13:20:20 -07:00
Jesse Hall
728a8da146
Merge "surfaceflinger: Check sideband stream changed to trigger sideband Layer update." into lmp-dev
2014-09-24 22:07:01 +00:00
Aravind Akella
8f12365b76
am 5105960d
: Fix sockfd leakage in SensorService. Remove sockfd from Looper when the connection is removed from mActiveConnections.
...
* commit '5105960d49bfa86efeeea8f87c87aa96b5771c37':
Fix sockfd leakage in SensorService. Remove sockfd from Looper when the connection is removed from mActiveConnections.
2014-09-24 04:24:07 +00:00
chenhg
0ea1cb9195
surfaceflinger: Check sideband stream changed to trigger sideband Layer update.
...
BUG: 17382907
Change-Id: I65fd037bd25238ae68a3976468ae7fd7ce49c562
2014-09-23 17:26:00 -07:00
Aravind Akella
5105960d49
Fix sockfd leakage in SensorService. Remove sockfd from Looper
...
when the connection is removed from mActiveConnections.
Bug: 17472228
Change-Id: Iaabe0968bd2104ef961ff5e8659bf91712e2e1db
2014-09-23 23:46:22 +00:00
Michael Lentine
14fa402fea
am 12c4bdad
: Add rate-limited logging for unimplemented es functions.
...
* commit '12c4bdad7b2372ab64dcd2abbdbe47e709fb8b90':
Add rate-limited logging for unimplemented es functions.
2014-09-23 19:41:45 +00:00
Dan Albert
56b3f887a2
am 6ee97e74
: Merge "Fix a null dereference."
...
* commit '6ee97e74d2c972dec2aa6a2f231b718eae54898f':
Fix a null dereference.
2014-09-23 17:54:39 +00:00
Dan Albert
6ee97e74d2
Merge "Fix a null dereference."
2014-09-23 17:41:11 +00:00
Dan Albert
c78a0c1733
Fix a null dereference.
...
Change-Id: I7224c3368ff414620062bc08b80a6a94d55d7931
2014-09-23 09:51:51 -07:00
Lorenzo Colitti
63a8e04d2d
am d9485403
: Merge "Include the VPN server IP address in the VPN state file." into lmp-dev
...
* commit 'd94854030c76fc4ee4126ca1707a76fbd1f29126':
Include the VPN server IP address in the VPN state file.
2014-09-23 15:50:59 +00:00
Michael Lentine
12c4bdad7b
Add rate-limited logging for unimplemented es functions.
...
Bug: 17322013
Change-Id: I7aa5ab2f76cf344cfb75802edbfd44e8e7526ff1
2014-09-23 08:30:12 -07:00
Lorenzo Colitti
d94854030c
Merge "Include the VPN server IP address in the VPN state file." into lmp-dev
2014-09-23 00:29:59 +00:00
Sean Wan
9b8af6e778
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:51:15 +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
Lajos Molnar
147372fdf9
resolved conflicts for merge of 67d8bd66
to lmp-mr1-dev-plus-aosp
...
Change-Id: I5e7e6fdf0d2afe6c3e4a0ed6ef96afb4713a72bc
2014-09-19 06:23:46 -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
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
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
Unsuk Jung
8990766e44
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 21:05:02 +00:00
Aravind Akella
11b4fd5602
am e225f6fd
: Merge "SensorService fixes." into lmp-dev
...
* commit 'e225f6fd4a3f17c2705f1d69b176db475a3cc821':
SensorService fixes.
2014-09-16 21:05:01 +00:00
Ihab Awad
da404011b5
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 21:05:00 +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
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