OSDN Git Service
Jesse Hall [Thu, 2 Oct 2014 23:43:31 +0000 (23:43 +0000)]
am
74efd6e6: am
f05ef4e5: Merge "Surface: cancel the dequeued buffer when requestBuffer fails" into lmp-dev
* commit '
74efd6e6bec8a49f66090a5c0c18b65ba8a6fcad':
Surface: cancel the dequeued buffer when requestBuffer fails
Jesse Hall [Thu, 2 Oct 2014 23:26:58 +0000 (23:26 +0000)]
am
f05ef4e5: Merge "Surface: cancel the dequeued buffer when requestBuffer fails" into lmp-dev
* commit '
f05ef4e542c3041379025e16497ff23710de5dbf':
Surface: cancel the dequeued buffer when requestBuffer fails
Jesse Hall [Thu, 2 Oct 2014 23:11:08 +0000 (23:11 +0000)]
Merge "Surface: cancel the dequeued buffer when requestBuffer fails" into lmp-dev
Lajos Molnar [Thu, 2 Oct 2014 23:06:25 +0000 (23:06 +0000)]
am
167013b2: am
0ba908e7: Merge "add OMX_VIDEO_AVCLevel52 constant" into lmp-dev
* commit '
167013b2bea340ccf14bf751ef39cc5abef4533a':
add OMX_VIDEO_AVCLevel52 constant
Lajos Molnar [Thu, 2 Oct 2014 22:54:54 +0000 (22:54 +0000)]
am
0ba908e7: Merge "add OMX_VIDEO_AVCLevel52 constant" into lmp-dev
* commit '
0ba908e7a55ce2641f8886db2a059ccaa3f7a22a':
add OMX_VIDEO_AVCLevel52 constant
Lajos Molnar [Thu, 2 Oct 2014 22:44:30 +0000 (22:44 +0000)]
Merge "add OMX_VIDEO_AVCLevel52 constant" into lmp-dev
Riley Andrews [Thu, 2 Oct 2014 20:26:21 +0000 (20:26 +0000)]
am
6c833986: Merge "Generate the SurfaceFlinger shader cache on initialization" into lmp-mr1-dev
* commit '
6c8339867438c27e468a03995b98481e9e49b274':
Generate the SurfaceFlinger shader cache on initialization
Riley Andrews [Thu, 2 Oct 2014 20:16:55 +0000 (20:16 +0000)]
Merge "Generate the SurfaceFlinger shader cache on initialization" into lmp-mr1-dev
Michael Lentine [Thu, 2 Oct 2014 19:44:43 +0000 (19:44 +0000)]
am
36462d9d: Merge "Add more logging for dup(fd) failure" into lmp-dev
* commit '
36462d9de00105ae46ee3dbb0f644fa6af599f97':
Add more logging for dup(fd) failure
Michael Lentine [Thu, 2 Oct 2014 19:01:09 +0000 (19:01 +0000)]
Merge "Add more logging for dup(fd) failure" into lmp-dev
Jesse Hall [Thu, 2 Oct 2014 18:09:03 +0000 (11:09 -0700)]
Surface: cancel the dequeued buffer when requestBuffer fails
Partial fix for bug:
17477219
Change-Id: Ibf5a9e26e02c4be8854925a77a70f5c9c7dcf6f2
Michael Lentine [Thu, 2 Oct 2014 16:11:04 +0000 (09:11 -0700)]
Add more logging for dup(fd) failure
Bug:
17477219
Change-Id: Ide0ae16d777c9af783023c705c18a93c00999147
Christopher Ferris [Thu, 2 Oct 2014 13:38:38 +0000 (13:38 +0000)]
am
a91968fd: Merge "Accept socket connection before tracing." into lmp-dev
* commit '
a91968fd099378d1673c7443be16adcb97ee40af':
Accept socket connection before tracing.
Michael Lentine [Thu, 2 Oct 2014 12:41:27 +0000 (12:41 +0000)]
am
db57cfbd: Merge "When eglMakeCurrent fails we need to fix the egl state." into lmp-dev
* commit '
db57cfbd6f9d5795846ef237fd297cb81e429679':
When eglMakeCurrent fails we need to fix the egl state.
Chong Zhang [Thu, 2 Oct 2014 12:40:06 +0000 (12:40 +0000)]
am
dd230cb8: Merge "add a parameter for PCM limiter enable" into lmp-dev
* commit '
dd230cb8d2a43ea453a507b12c612a221a3780e7':
add a parameter for PCM limiter enable
Use set_sched_policy to put dexopt operations in SP_BACKGROUND cgroup
Revert "Modify EGL to disconnect the window when the surface gets destroyed."
crash if getNativeBuffer() called on NULL GraphicBuffer
Jesse Hall [Thu, 2 Oct 2014 12:40:05 +0000 (12:40 +0000)]
am
5bf786d8: surfaceflinger: recompute visibility after sideband stream change
* commit '
5bf786d8f00ff8eee64ebf330dac55e33a0f97b1':
surfaceflinger: recompute visibility after sideband stream change
Lajos Molnar [Thu, 2 Oct 2014 04:49:18 +0000 (21:49 -0700)]
add OMX_VIDEO_AVCLevel52 constant
Bug:
17676461
Change-Id: I120041e9b2ffe2a232a2419bcb5fe88cb49961cb
Riley Andrews [Mon, 29 Sep 2014 20:29:40 +0000 (13:29 -0700)]
Generate the SurfaceFlinger shader cache on initialization
Blobcache is not yet enabled for surfaceflinger (as it should be).
As a temporary workaround, generate all needed shaders during
surfaceflinger initialization instead of doing the compilation
on-demand during ui transitions.
Change-Id: I14455b20a3f85f177d85c9c8b76d8ccc35379b39
Christopher Ferris [Thu, 2 Oct 2014 01:11:56 +0000 (01:11 +0000)]
Merge "Accept socket connection before tracing." into lmp-dev
Dianne Hackborn [Thu, 2 Oct 2014 00:57:48 +0000 (00:57 +0000)]
am
5ee2c9d2: Work on issue #
17656716: Unhandled exception in Window Manager
* commit '
5ee2c9d20c0fbecf6b4a482eb8d8bfdf85d0d424':
Work on issue #
17656716: Unhandled exception in Window Manager
Aravind Akella [Thu, 2 Oct 2014 00:57:48 +0000 (00:57 +0000)]
am
deb71b28: Merge "Fix a possible SensorService deadlock." into lmp-dev
* commit '
deb71b2812702318900c36b7bcfa9759525ea7cc':
Fix a possible SensorService deadlock.
Jesse Hall [Thu, 2 Oct 2014 00:57:47 +0000 (00:57 +0000)]
am
bacc28ef: surfaceflinger: Use landscape resolution for default dpi
* commit '
bacc28ef1df329f4dc21bae44b09a6c5018af908':
surfaceflinger: Use landscape resolution for default dpi
Christopher Ferris [Thu, 2 Oct 2014 00:35:01 +0000 (17:35 -0700)]
Accept socket connection before tracing.
Sometimes dumping threads takes a long time and bugreport times
out. This change will cause us to accept the bugreport socket connection
before dumping threads and should avoid the failed to connect to dumpstate
service problems we've seen.
Bug:
17758374
Change-Id: I80afa0353cf1c340873f481a8d1d7faffff54120
Michael Lentine [Wed, 1 Oct 2014 22:44:45 +0000 (22:44 +0000)]
Merge "When eglMakeCurrent fails we need to fix the egl state." into lmp-dev
Michael Lentine [Wed, 1 Oct 2014 18:17:28 +0000 (11:17 -0700)]
When eglMakeCurrent fails we need to fix the egl state.
Bug:
16676660
Change-Id: Ie7bee9c78378b9e9206060444319e6ee35e1ab74
Chong Zhang [Wed, 1 Oct 2014 21:37:00 +0000 (21:37 +0000)]
Merge "add a parameter for PCM limiter enable" into lmp-dev
Chong Zhang [Wed, 1 Oct 2014 04:50:08 +0000 (21:50 -0700)]
add a parameter for PCM limiter enable
Bug:
17470065
Change-Id: I327115fc16e7afe2bf5870e123d63f9887161206
Jesse Hall [Tue, 30 Sep 2014 17:35:11 +0000 (10:35 -0700)]
surfaceflinger: recompute visibility after sideband stream change
We normally recompute layer visibility when a layer gets its first
buffer; before then it's treated as invisible. Sideband layers never
get a buffer (as far as SurfaceFlinger knows), so never became
visible. Now we also recompute visibility when a layer gets a new
sideband stream.
Bug:
17752511
Change-Id: I84e150f196eb2eb7bcd2616248e5e3fa73624809
Narayan Kamath [Wed, 1 Oct 2014 11:18:25 +0000 (11:18 +0000)]
am
cde4b13a: Merge "Allow more than one dex2oat extra option"
* commit '
cde4b13a12a0bc8a7bd031f5d5c1b2b2bdd13335':
Allow more than one dex2oat extra option
Narayan Kamath [Wed, 1 Oct 2014 11:06:03 +0000 (11:06 +0000)]
Merge "Allow more than one dex2oat extra option"
Dianne Hackborn [Tue, 30 Sep 2014 18:30:03 +0000 (11:30 -0700)]
Work on issue #
17656716: Unhandled exception in Window Manager
Try to clean up the code paths coming in and out of binder IPCs to
plug any places where we could disrupt the gather flag of a thread,
causing it to keep gathering stack crawls (which is the thing that
is causing our strict mode data to become so large).
We now take care of saving and restoring this state in the core
IPC code path, not at the Java layer.
Change-Id: I73d564778da127bdce00f304225930e7f2318293
Aravind Akella [Mon, 29 Sep 2014 00:49:24 +0000 (00:49 +0000)]
Merge "Fix a possible SensorService deadlock." into lmp-dev
Jesse Hall [Sun, 28 Sep 2014 19:14:12 +0000 (12:14 -0700)]
surfaceflinger: Use landscape resolution for default dpi
When HWC doesn't provide DPI values for a display, we pick a default
DPI based on resolution. The intent was that 1080p and higher displays
would get XHIGH density, and lower resolutions would get TV density.
In KK (and possibly forever) we had a bug that we'd always use TV
density. That was fixed in L, but that fix exposed a pre-existing bug
that we always used the display's height in its native orientation,
rather than in landscape orientation. So an 800x1280 tablet like N7v1
started getting XHIGH density instead of the intended TV density.
Bug:
17461633
Change-Id: Ia57fa49e61f36bdda63ce283ef62c9953297222c
Aravind Akella [Thu, 25 Sep 2014 05:12:58 +0000 (22:12 -0700)]
Fix a possible SensorService deadlock.
If the destructor of SensorEventConnection gets called when the main
sendEvents loop of SensorService is executing it may result in a deadlock.
The loop promotes each connection to a strong_pointer, calls sendEvents
and cleans up the connection if necessary. It is possible that the sp's
destructor may delete SensorEventConnection which will call the dtor
~SensorEventConnection(). This dtor again needs SensorService mLock to
execute which may result in a deadlock.
Bug:
17617897
Change-Id: I76c244dbe85fadb591c0bd1a9a5eb01d93f56505
Aravind Akella [Sat, 27 Sep 2014 06:17:21 +0000 (06:17 +0000)]
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."
Aravind Akella [Sat, 27 Sep 2014 02:09:29 +0000 (02:09 +0000)]
Merge "Revert "Fix sockfd leakage in SensorService. Remove sockfd from Looper when the connection is removed from mActiveConnections."" into lmp-dev
Aravind Akella [Sat, 27 Sep 2014 02:06:32 +0000 (02:06 +0000)]
Revert "Fix sockfd leakage in SensorService. Remove sockfd from Looper when the connection is removed from mActiveConnections."
This reverts commit
5105960d49bfa86efeeea8f87c87aa96b5771c37.
Change-Id: I4d39ded2e50ef8a8e0aac27e438876203385a1f0
Michael Wright [Fri, 26 Sep 2014 05:10:08 +0000 (05:10 +0000)]
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.
Jesse Hall [Fri, 26 Sep 2014 05:10:07 +0000 (05:10 +0000)]
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.
Michael Wright [Fri, 26 Sep 2014 01:38:56 +0000 (01:38 +0000)]
Merge "Only mark repeated keys as PASS_TO_USER if the original key was." into lmp-dev
Michael Wright [Wed, 24 Sep 2014 20:26:59 +0000 (13:26 -0700)]
Only mark repeated keys as PASS_TO_USER if the original key was.
Bug:
17629695
Change-Id: Ic569aba4149c6cc321c2cf8aede7c5e8a1196234
Jesse Hall [Wed, 24 Sep 2014 22:07:01 +0000 (22:07 +0000)]
Merge "surfaceflinger: Check sideband stream changed to trigger sideband Layer update." into lmp-dev
Aravind Akella [Wed, 24 Sep 2014 04:24:07 +0000 (04:24 +0000)]
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.
chenhg [Tue, 23 Sep 2014 02:52:25 +0000 (10:52 +0800)]
surfaceflinger: Check sideband stream changed to trigger sideband Layer update.
BUG:
17382907
Change-Id: I65fd037bd25238ae68a3976468ae7fd7ce49c562
Aravind Akella [Tue, 23 Sep 2014 23:42:49 +0000 (16:42 -0700)]
Fix sockfd leakage in SensorService. Remove sockfd from Looper
when the connection is removed from mActiveConnections.
Bug:
17472228
Change-Id: Iaabe0968bd2104ef961ff5e8659bf91712e2e1db
Michael Lentine [Tue, 23 Sep 2014 19:41:45 +0000 (19:41 +0000)]
am
12c4bdad: Add rate-limited logging for unimplemented es functions.
* commit '
12c4bdad7b2372ab64dcd2abbdbe47e709fb8b90':
Add rate-limited logging for unimplemented es functions.
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.
Michael Lentine [Thu, 11 Sep 2014 19:24:13 +0000 (12:24 -0700)]
Add rate-limited logging for unimplemented es functions.
Bug:
17322013
Change-Id: I7aa5ab2f76cf344cfb75802edbfd44e8e7526ff1
The Android Automerger [Tue, 23 Sep 2014 13:16:24 +0000 (06:16 -0700)]
merge in lmp-release history after reset to
d94854030c76fc4ee4126ca1707a76fbd1f29126
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
The Android Automerger [Mon, 22 Sep 2014 13:13:42 +0000 (06:13 -0700)]
merge in lmp-release history after reset to
b1982b75c4f3d9c812d9c49ca294132430c7cd8d
The Android Automerger [Sun, 21 Sep 2014 13:11:28 +0000 (06:11 -0700)]
merge in lmp-release history after reset to
b1982b75c4f3d9c812d9c49ca294132430c7cd8d
The Android Automerger [Sun, 21 Sep 2014 04:01:53 +0000 (21:01 -0700)]
merge in lmp-release history after reset to
dcb16082dd15e3b137678f2663fa6dd6b9614689
The Android Automerger [Sat, 20 Sep 2014 13:12:10 +0000 (06:12 -0700)]
merge in lmp-release history after reset to
b1982b75c4f3d9c812d9c49ca294132430c7cd8d
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
The Android Automerger [Thu, 18 Sep 2014 13:12:20 +0000 (06:12 -0700)]
merge in lmp-release history after reset to
5bbf73ced30c168176fbcf87b15021ecca2fb90e
The Android Automerger [Wed, 17 Sep 2014 13:13:11 +0000 (06:13 -0700)]
merge in lmp-release history after reset to
5bbf73ced30c168176fbcf87b15021ecca2fb90e
Yevgeny Rouban [Mon, 8 Sep 2014 10:02:10 +0000 (17:02 +0700)]
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>
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)
The Android Automerger [Tue, 16 Sep 2014 13:13:06 +0000 (06:13 -0700)]
merge in lmp-release history after reset to
5bbf73ced30c168176fbcf87b15021ecca2fb90e
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
The Android Automerger [Mon, 15 Sep 2014 13:13:42 +0000 (06:13 -0700)]
merge in lmp-release history after reset to
2ab32d6915eee0e0c175f0c5ae9d78ab0a90791d
The Android Automerger [Sun, 14 Sep 2014 13:12:39 +0000 (06:12 -0700)]
merge in lmp-release history after reset to
2ab32d6915eee0e0c175f0c5ae9d78ab0a90791d
The Android Automerger [Sat, 13 Sep 2014 15:43:26 +0000 (08:43 -0700)]
merge in lmp-release history after reset to
5e7504bb775ca19d3d5f5c7e4c46a47278f03c10
The Android Automerger [Sat, 13 Sep 2014 13:13:31 +0000 (06:13 -0700)]
merge in lmp-release history after reset to
2ab32d6915eee0e0c175f0c5ae9d78ab0a90791d
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
The Android Automerger [Thu, 11 Sep 2014 13:12:53 +0000 (06:12 -0700)]
merge in lmp-release history after reset to
9e691c1093fa9c00d82f5a33f5382c2610734ca6
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
The Android Automerger [Wed, 10 Sep 2014 13:11:45 +0000 (06:11 -0700)]
merge in lmp-release history after reset to
9e691c1093fa9c00d82f5a33f5382c2610734ca6