Michael Lentine
08c356c68a
am dea55870
: am 36462d9d
: Merge "Add more logging for dup(fd) failure" into lmp-dev
...
* commit 'dea558703a737d7e017a4f7991ea7b0367916654':
Add more logging for dup(fd) failure
2014-10-02 21:34:52 +00:00
Michael Lentine
dea558703a
am 36462d9d
: Merge "Add more logging for dup(fd) failure" into lmp-dev
...
* commit '36462d9de00105ae46ee3dbb0f644fa6af599f97':
Add more logging for dup(fd) failure
2014-10-02 19:44:43 +00:00
Michael Lentine
36273c991b
Add more logging for dup(fd) failure
...
Bug: 17477219
Change-Id: Ide0ae16d777c9af783023c705c18a93c00999147
2014-10-02 18:13:02 +00:00
Dianne Hackborn
7a29f687db
am e5a59e37
: am 5ee2c9d2
: Work on issue #17656716 : Unhandled exception in Window Manager
...
* commit 'e5a59e37f2a160f71459b1888ed2d268f9faa10e':
Work on issue #17656716 : Unhandled exception in Window Manager
2014-10-02 02:00:11 +00:00
Dianne Hackborn
e5a59e37f2
am 5ee2c9d2
: Work on issue #17656716 : Unhandled exception in Window Manager
...
* commit '5ee2c9d20c0fbecf6b4a482eb8d8bfdf85d0d424':
Work on issue #17656716 : Unhandled exception in Window Manager
2014-10-02 00:57:48 +00:00
Dianne Hackborn
5ee2c9d20c
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
2014-09-30 11:30:03 -07:00
Dan Albert
5193aea69a
am 56b3f887
: am 6ee97e74
: Merge "Fix a null dereference."
...
* commit '56b3f887a2a859eaac9f3c3eb2fa18eb5bf396da':
Fix a null dereference.
2014-09-23 20:55:50 +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
c78a0c1733
Fix a null dereference.
...
Change-Id: I7224c3368ff414620062bc08b80a6a94d55d7931
2014-09-23 09:51: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
Lajos Molnar
e7bda06398
resolved conflicts for merge of 67d8bd66
to lmp-dev-plus-aosp
...
Change-Id: Idbe39c6de8fe31ac57a9238c18b4c20d66dc73ad
2014-09-18 20:05:27 -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
Dan Albert
94ba882df2
am 4355c0c9
: am e1e3d278
: Merge "Clean cruft out of makefiles."
...
* commit '4355c0c98644c37f0511257403bbfb71b342e2df':
Clean cruft out of makefiles.
2014-09-12 19:28:17 +00:00
Hans Boehm
d898618914
am e03abcd6
: am 4a7001ca
: Merge "Work around C11 const atomic restrictions."
...
* commit 'e03abcd61b127b10391b8257c35fbe66053e417a':
Work around C11 const atomic restrictions.
2014-09-12 19:28:16 +00:00
Aravind Akella
f627c969e1
am 3d0daa57
: am 8493b79e
: SensorService fixes
...
* commit '3d0daa57f5f180418fdecbf06f6a5a41e566f6d9':
SensorService fixes
2014-09-12 19:20:58 +00: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
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
Aravind Akella
3d0daa57f5
am 8493b79e
: SensorService fixes
...
* commit '8493b79e1cff92450076ca7450c4bf4e434a6816':
SensorService fixes
2014-09-12 05:36:58 +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
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
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
Riley Andrews
03c2e83e73
am 75ec33e0
: am d15ef27f
: Update ScreenshotClient to take advantage of rotation in surfaceflinger\'s screencap api
...
* commit '75ec33e0e609e3ef074f4230c2227e52bf82ad06':
Update ScreenshotClient to take advantage of rotation in surfaceflinger's screencap api
2014-09-09 22:16:46 +00:00
Riley Andrews
25d10ce9ec
am 129dc842
: am edb86f9f
: Merge "Add rotation to surfaceflingers screen cap." into lmp-dev
...
* commit '129dc8423da319d42af6ef71046c39ba59c0d878':
Add rotation to surfaceflingers screen cap.
2014-09-09 22:16:38 +00:00
Riley Andrews
75ec33e0e6
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
2014-09-09 21:55:45 +00:00
Riley Andrews
129dc8423d
am edb86f9f
: Merge "Add rotation to surfaceflingers screen cap." into lmp-dev
...
* commit 'edb86f9f681e082a64a670814ee4d73ccf39942a':
Add rotation to surfaceflingers screen cap.
2014-09-09 21:55:26 +00:00
Riley Andrews
d15ef27f9b
Update ScreenshotClient to take advantage of rotation in surfaceflinger's screencap api
...
Change-Id: I836649d9d5cd5958ce34e47f26f4a36d2d05d24c
2014-09-09 19:41:32 +00:00
Dan Albert
58a81ba506
am 5273a978
: resolved conflicts for merge of 86aeb9ef
to lmp-dev-plus-aosp
...
* commit '5273a978337cbee2c1aae2f4d5c1b0e9d8dd6e1c':
Make string literal concatenation play nice with C++11.
2014-09-09 05:25:03 +00:00
Dan Albert
5273a97833
resolved conflicts for merge of 86aeb9ef
to lmp-dev-plus-aosp
...
Change-Id: I82fe2b385156d9bdb9e7183e308d7b2a4167b6ce
2014-09-08 22:15:20 -07:00
Riley Andrews
c3ebe66b49
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
2014-09-09 03:51:16 +00:00
Dan Albert
8b49125f10
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
2014-09-08 18:53:39 -07:00
Jesse Hall
46a1f6b40e
GLConsumer: correct EGL_NO_DISPLAY to EGL_NO_CONTEXT
...
Change-Id: I4dcb57a0db9ee3c5222cd453c9213859384212b0
2014-09-04 10:07:28 -07:00
Hans Boehm
553231f65e
Fix CAS argument type.
...
Gcc apparently doesn't check; clang does.
Bug:17067219
Change-Id: I184084a5063131dbc857c63f97e70e78a05e1a76
(cherry picked from commit 1ddaadb598
)
2014-09-02 23:26:16 -07:00
Hans Boehm
08ff802151
Revert "Revert "Revert "Revert "Remove incorrect android_atomic_...64 use.""""
...
After fixing b/16874785.
This reverts commit f010a05c7e
.
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 3effababf2
)
2014-09-02 16:11:46 -07:00
Eric Penner
b207e95b46
am 57782cd2
: am 5c4a1566
: Merge "GLConsumer: Fix eglTerminate/eglInit edge case." into lmp-dev
...
* commit '57782cd25539aa163b885cd336144d4c8bc9f665':
GLConsumer: Fix eglTerminate/eglInit edge case.
2014-08-27 18:35:43 +00:00
Eric Penner
57782cd255
am 5c4a1566
: Merge "GLConsumer: Fix eglTerminate/eglInit edge case." into lmp-dev
...
* commit '5c4a15665968471ddbac0b476514d00503e997c7':
GLConsumer: Fix eglTerminate/eglInit edge case.
2014-08-27 18:26:20 +00:00
Eric Penner
2d14a0ed4f
GLConsumer: Fix eglTerminate/eglInit edge case.
...
If a display is terminated and then initialized, we can't detect
this using the display itself (it has the same value), but all
EglImages still become invalid for the display. This patch detects
this during image binding and forces creation of a new EglImage.
Bug: 10430249
Change-Id: I75101c50962f21263dca3ec6e241a2e5a3c23dad
2014-08-27 03:10:58 +00:00
Hans Boehm
02a1c2cb37
am efc0b35f
: Merge "Fix CAS argument type."
...
* commit 'efc0b35fbd256bb3e225f4a1b953d0895ee3e99a':
Fix CAS argument type.
2014-08-19 22:28:41 +00:00
Riley Andrews
38e451f057
am 51d3d176
: Merge "Within CpuConsumer, use gralloc lockAsync/unlockAsync" into lmp-dev
...
* commit '51d3d176e35abc8b72e55035b0f7b81388ee044d':
Within CpuConsumer, use gralloc lockAsync/unlockAsync
2014-08-19 21:07:51 +00:00
Michael Wright
5a7ad73bd2
am 62fbb163
: Shelve InputFlinger for another release. DO NOT MERGE
...
* commit '62fbb16383d6d8268821f947e2c6d0828f7e2b41':
Shelve InputFlinger for another release. DO NOT MERGE
2014-08-19 01:33:52 +00:00
Riley Andrews
d53e052322
Within CpuConsumer, use gralloc lockAsync/unlockAsync
...
Change-Id: I6b2cd195e111c3c7bf94c8052af4db92e09649a5
2014-08-19 19:46:10 +00:00
Elliott Hughes
cb3b7ce1d8
am 703b60ce
: Merge "Use gettid directly in binder."
...
* commit '703b60ce39e52d319074adf53704d33f9c16dbbd':
Use gettid directly in binder.
2014-08-18 19:34:22 +00:00
Michael Wright
62fbb16383
Shelve InputFlinger for another release. DO NOT MERGE
...
Change-Id: I0f034a2b8b1d9192f61f5001799bd3aa4b3964c7
2014-08-18 10:17:18 -07:00
Hans Boehm
b5a2fe50be
am 02a1c2cb
: am efc0b35f
: Merge "Fix CAS argument type."
...
* commit '02a1c2cb3745179fc0e92515ef5905fe1f8fb17e':
Fix CAS argument type.
2014-08-19 22:36:28 +00:00
Riley Andrews
82e178cb96
am 38e451f0
: am 51d3d176
: Merge "Within CpuConsumer, use gralloc lockAsync/unlockAsync" into lmp-dev
...
* commit '38e451f0574de257eb46d0ba8c9a07c1556db24d':
Within CpuConsumer, use gralloc lockAsync/unlockAsync
2014-08-19 21:19:16 +00:00
Hans Boehm
efc0b35fbd
Merge "Fix CAS argument type."
2014-08-16 04:28:29 +00:00
Hans Boehm
1ddaadb598
Fix CAS argument type.
...
Gcc apparently doesn't check; clang does.
Bug:17067219
Change-Id: I184084a5063131dbc857c63f97e70e78a05e1a76
2014-08-19 13:42:54 -07:00
Elliott Hughes
fa6ad07c4e
Use gettid directly in binder.
...
Bug: 17048545
Change-Id: I1df378135961e085a52f6cc5694ad74cd73aac19
2014-08-18 10:38:38 -07:00
Hans Boehm
dc1fb90857
am a0187a9c
: Merge "Revert "Revert "Revert "Revert "Remove incorrect android_atomic_...64 use."""""
...
* commit 'a0187a9c83cb042b4cb92dac59214247bb7affcf':
Revert "Revert "Revert "Revert "Remove incorrect android_atomic_...64 use.""""
2014-08-13 00:19:23 +00:00
Hans Boehm
3effababf2
Revert "Revert "Revert "Revert "Remove incorrect android_atomic_...64 use.""""
...
After fixing b/16874785.
This reverts commit f010a05c7e
.
Change-Id: I1645ca5d6f60595bf5d388913665ce4b8780b26d
2014-08-12 22:56:00 +00:00
Hans Boehm
f010a05c7e
Revert "Revert "Revert "Remove incorrect android_atomic_...64 use."""
...
This reverts commit 66629e0de5
.
Change-Id: Ic298b345d0e500d18e4297b00e755ce3340f13fb
2014-08-09 01:17:13 +00:00