OSDN Git Service
Dan Albert [Tue, 23 Sep 2014 17:54:39 +0000 (17:54 +0000)]
am
6ee97e74: Merge "Fix a null dereference."
* commit '
6ee97e74d2c972dec2aa6a2f231b718eae54898f':
Fix a null dereference.
Dan Albert [Tue, 23 Sep 2014 17:41:11 +0000 (17:41 +0000)]
Merge "Fix a null dereference."
Dan Albert [Tue, 23 Sep 2014 16:51:51 +0000 (09:51 -0700)]
Fix a null dereference.
Change-Id: I7224c3368ff414620062bc08b80a6a94d55d7931
Lorenzo Colitti [Tue, 23 Sep 2014 15:50:59 +0000 (15:50 +0000)]
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.
Lorenzo Colitti [Tue, 23 Sep 2014 00:29:57 +0000 (00:29 +0000)]
Merge "Include the VPN server IP address in the VPN state file." into lmp-dev
Sean Wan [Fri, 19 Sep 2014 22:51:15 +0000 (22:51 +0000)]
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.
Sean Wan [Fri, 19 Sep 2014 22:02:37 +0000 (22:02 +0000)]
am
60d31a0f: am
3c648e37: Update comment to use correct GPS file for wearable.
* commit '
60d31a0fc0724d4538d105a800a1565e5f843130':
Update comment to use correct GPS file for wearable.
Sean Wan [Fri, 19 Sep 2014 21:49:11 +0000 (21:49 +0000)]
am
3c648e37: Update comment to use correct GPS file for wearable.
* commit '
3c648e373a44237c1924fc886daf8418a6e9f4cf':
Update comment to use correct GPS file for wearable.
Sean Wan [Fri, 19 Sep 2014 21:33:51 +0000 (14:33 -0700)]
Update comment to use correct GPS file for wearable.
Change-Id: I91c4363dbcc6cada8d6e9599d1b15e77febee0e5
Lajos Molnar [Fri, 19 Sep 2014 13:23:46 +0000 (06:23 -0700)]
resolved conflicts for merge of
67d8bd66 to lmp-mr1-dev-plus-aosp
Change-Id: I5e7e6fdf0d2afe6c3e4a0ed6ef96afb4713a72bc
Lorenzo Colitti [Thu, 18 Sep 2014 16:00:08 +0000 (01:00 +0900)]
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
Lajos Molnar [Thu, 11 Sep 2014 21:58:45 +0000 (14:58 -0700)]
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
Unsuk Jung [Tue, 16 Sep 2014 21:05:02 +0000 (21:05 +0000)]
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
Aravind Akella [Tue, 16 Sep 2014 21:05:01 +0000 (21:05 +0000)]
am
e225f6fd: Merge "SensorService fixes." into lmp-dev
* commit '
e225f6fd4a3f17c2705f1d69b176db475a3cc821':
SensorService fixes.
Ihab Awad [Tue, 16 Sep 2014 21:05:00 +0000 (21:05 +0000)]
am
5430cead: Add system feature for ConnectionService API support (2/3)
* commit '
5430cead9f7bc2a5a9947a2b9ffd5029a1f55408':
Add system feature for ConnectionService API support (2/3)
Unsuk Jung [Mon, 15 Sep 2014 23:42:53 +0000 (23:42 +0000)]
Merge "Fix typo for android.hardware.audio.output feature in handheld device config" into lmp-dev
Aravind Akella [Mon, 15 Sep 2014 22:09:52 +0000 (22:09 +0000)]
Merge "SensorService fixes." into lmp-dev
Aravind Akella [Mon, 15 Sep 2014 00:29:48 +0000 (17:29 -0700)]
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
Ihab Awad [Fri, 12 Sep 2014 18:11:16 +0000 (11:11 -0700)]
Add system feature for ConnectionService API support (2/3)
Bug:
17445268
Change-Id: Ib96e50e2558d2744f74419fd022f3f20d578a2de
Amith Yamasani [Sat, 13 Sep 2014 02:35:52 +0000 (02:35 +0000)]
am
2ab32d69: Rename managed_profiles feature to managed_users
* commit '
2ab32d6915eee0e0c175f0c5ae9d78ab0a90791d':
Rename managed_profiles feature to managed_users
Unsuk Jung [Fri, 12 Sep 2014 22:49:32 +0000 (15:49 -0700)]
Fix typo for android.hardware.audio.output feature in handheld device config
Bug:
15318046
Change-Id: I6437a2e87a909a8ef4ce6fcdc56ff06c5599a15a
Amith Yamasani [Fri, 12 Sep 2014 21:21:03 +0000 (14:21 -0700)]
Rename managed_profiles feature to managed_users
Bug:
17392243
Change-Id: Ib60d1563ecdda9a979196ef51e849be2f9e9f841
Dan Albert [Fri, 12 Sep 2014 16:22:03 +0000 (16:22 +0000)]
am
e1e3d278: Merge "Clean cruft out of makefiles."
* commit '
e1e3d278549eb6389eb0b5fa3f13a4ac079a55a2':
Clean cruft out of makefiles.
Dan Albert [Fri, 12 Sep 2014 16:00:50 +0000 (09:00 -0700)]
resolved conflicts for merge of
07c9557f to lmp-dev-plus-aosp
Change-Id: Ic212ab2ee90b1cc7db7203210b047c870bb5c476
Hans Boehm [Fri, 12 Sep 2014 15:54:52 +0000 (15:54 +0000)]
am
4a7001ca: Merge "Work around C11 const atomic restrictions."
* commit '
4a7001cae482e3c9410001360374c8fe9d5a2846':
Work around C11 const atomic restrictions.
Jeff Brown [Fri, 12 Sep 2014 05:36:59 +0000 (05:36 +0000)]
am
70b9e6c8: Merge "Make dumpstate vibrate immediately." into lmp-dev
* commit '
70b9e6c8f3221bbbeefc85c70746541a5b318afc':
Make dumpstate vibrate immediately.
Aravind Akella [Fri, 12 Sep 2014 05:36:58 +0000 (05:36 +0000)]
am
8493b79e: SensorService fixes
* commit '
8493b79e1cff92450076ca7450c4bf4e434a6816':
SensorService fixes
Dan Albert [Fri, 12 Sep 2014 01:57:53 +0000 (01:57 +0000)]
Merge "Clean cruft out of makefiles."
Dan Albert [Fri, 12 Sep 2014 01:45:33 +0000 (18:45 -0700)]
Clean cruft out of makefiles.
Cleans up manual uses of stlport and bionic (and removes uses of private
bionic headers).
Change-Id: I157309d702e59152adfa3450939082248ae4c043
Chih-Hung Hsieh [Fri, 12 Sep 2014 00:13:40 +0000 (00:13 +0000)]
Merge "Fix warnings on unused variables and parameters."
Chih-Hung Hsieh [Thu, 11 Sep 2014 21:44:46 +0000 (14:44 -0700)]
Fix warnings on unused variables and parameters.
BUG:
17474723
Change-Id: If40f5e765090cfb970e4129b78b1e74cf8bad217
Hans Boehm [Thu, 11 Sep 2014 22:52:53 +0000 (22:52 +0000)]
Merge "Work around C11 const atomic restrictions."
Jeff Brown [Thu, 11 Sep 2014 22:32:05 +0000 (22:32 +0000)]
Merge "Make dumpstate vibrate immediately." into lmp-dev
Hans Boehm [Thu, 11 Sep 2014 21:49:09 +0000 (14:49 -0700)]
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
Jeff Brown [Thu, 11 Sep 2014 21:15:27 +0000 (14:15 -0700)]
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
Dan Albert [Thu, 11 Sep 2014 03:44:14 +0000 (03:44 +0000)]
am
7d587c31: (-s ours) Merge "Silence warnings about unused parameters."
* commit '
7d587c31d5c9a2f76f69073036f521dc75045656':
Silence warnings about unused parameters.
Dan Albert [Thu, 11 Sep 2014 02:32:23 +0000 (02:32 +0000)]
Merge "Silence warnings about unused parameters."
Aravind Akella [Mon, 8 Sep 2014 22:45:47 +0000 (15:45 -0700)]
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
Adam Connors [Wed, 10 Sep 2014 10:26:21 +0000 (10:26 +0000)]
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.
Adam Connors [Wed, 10 Sep 2014 10:07:49 +0000 (10:07 +0000)]
Merge "Add feature flags for verified boot and securely remove users." into lmp-dev
Dan Albert [Wed, 10 Sep 2014 01:43:11 +0000 (01:43 +0000)]
am
fb017a4c: Merge "Fix clang warnings about struct vs. class."
* commit '
fb017a4c3b23741f737093c3fcb78087bbe5e73c':
Fix clang warnings about struct vs. class.
Jeff Tinker [Wed, 10 Sep 2014 00:51:52 +0000 (00:51 +0000)]
am
1173137a: Merge "Add support for max res decode" into lmp-dev
* commit '
1173137af3fb93c7708fb7b1109c5b37db72d783':
Add support for max res decode
Dan Albert [Wed, 10 Sep 2014 00:40:03 +0000 (00:40 +0000)]
Merge "Fix clang warnings about struct vs. class."
Jeff Tinker [Tue, 9 Sep 2014 23:55:59 +0000 (23:55 +0000)]
Merge "Add support for max res decode" into lmp-dev
Dan Albert [Tue, 9 Sep 2014 22:09:07 +0000 (15:09 -0700)]
Silence warnings about unused parameters.
Change-Id: I503aafbdeaec3f53241872dc52af9f8b73a1416c
Christopher Ferris [Tue, 9 Sep 2014 22:54:12 +0000 (22:54 +0000)]
am
11c13abd: Merge "Use time() instead of clock() for timeouts."
* commit '
11c13abd56693d4a4be3ca9e14cbaa456ba586b9':
Use time() instead of clock() for timeouts.
Christopher Ferris [Tue, 9 Sep 2014 22:39:44 +0000 (22:39 +0000)]
Merge "Use time() instead of clock() for timeouts."
Dan Albert [Tue, 9 Sep 2014 22:07:07 +0000 (15:07 -0700)]
Fix clang warnings about struct vs. class.
Change-Id: I9f26cd01ac3153efa6d77a4133686842e2d63203
Christopher Ferris [Tue, 9 Sep 2014 21:56:14 +0000 (21:56 +0000)]
am
5ef471c5: Merge "Use time() instead of clock() for timeouts." into lmp-dev
* commit '
5ef471c5f986a52c681a29856c38f72127cdf8ac':
Use time() instead of clock() for timeouts.
Riley Andrews [Tue, 9 Sep 2014 21:55:45 +0000 (21:55 +0000)]
am
d15ef27f: Update ScreenshotClient to take advantage of rotation in surfaceflinger\'s screencap api
* commit '
d15ef27f9b13727fa7358e3c09572f66bb1e0668':
Update ScreenshotClient to take advantage of rotation in surfaceflinger's screencap api
Riley Andrews [Tue, 9 Sep 2014 21:55:26 +0000 (21:55 +0000)]
am
edb86f9f: Merge "Add rotation to surfaceflingers screen cap." into lmp-dev
* commit '
edb86f9f681e082a64a670814ee4d73ccf39942a':
Add rotation to surfaceflingers screen cap.
Christopher Ferris [Tue, 9 Sep 2014 20:10:49 +0000 (13:10 -0700)]
Use time() instead of clock() for timeouts.
The clock() function returns the processor time used by the process. This
is not a good timeout mechanism since the code is suspended most of the
time waiting for the forked process to finish. Replace with the time()
function.
Bug:
17154069
(cherry picked from commit
89d4949f86f4f7b6710e951afefad186c667fd6e)
Change-Id: I42f0f24ee53ef99955fd482a1089e39d491f3bd5
Christopher Ferris [Tue, 9 Sep 2014 20:29:15 +0000 (20:29 +0000)]
Merge "Use time() instead of clock() for timeouts." into lmp-dev
Christopher Ferris [Tue, 9 Sep 2014 20:10:49 +0000 (13:10 -0700)]
Use time() instead of clock() for timeouts.
The clock() function returns the processor time used by the process. This
is not a good timeout mechanism since the code is suspended most of the
time waiting for the forked process to finish. Replace with the time()
function.
Bug:
17154069
Change-Id: Ib383329f9db269445d71a100553b08e71fddda3f
Riley Andrews [Thu, 4 Sep 2014 23:19:44 +0000 (16:19 -0700)]
Update ScreenshotClient to take advantage of rotation in surfaceflinger's screencap api
Change-Id: I836649d9d5cd5958ce34e47f26f4a36d2d05d24c
Riley Andrews [Tue, 9 Sep 2014 19:40:52 +0000 (19:40 +0000)]
Merge "Add rotation to surfaceflingers screen cap." into lmp-dev
Jeff Sharkey [Tue, 9 Sep 2014 16:44:52 +0000 (16:44 +0000)]
am
464e539c: Merge "Add new system APK locations." into lmp-dev
* commit '
464e539cd3e931aaca99a67d0addc6d68bd96b3d':
Add new system APK locations.
Jeff Sharkey [Tue, 9 Sep 2014 16:27:05 +0000 (16:27 +0000)]
Merge "Add new system APK locations." into lmp-dev
Dan Albert [Tue, 9 Sep 2014 16:21:28 +0000 (09:21 -0700)]
Make string literal concatenation play nice with C++11.
In C++11 mode, "foo"MACRO_THAT_EXPANDS_TO_STRING gets lexed as a user
defined literal. Add space around the macro.
Had missed these when resolving merge conflicts last night.
Change-Id: I1a381a06c3909b76a3b44ce79c37aa6f244d3736
Jeff Sharkey [Tue, 9 Sep 2014 00:14:26 +0000 (17:14 -0700)]
Add new system APK locations.
Add /system/priv-app and /oem/app paths to system paths. Also allow
rmdex on system apps, and quietly ignore when it was already removed.
Also relax logging when clearing code cache, since it's optional.
Bug:
17205122
Change-Id: I4fc4d0f63a3596937c4defbd64e1f8a1c563f02d
Dan Albert [Tue, 9 Sep 2014 05:15:20 +0000 (22:15 -0700)]
resolved conflicts for merge of
86aeb9ef to lmp-dev-plus-aosp
Change-Id: I82fe2b385156d9bdb9e7183e308d7b2a4167b6ce
Dan Albert [Tue, 9 Sep 2014 04:02:10 +0000 (04:02 +0000)]
Merge "Make string literal concatenation play nice with C++11."
Riley Andrews [Thu, 4 Sep 2014 23:20:31 +0000 (16:20 -0700)]
Add rotation to surfaceflingers screen cap.
+ This is needed so that activity manager does not
have to do cpu side rotations when capturing recents
thumbnails.
Change-Id: If998008e675ad01305db8399fd643cf4608b7025
Dan Albert [Tue, 9 Sep 2014 01:53:39 +0000 (18:53 -0700)]
Make string literal concatenation play nice with C++11.
In C++11 mode, "foo"MACRO_THAT_EXPANDS_TO_STRING gets lexed as a user
defined literal. Add space around the macro.
Change-Id: I2741f5be9c0b1562e0f413d1309ef9d687e89b41
Michael Wright [Mon, 8 Sep 2014 23:47:00 +0000 (23:47 +0000)]
am
7eff26a0: Merge "Add FEATURE_GAMEPAD." into lmp-dev
* commit '
7eff26a02aeb35d6c48e1af8d9bebcc838ad1fd2':
Add FEATURE_GAMEPAD.
Michael Wright [Mon, 8 Sep 2014 23:21:34 +0000 (23:21 +0000)]
Merge "Add FEATURE_GAMEPAD." into lmp-dev
Nick Kralevich [Mon, 8 Sep 2014 20:55:32 +0000 (20:55 +0000)]
am
51eec3b9: Merge "Fix relabeling of secondary user package directories."
* commit '
51eec3b98788039afc5fd7ffe76612c7f8d9b39c':
Fix relabeling of secondary user package directories.
Nick Kralevich [Mon, 8 Sep 2014 20:37:23 +0000 (20:37 +0000)]
Merge "Fix relabeling of secondary user package directories."
Stephen Smalley [Mon, 8 Sep 2014 19:51:55 +0000 (15:51 -0400)]
Fix relabeling of secondary user package directories.
When relabeling secondary user package directories, we need to use
the uid of the directory rather than the primary package UID;
otherwise, levelFrom=user will not work correctly.
Change-Id: I0d76ec6ec6fe56a566023ca5e1398efdf28fc81e
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
Glenn Kasten [Mon, 8 Sep 2014 16:56:57 +0000 (16:56 +0000)]
am
d44fea68: Merge "Make IPowerManager native conform to .aidl for oneway" into lmp-dev
* commit '
d44fea6896a54878d2ed5c9284bb3c4738fc6c54':
Make IPowerManager native conform to .aidl for oneway
Glenn Kasten [Mon, 8 Sep 2014 16:33:54 +0000 (16:33 +0000)]
Merge "Make IPowerManager native conform to .aidl for oneway" into lmp-dev
Adam Connors [Mon, 8 Sep 2014 16:33:16 +0000 (17:33 +0100)]
Add feature flags for verified boot and securely remove users.
Bug:
17405636
Change-Id: I06c0319f7903787910c52d65025b0d77d9e0575f
Unsuk Jung [Sun, 7 Sep 2014 09:25:30 +0000 (09:25 +0000)]
am
0fef0629: Add feature android.hardware.audio.output xml file
* commit '
0fef06294c1e4f0ebb6ac15ec228e96d1afe1d61':
Add feature android.hardware.audio.output xml file
Unsuk Jung [Wed, 3 Sep 2014 01:46:59 +0000 (18:46 -0700)]
Add feature android.hardware.audio.output xml file
Bug:
15318046
Change-Id: I49f0881752493ac0bad238b43ce7e1e147119528
Michael Wright [Fri, 5 Sep 2014 22:21:32 +0000 (15:21 -0700)]
Add FEATURE_GAMEPAD.
This allows micro-consoles or other devices to signify that there's a
game controller in the box, even if the user hasn't connected it.
Change-Id: I93cfba8bd1376aa5d1ec772a5b643b974eaa36c5
Glenn Kasten [Fri, 5 Sep 2014 23:46:46 +0000 (16:46 -0700)]
Make IPowerManager native conform to .aidl for oneway
But provide a temporary escape hatch for AudioFlinger.
This oneway option will be removed as soon as possible.
Bug:
16408906
Change-Id: I20d6da1969ae05b96e72795463470eb4c1f8fbdc
Aravind Akella [Fri, 5 Sep 2014 20:21:54 +0000 (20:21 +0000)]
am
253c4720: Merge "SensorService flush fixes." into lmp-dev
* commit '
253c4720af3ac631ba04eb379aea91ecc3175cd3':
SensorService flush fixes.
Aravind Akella [Fri, 5 Sep 2014 19:53:36 +0000 (19:53 +0000)]
Merge "SensorService flush fixes." into lmp-dev
Eric Laurent [Fri, 5 Sep 2014 17:53:26 +0000 (17:53 +0000)]
am
437353a0: Merge "IPowerManager: make all binder call one way" into lmp-dev
* commit '
437353a0ef596a59ead2dbbe419c249f1e1819e2':
IPowerManager: make all binder call one way
Eric Laurent [Fri, 5 Sep 2014 17:30:04 +0000 (17:30 +0000)]
Merge "IPowerManager: make all binder call one way" into lmp-dev
Eric Laurent [Sun, 10 Aug 2014 17:46:52 +0000 (10:46 -0700)]
IPowerManager: make all binder call one way
make all binder call to power manager service one way so that
they don't block calling thread and are processed in the
incoming order.
Bug:
16408906.
Change-Id: I94034df7f0a36d967e085b53fdc37fff7b44757b
Vinod Krishnan [Thu, 4 Sep 2014 23:49:37 +0000 (23:49 +0000)]
am
a36d4e2d: am
6de9f394: (-s ours) am
8c967b9b: DO NOT MERGE: Removing android prefix for ECG feature
* commit '
a36d4e2d92d5d829b913de39f60145ebc6e6df2e':
DO NOT MERGE: Removing android prefix for ECG feature
Vinod Krishnan [Thu, 4 Sep 2014 23:23:46 +0000 (23:23 +0000)]
am
6de9f394: (-s ours) am
8c967b9b: DO NOT MERGE: Removing android prefix for ECG feature
* commit '
6de9f39476c6bbb1d196dbc6af23a27b177c7bf9':
DO NOT MERGE: Removing android prefix for ECG feature
Vinod Krishnan [Thu, 4 Sep 2014 23:11:58 +0000 (23:11 +0000)]
am
8c967b9b: DO NOT MERGE: Removing android prefix for ECG feature
* commit '
8c967b9bea7c80a8bd7d085fa9c9e390495dd1e8':
DO NOT MERGE: Removing android prefix for ECG feature
Vinod Krishnan [Thu, 4 Sep 2014 22:24:12 +0000 (15:24 -0700)]
DO NOT MERGE: Removing android prefix for ECG feature
Bug:
17272904
Change-Id: Ia476bd8853e098600b681bb769536774596b9345
Stephen Hines [Thu, 4 Sep 2014 22:09:07 +0000 (22:09 +0000)]
am
9c0a80b8: Merge "Fix undefined behavior (not returning a value from a function with return)." into lmp-dev
* commit '
9c0a80b8f48ba3a183afff5820f4ffad29b31224':
Fix undefined behavior (not returning a value from a function with return).
Michael Wright [Thu, 4 Sep 2014 22:09:07 +0000 (22:09 +0000)]
am
9e24c319: Merge "Fix type for temp variable" into lmp-dev
* commit '
9e24c319c3c8395b6dbd57d4cc8e0c749bbbb82c':
Fix type for temp variable
Stephen Hines [Thu, 4 Sep 2014 21:50:39 +0000 (21:50 +0000)]
Merge "Fix undefined behavior (not returning a value from a function with return)." into lmp-dev
Michael Wright [Thu, 4 Sep 2014 21:46:59 +0000 (21:46 +0000)]
Merge "Fix type for temp variable" into lmp-dev
Stephen Hines [Thu, 4 Sep 2014 15:28:54 +0000 (08:28 -0700)]
Fix undefined behavior (not returning a value from a function with return).
Bug:
17379740
This function was missing a return statement, even though it declares a return
type. This is undefined behavior, which clang miscompiled into just falling
through to a later function in some cases. Adding the return statement
fixes the undefined behavior (and probably fixes a bug too).
Change-Id: I05c03b6473b831769dc4fa8b5ba43fb4249f7626
Aravind Akella [Wed, 3 Sep 2014 22:48:05 +0000 (15:48 -0700)]
SensorService flush fixes.
i) Fix a possible race condition when adding a pending flush connection
to mActiveSensors data structure.
ii) Invalidate flush_complete_events as soon as they are consumed by a
connection so that they are not used by other connections which are
registered for the same sensor.
Change-Id: I1491bea8c2081c4aab1feacc60add13b7aa26bb7
Hans Boehm [Wed, 3 Sep 2014 17:37:03 +0000 (17:37 +0000)]
am
98e56d92: Merge "Fix CAS argument type." into lmp-dev
* commit '
98e56d926bce70a0a3257c573a92944c8057b528':
Fix CAS argument type.
Wally Yau [Wed, 3 Sep 2014 17:37:02 +0000 (17:37 +0000)]
am
19f8b79f: Merge "New keycode definitions for TV remotes." into lmp-dev
* commit '
19f8b79f154b64c664e974f7be067d456c3d57e2':
New keycode definitions for TV remotes.
Hans Boehm [Wed, 3 Sep 2014 17:18:44 +0000 (17:18 +0000)]
Merge "Fix CAS argument type." into lmp-dev
Wally Yau [Wed, 3 Sep 2014 17:15:37 +0000 (17:15 +0000)]
Merge "New keycode definitions for TV remotes." into lmp-dev
Hans Boehm [Tue, 19 Aug 2014 20:42:54 +0000 (13:42 -0700)]
Fix CAS argument type.
Gcc apparently doesn't check; clang does.
Bug:
17067219
Change-Id: I184084a5063131dbc857c63f97e70e78a05e1a76
(cherry picked from commit
1ddaadb59883df5ca821b4b08fdd41a1720a3b6f)
Hans Boehm [Wed, 3 Sep 2014 06:08:28 +0000 (23:08 -0700)]
resolved conflicts for merge of
08ff8021 to lmp-dev-plus-aosp
Change-Id: I7b57ce5e7d32f6ba4372d7b4af590cc74fd2c7e8
Hans Boehm [Tue, 12 Aug 2014 22:56:00 +0000 (22:56 +0000)]
Revert "Revert "Revert "Revert "Remove incorrect android_atomic_...64 use.""""
After fixing b/
16874785.
This reverts commit
f010a05c7e9a23b6083294aff4a8183ab01f686e.
Original comment, which actually describes the effect of this:
Change the mExtras field in Binder.h to be a stdatomic.h atomic
value, and replace references to it with proper stdatomic.h calls.
This removes one of a small number of remaining 64 bit
android_atomic references. It also replaces the erroneously
non-atomic read accesses to mExtras.
It would be better if this used the C++11 <atomic> facility,
but we don't quite have that yet.
Fixes
Bug:
16513433
Change-Id: I1645ca5d6f60595bf5d388913665ce4b8780b26d
(cherry picked from commit
3effababf2980d029339522fdc914bdeb913d99b)
ASAZU, Hideki [Wed, 27 Aug 2014 09:06:31 +0000 (18:06 +0900)]
New keycode definitions for TV remotes.
Keys which are necessary for supporting world-wide broadcast
standard or used commonly for TV/STB remotes.
Change-Id: I2721ceb7d956c87f1d4106b99f9d21947ae13d47
Michael Wright [Fri, 29 Aug 2014 23:52:43 +0000 (23:52 +0000)]
am
bcbf97ef: Add logging for switch state
* commit '
bcbf97ef8fb6eaf527014ed9e7d979ad4fe9fdd2':
Add logging for switch state