OSDN Git Service
Michael Lentine [Sat, 27 Sep 2014 00:55:01 +0000 (17:55 -0700)]
Fixed discrepancy between crop and frame transparencies.
Bug:
17662777
Change-Id: I0d65d9b912a37a60e4c1d2e2e198f7709460917c
Riley Andrews [Fri, 3 Oct 2014 17:31:18 +0000 (17:31 +0000)]
am
6747be9f: Generate the SurfaceFlinger shader cache on initialization
* commit '
6747be9fab9981ec24729cede5e0fe779e8b8914':
Generate the SurfaceFlinger shader cache on initialization
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
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 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: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: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
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
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
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 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 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
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 [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: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
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
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
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
Jeff Brown [Thu, 11 Sep 2014 22:32:05 +0000 (22:32 +0000)]
Merge "Make dumpstate vibrate immediately." into lmp-dev
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
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
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
Jeff Tinker [Tue, 9 Sep 2014 23:55:59 +0000 (23:55 +0000)]
Merge "Add support for max res decode" into lmp-dev
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:27:05 +0000 (16:27 +0000)]
Merge "Add new system APK locations." into lmp-dev
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
The Android Automerger [Tue, 9 Sep 2014 13:13:08 +0000 (06:13 -0700)]
merge in lmp-release history after reset to
7eff26a02aeb35d6c48e1af8d9bebcc838ad1fd2
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
Michael Wright [Mon, 8 Sep 2014 23:21:34 +0000 (23:21 +0000)]
Merge "Add FEATURE_GAMEPAD." into lmp-dev
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
The Android Automerger [Mon, 8 Sep 2014 13:13:51 +0000 (06:13 -0700)]
merge in lmp-release history after reset to
0fef06294c1e4f0ebb6ac15ec228e96d1afe1d61
The Android Automerger [Sun, 7 Sep 2014 13:11:07 +0000 (06:11 -0700)]
merge in lmp-release history after reset to
0fef06294c1e4f0ebb6ac15ec228e96d1afe1d61
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
The Android Automerger [Sat, 6 Sep 2014 15:51:49 +0000 (08:51 -0700)]
merge in lmp-release history after reset to
1f3fc764bc4993b30f2434e727a58ef845f8c2d3
The Android Automerger [Sat, 6 Sep 2014 13:10:51 +0000 (06:10 -0700)]
merge in lmp-release history after reset to
253c4720af3ac631ba04eb379aea91ecc3175cd3
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 19:53:36 +0000 (19:53 +0000)]
Merge "SensorService flush fixes." into lmp-dev
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: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 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
The Android Automerger [Thu, 4 Sep 2014 13:12:35 +0000 (06:12 -0700)]
merge in lmp-release history after reset to
98e56d926bce70a0a3257c573a92944c8057b528
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: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
The Android Automerger [Wed, 3 Sep 2014 13:11:59 +0000 (06:11 -0700)]
merge in lmp-release history after reset to
08ff802151ea3089a5f352dfc795c99017c1d122
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 [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
The Android Automerger [Tue, 2 Sep 2014 13:12:14 +0000 (06:12 -0700)]
merge in lmp-release history after reset to
bcbf97ef8fb6eaf527014ed9e7d979ad4fe9fdd2
The Android Automerger [Mon, 1 Sep 2014 14:56:33 +0000 (07:56 -0700)]
merge in lmp-release history after reset to
bcbf97ef8fb6eaf527014ed9e7d979ad4fe9fdd2