OSDN Git Service
The Android Open Source Project [Tue, 21 Aug 2012 23:05:59 +0000 (16:05 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: Idb96902f4272f83b3ebc1081ace5d2511d4281b7
Andy McFadden [Tue, 21 Aug 2012 23:00:32 +0000 (16:00 -0700)]
am
3f395623: Added display initialization method
* commit '
3f3956236aac97b6aa25fa89f0983d5e9d065fdb':
Added display initialization method
Andy McFadden [Mon, 20 Aug 2012 22:39:23 +0000 (15:39 -0700)]
Added display initialization method
The primary display device was being configured to "blank" by
default, which prevented the boot animation from appearing
(unless you got lucky with the hardware composer state).
Bug
6975688
Change-Id: Idaa0d0b98ebb331a17d1b16774c6b05bfa1e8728
Mathias Agopian [Tue, 21 Aug 2012 03:07:34 +0000 (20:07 -0700)]
fix various issues in SF's EventThread
- one issues caused most timestamps to be reported as 0
- on rare occasions an uninitialized variable could be used
- vsync counts per connection were accessed unthreadsafely
we now have 2 lists of connections in the main loop, one just
keeps a list of strong refs to the connections because once
we have a strong ref we're not allowed to release it while
holding the lock.
the 2nd list holds the connections that have a vsync event to
be reported. all the calculations are made with the lock held.
Change-Id: Iacfad3745b05df79d9ece3719bd4c34ddbfd5b83
Mathias Agopian [Tue, 21 Aug 2012 19:09:42 +0000 (12:09 -0700)]
am
a4cb35a2: fix various issues in SF\'s EventThread
* commit '
a4cb35a2864d58e9a764a17623e15ab25a9964a0':
fix various issues in SF's EventThread
The Android Automerger [Tue, 21 Aug 2012 13:34:25 +0000 (06:34 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Mathias Agopian [Tue, 21 Aug 2012 03:07:34 +0000 (20:07 -0700)]
fix various issues in SF's EventThread
- one issues caused most timestamps to be reported as 0
- on rare occasions an uninitialized variable could be used
- vsync counts per connection were accessed unthreadsafely
we now have 2 lists of connections in the main loop, one just
keeps a list of strong refs to the connections because once
we have a strong ref we're not allowed to release it while
holding the lock.
the 2nd list holds the connections that have a vsync event to
be reported. all the calculations are made with the lock held.
Change-Id: Iacfad3745b05df79d9ece3719bd4c34ddbfd5b83
Mathias Agopian [Tue, 21 Aug 2012 04:27:55 +0000 (21:27 -0700)]
am
1648d4c1: put back the unused virtuals in Vector<>
* commit '
1648d4c13ba2eff3ea14cd87ee94028458a39f97':
put back the unused virtuals in Vector<>
Mathias Agopian [Tue, 21 Aug 2012 00:03:29 +0000 (17:03 -0700)]
put back the unused virtuals in Vector<>
some binaries are using these private APIs and broke
(as they should!) with this change. Temporarily restore the
virtuals to work around this.
Bug:
6977550
Change-Id: I7c37f24b16e4d586b89205c493db5169cf87e024
Mathias Agopian [Mon, 20 Aug 2012 23:49:41 +0000 (16:49 -0700)]
am
317357fd: Merge "get rid of mirrorItemAt() which isn\'t used anywhere" into jb-mr1-dev
* commit '
317357fdf7a2b542dfdaa06f42ff7f5f0153f9a3':
get rid of mirrorItemAt() which isn't used anywhere
Mathias Agopian [Mon, 20 Aug 2012 23:48:07 +0000 (16:48 -0700)]
Merge "get rid of mirrorItemAt() which isn't used anywhere" into jb-mr1-dev
Eino-Ville Talvala [Mon, 20 Aug 2012 23:19:53 +0000 (16:19 -0700)]
am
84a9a3c0: Merge "CpuConsumer: inherit from ConsumerBase" into jb-mr1-dev
* commit '
84a9a3c0ec35915d3cc40e9e889d4032e189894a':
CpuConsumer: inherit from ConsumerBase
Eino-Ville Talvala [Mon, 20 Aug 2012 23:18:10 +0000 (16:18 -0700)]
Merge "CpuConsumer: inherit from ConsumerBase" into jb-mr1-dev
Eino-Ville Talvala [Mon, 20 Aug 2012 22:44:40 +0000 (15:44 -0700)]
CpuConsumer: inherit from ConsumerBase
Change-Id: I55178b1d673ffa0fbc6e63ef47642c64d4d03228
Mathias Agopian [Mon, 20 Aug 2012 21:21:29 +0000 (14:21 -0700)]
get rid of mirrorItemAt() which isn't used anywhere
Change-Id: Id6f2dbeed21cabc127d39538c0ff464077ada83f
Jamie Gennis [Mon, 20 Aug 2012 21:28:53 +0000 (14:28 -0700)]
Revert "SurfaceTexture: inherit from ConsumerBase"
This reverts commit
ed059a8d754770c3cf28b78dba30f7a6ba475dbe
Change-Id: I72542c2595771a40c2c88251e0d6eb54e305b99b
Jamie Gennis [Mon, 20 Aug 2012 21:35:21 +0000 (14:35 -0700)]
am
729f4808: Merge "Revert "SurfaceTexture: inherit from ConsumerBase"" into jb-mr1-dev
* commit '
729f48082e2c7660e94830e52006f7af4efb747a':
Revert "SurfaceTexture: inherit from ConsumerBase"
Jamie Gennis [Mon, 20 Aug 2012 21:35:20 +0000 (14:35 -0700)]
am
f7f63450: Merge "Revert "SurfaceTexture: call ConsumerBase::freeBufferLocked"" into jb-mr1-dev
* commit '
f7f6345068fe0644bf296b88a687b361eae0cc98':
Revert "SurfaceTexture: call ConsumerBase::freeBufferLocked"
Jamie Gennis [Mon, 20 Aug 2012 21:33:23 +0000 (14:33 -0700)]
Merge "Revert "SurfaceTexture: inherit from ConsumerBase"" into jb-mr1-dev
Jamie Gennis [Mon, 20 Aug 2012 21:33:15 +0000 (14:33 -0700)]
Merge "Revert "SurfaceTexture: call ConsumerBase::freeBufferLocked"" into jb-mr1-dev
Jamie Gennis [Mon, 20 Aug 2012 21:28:53 +0000 (14:28 -0700)]
Revert "SurfaceTexture: inherit from ConsumerBase"
This reverts commit
ed059a8d754770c3cf28b78dba30f7a6ba475dbe
Change-Id: I72542c2595771a40c2c88251e0d6eb54e305b99b
Jamie Gennis [Mon, 20 Aug 2012 21:28:21 +0000 (14:28 -0700)]
Revert "SurfaceTexture: call ConsumerBase::freeBufferLocked"
This reverts commit
f8d33c652b930abbfb0722f3a2928cbc2ea71078
Change-Id: I1ff2e1cc85824a8fac1051f573d2931db81af511
Mathias Agopian [Mon, 20 Aug 2012 21:22:28 +0000 (14:22 -0700)]
am
b3d68efa: Merge "Fix deadlock in SF." into jb-mr1-dev
* commit '
b3d68efa7e807070ed63cfad3f7576055c58eeba':
Fix deadlock in SF.
Mathias Agopian [Mon, 20 Aug 2012 21:20:17 +0000 (14:20 -0700)]
Merge "Fix deadlock in SF." into jb-mr1-dev
Jamie Gennis [Mon, 20 Aug 2012 19:40:53 +0000 (12:40 -0700)]
am
220ef10c: Merge "SurfaceTexture: call ConsumerBase::freeBufferLocked" into jb-mr1-dev
* commit '
220ef10c5fe44df0ff3898de06028975995a34e4':
SurfaceTexture: call ConsumerBase::freeBufferLocked
Jamie Gennis [Mon, 20 Aug 2012 19:39:37 +0000 (12:39 -0700)]
Merge "SurfaceTexture: call ConsumerBase::freeBufferLocked" into jb-mr1-dev
Jamie Gennis [Mon, 20 Aug 2012 18:30:44 +0000 (11:30 -0700)]
SurfaceTexture: call ConsumerBase::freeBufferLocked
This change fixes SurfaceTexture::freeBufferLocked so that it calls the base
class implementation.
Change-Id: I45d76fb2eb02c1fa6e4e917823ead83e2086bd15
Jean-Baptiste Queru [Mon, 20 Aug 2012 17:25:39 +0000 (10:25 -0700)]
am
d3bbcaff: resolved conflicts for merge of
21938749 to jb-mr1-dev
* commit '
d3bbcaff6f0e08db0412d92f42562a2826a58bec':
Fix error trap in SurfaceTexture Client
Jean-Baptiste Queru [Mon, 20 Aug 2012 17:22:33 +0000 (10:22 -0700)]
resolved conflicts for merge of
21938749 to jb-mr1-dev
Change-Id: I17da10797736f3772a143e2015fe25df0bb3eb3f
Jean-Baptiste Queru [Mon, 20 Aug 2012 16:44:44 +0000 (09:44 -0700)]
am
0adc8f26: am
6e820eec: am
6f89ebde: Merge "EGL: do not use sparse files for shader"
* commit '
0adc8f260023ec25c31ff4ceadde047528cb64ab':
EGL: do not use sparse files for shader
Jean-Baptiste Queru [Mon, 20 Aug 2012 16:42:32 +0000 (09:42 -0700)]
am
6e820eec: am
6f89ebde: Merge "EGL: do not use sparse files for shader"
* commit '
6e820eec21917f8e25c40dbc8b972468535af0e8':
EGL: do not use sparse files for shader
Jean-Baptiste Queru [Mon, 20 Aug 2012 16:40:11 +0000 (09:40 -0700)]
am
349149b5: Merge "Fix error trap in SurfaceTexture Client"
* commit '
349149b52a424c212e33d165bc146bc0337ea4c4':
Fix error trap in SurfaceTexture Client
Jean-Baptiste Queru [Mon, 20 Aug 2012 16:40:11 +0000 (09:40 -0700)]
am
6f89ebde: Merge "EGL: do not use sparse files for shader"
* commit '
6f89ebded650406818b5fc5e9eaf096a06a2798c':
EGL: do not use sparse files for shader
Jean-Baptiste Queru [Mon, 20 Aug 2012 15:55:04 +0000 (08:55 -0700)]
Merge "Fix error trap in SurfaceTexture Client"
Jean-Baptiste Queru [Mon, 20 Aug 2012 15:54:42 +0000 (08:54 -0700)]
Merge "EGL: do not use sparse files for shader"
The Android Automerger [Mon, 20 Aug 2012 13:34:51 +0000 (06:34 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Mathias Agopian [Fri, 17 Aug 2012 22:06:02 +0000 (15:06 -0700)]
Fix deadlock in SF.
problem was that we were acquiring a strong reference
on Connection object with a lock held, when those
got out of scope (lock still held) their dtor
could be called if all other refs had dropped,
the dtor would acquire the lock again to
remove the Connection from the main list. boom.
we rearange the code so this doesn't happen.
Bug:
6942208
Change-Id: I0a0ebabce2842d29d60d645b64aac2f26640e59b
Jamie Gennis [Fri, 17 Aug 2012 22:37:56 +0000 (15:37 -0700)]
am
2c7eb92b: Merge "SurfaceTexture: inherit from ConsumerBase" into jb-mr1-dev
* commit '
2c7eb92b6394427bfe81962668d46194959bc722':
SurfaceTexture: inherit from ConsumerBase
Jamie Gennis [Fri, 17 Aug 2012 22:35:17 +0000 (15:35 -0700)]
Merge "SurfaceTexture: inherit from ConsumerBase" into jb-mr1-dev
Mathias Agopian [Fri, 17 Aug 2012 05:33:30 +0000 (22:33 -0700)]
am
cd60f99a: refactor compositing code to avoid multiple eglMakeCurrent() calls
* commit '
cd60f99aba9e750700a967db30b74a29145739cf':
refactor compositing code to avoid multiple eglMakeCurrent() calls
Mathias Agopian [Fri, 17 Aug 2012 05:33:30 +0000 (22:33 -0700)]
am
5f20e2d4: reimplement wifi display hack with new external display SF framework
* commit '
5f20e2d4462da3471f59152b32cd8640fa4a21da':
reimplement wifi display hack with new external display SF framework
Mathias Agopian [Fri, 17 Aug 2012 04:01:27 +0000 (21:01 -0700)]
am
818b4605: display states can\'t share the dirty flags
* commit '
818b46058aa3006e1d3c178abd36d4f10823f5d9':
display states can't share the dirty flags
Mathias Agopian [Fri, 17 Aug 2012 04:01:26 +0000 (21:01 -0700)]
am
111b2d89: binder interfaces can\'t be compared directly
* commit '
111b2d89221722d38f5b5b3ba65904ec22421839':
binder interfaces can't be compared directly
Mathias Agopian [Thu, 16 Aug 2012 23:28:27 +0000 (16:28 -0700)]
refactor compositing code to avoid multiple eglMakeCurrent() calls
when multiple displays are connected, we ended-up having to
call eglMakeCurrent() twice per display due to a limitation
in EGL. this fixes that.
Change-Id: I11e4584df50f8c24bbecee74e37b28b3ee031d2f
Mathias Agopian [Sat, 11 Aug 2012 01:50:38 +0000 (18:50 -0700)]
reimplement wifi display hack with new external display SF framework
fix a few bugs with external displays
- HWComposer doesn't really handle multiple displays yet
so there is a lot of ugliness there
- We also need to make sure that external displays are not
blanked by default
- due to some EGL limitations surfaces being swapped need
to be current
Change-Id: I82bff05b43bcebd8da863c7c76b4edbc3bc223a9
Mathias Agopian [Fri, 17 Aug 2012 03:57:39 +0000 (20:57 -0700)]
display states can't share the dirty flags
Change-Id: Ifade9f2f1a0df9a36aede77a6cf5eee4be534f98
Mathias Agopian [Fri, 17 Aug 2012 03:52:17 +0000 (20:52 -0700)]
binder interfaces can't be compared directly
we always need to compare their binder
Change-Id: I70d554ebc5009fe81e87923235f91451f32e1a30
The Android Open Source Project [Fri, 17 Aug 2012 02:10:39 +0000 (19:10 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I2f5150a2972fd8cc92ed4c38c975a8ac73283879
Jamie Gennis [Wed, 8 Aug 2012 01:03:04 +0000 (18:03 -0700)]
SurfaceTexture: inherit from ConsumerBase
This change makes SurfaceTexture inherit from ConsumerBase. It removes all of
the functionality from SurfaceTexture that is now provided by the base class.
Change-Id: I4a881df42810a14ee32d4ef7c8772a8f2510f4c7
Siva Velusamy [Thu, 16 Aug 2012 23:29:05 +0000 (16:29 -0700)]
am
c21fc05a: Merge "gltrace: flush trace buffer on createContext & makeCurrent" into jb-mr1-dev
* commit '
c21fc05af75ee746e29f48b6d231127ee000f7ed':
gltrace: flush trace buffer on createContext & makeCurrent
Siva Velusamy [Thu, 16 Aug 2012 23:26:59 +0000 (16:26 -0700)]
Merge "gltrace: flush trace buffer on createContext & makeCurrent" into jb-mr1-dev
Siva Velusamy [Thu, 16 Aug 2012 21:41:20 +0000 (14:41 -0700)]
gltrace: flush trace buffer on createContext & makeCurrent
Certain apps (e.g. chrome) seem to create contexts which are unused
for long periods of time. If tracing is stopped before those contexts
are used, then the debugger never gets to know that these contexts
were created. Flushing the trace after these calls ensures that
the debugger knows about all created/used contexts.
Change-Id: I01baa11aa56ac89eddce3c2851e4bf01076984d1
The Android Automerger [Thu, 16 Aug 2012 13:33:59 +0000 (06:33 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Mathias Agopian [Wed, 15 Aug 2012 20:46:03 +0000 (13:46 -0700)]
we were mistakenly optimizing out SF's main transactions in some cases
due to a typo, SF's main transaction was conditional to having a
display transaction.
more correct fix for
6970310
Bug:
6970310
Change-Id: Iafd8c4e02afa5db829cc1c65950cfcc74754c6af
Mathias Agopian [Wed, 15 Aug 2012 23:16:44 +0000 (16:16 -0700)]
am
13233e06: oopsie, missed a spot when fixing b/
6970310
* commit '
13233e067b8f71adc3a0ade5f442265e1f27084b':
oopsie, missed a spot when fixing b/
6970310
Mathias Agopian [Wed, 15 Aug 2012 23:14:33 +0000 (16:14 -0700)]
oopsie, missed a spot when fixing b/
6970310
Change-Id: Ia320fddc7cc4b0666a4fee678af710ecf5f83ff5
Mathias Agopian [Wed, 15 Aug 2012 20:50:23 +0000 (13:50 -0700)]
am
3559b07a: we were mistakenly optimizing out SF\'s main transactions in some cases
* commit '
3559b07a885bcdff51a6dffb8e3a5ac5adf3a220':
we were mistakenly optimizing out SF's main transactions in some cases
Mathias Agopian [Wed, 15 Aug 2012 20:46:03 +0000 (13:46 -0700)]
we were mistakenly optimizing out SF's main transactions in some cases
due to a typo, SF's main transaction was conditional to having a
display transaction.
more correct fix for
6970310
Bug:
6970310
Change-Id: Iafd8c4e02afa5db829cc1c65950cfcc74754c6af
Jeff Brown [Wed, 15 Aug 2012 17:28:08 +0000 (10:28 -0700)]
am
ac1f70bb: Use new PowerManager API.
* commit '
ac1f70bb7135cd5fe73d6fbf121a62c779679c5a':
Use new PowerManager API.
Jeff Brown [Wed, 15 Aug 2012 17:00:59 +0000 (10:00 -0700)]
am
01eb9792: Fix layer removal transaction.
* commit '
01eb979243a57bd33f8389aeeade8024dd0258c0':
Fix layer removal transaction.
The Android Open Source Project [Wed, 15 Aug 2012 15:27:33 +0000 (08:27 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I444e336418583d709973a26579a4f1027ca4abfa
The Android Automerger [Wed, 15 Aug 2012 13:34:21 +0000 (06:34 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Jeff Brown [Sat, 28 Jul 2012 01:07:41 +0000 (18:07 -0700)]
Use new PowerManager API.
Change-Id: I66165d9954e2d1da9204216382a05a873f1393f4
Jeff Brown [Wed, 15 Aug 2012 08:08:54 +0000 (01:08 -0700)]
Fix layer removal transaction.
Layers were not properly being removed because we were
setting the wrong transaction type flag at the time of
removal.
When layers are removed, we must use eDisplayTransactionNeeded,
not eTransactionNeeded, to ensure that the mLayersRemoved
flag is checked and the appropriate cleanup occurs.
Bug:
6970310
Change-Id: Id4b2897a34d4ac00aa0f92349c0ec6db95c1aaf7
Jesse Hall [Tue, 14 Aug 2012 22:49:29 +0000 (15:49 -0700)]
am
ea599dff: Don\'t crash when recovering from WM death
* commit '
ea599dfff03b45903dae3288274c31cb24fd483f':
Don't crash when recovering from WM death
Jesse Hall [Mon, 13 Aug 2012 21:47:01 +0000 (14:47 -0700)]
Don't crash when recovering from WM death
Bug:
6956162
Change-Id: I27244b960c77187b4c4cd7297989c4c872e94a3a
The Android Automerger [Tue, 14 Aug 2012 14:07:23 +0000 (07:07 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Jeff Brown [Tue, 14 Aug 2012 06:36:43 +0000 (23:36 -0700)]
am
f0083bf5: Merge "Add a very simple helper function to log slow functions." into jb-mr1-dev
* commit '
f0083bf5288e0d430b0dc5cbc4b4852bce2ff1af':
Add a very simple helper function to log slow functions.
Jeff Brown [Tue, 14 Aug 2012 06:35:07 +0000 (23:35 -0700)]
Merge "Add a very simple helper function to log slow functions." into jb-mr1-dev
Mathias Agopian [Tue, 14 Aug 2012 01:34:27 +0000 (18:34 -0700)]
am
20128300: make sure to repaint the screen when unblank()ing
* commit '
20128300e0cb7f459a60cfbcddb48190ce6545ed':
make sure to repaint the screen when unblank()ing
Mathias Agopian [Tue, 14 Aug 2012 01:32:13 +0000 (18:32 -0700)]
make sure to repaint the screen when unblank()ing
Change-Id: I38e3a8e6bb31ef3d2f1fcaec7490cb92a4427db2
Mathias Agopian [Tue, 14 Aug 2012 00:58:12 +0000 (17:58 -0700)]
am
8b736f13: xdpi / ydpi were reported as 0
* commit '
8b736f138cfd9b239a2c7073347a13c489534ae1':
xdpi / ydpi were reported as 0
Mathias Agopian [Tue, 14 Aug 2012 00:54:26 +0000 (17:54 -0700)]
xdpi / ydpi were reported as 0
Bug:
6975723
Change-Id: Ia7fa37ec11e2308804f5034959a37e508d292d31
Mathias Agopian [Mon, 13 Aug 2012 21:29:38 +0000 (14:29 -0700)]
am
670d24a8: Merge "improve [un]marshalling of non-binder objects" into jb-mr1-dev
* commit '
670d24a8aeffee2788680be665bd74e0275cc2cf':
improve [un]marshalling of non-binder objects
Mathias Agopian [Mon, 13 Aug 2012 21:28:24 +0000 (14:28 -0700)]
Merge "improve [un]marshalling of non-binder objects" into jb-mr1-dev
Jesse Hall [Mon, 13 Aug 2012 19:14:29 +0000 (12:14 -0700)]
am
7e5099a9: Add compile-time option to systrace GL-ES calls
* commit '
7e5099a9ece6a3ed7edb1b5bf60a43422428326c':
Add compile-time option to systrace GL-ES calls
Jesse Hall [Thu, 2 Aug 2012 00:10:25 +0000 (17:10 -0700)]
Add compile-time option to systrace GL-ES calls
Change-Id: Ibec103bbf159626ad9745d0e071192ad424bc0e9
The Android Automerger [Mon, 13 Aug 2012 15:09:24 +0000 (08:09 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Mathias Agopian [Mon, 13 Aug 2012 02:37:16 +0000 (19:37 -0700)]
improve [un]marshalling of non-binder objects
this change introduces a new class LightFlattenable<> which is
a protocol to flatten simple objects that don't require
binders or file descriptors; the benefit of this protocol is that
it doesn't require the objects to have a virtual table and give us
a consitant way of doing this.
we also introduce an implementation of this protocol for
POD structures, LightFlattenablePod<>.
Parcel has been update to handle this protocol automatically.
Sensor, Rect, Point and Region now use this new protocol.
Change-Id: Icb3ce7fa1d785249eb666f39c2129f2fc143ea4a
Jeff Brown [Sat, 11 Aug 2012 03:44:39 +0000 (20:44 -0700)]
Add a very simple helper function to log slow functions.
Change-Id: I2e2e072206d02b572a330dd25857c161b5b563bf
Mathias Agopian [Sat, 11 Aug 2012 01:53:14 +0000 (18:53 -0700)]
am
e57f2925: make multi-display more real
* commit '
e57f292595bec48f65c8088b00ff6beea01217e9':
make multi-display more real
Mathias Agopian [Thu, 9 Aug 2012 23:29:12 +0000 (16:29 -0700)]
make multi-display more real
- displays are represented by a binder on the client side
- c++ clients can now create and modify displays
Change-Id: I203ea5b4beae0819d742ec5171c27568f4e8354b
Mathias Agopian [Fri, 10 Aug 2012 22:27:01 +0000 (15:27 -0700)]
am
ef7b9c7e: screenshots could stop working after camera was used
* commit '
ef7b9c7eac036cc1230c64821039d18f8cbd2c1c':
screenshots could stop working after camera was used
Mathias Agopian [Fri, 10 Aug 2012 22:22:19 +0000 (15:22 -0700)]
screenshots could stop working after camera was used
once a secure window is put on screen the display
would retain its "secure" flag forever, preventing
screenshots from being taken.
Bug:
6933967
Change-Id: I5be8355145ca7d580d84552311642f8fa912fe6a
Mathias Agopian [Fri, 10 Aug 2012 21:40:37 +0000 (14:40 -0700)]
am
748f3df6: avoid crashing when we don\'t have an h/w composer
* commit '
748f3df66f6695681cde44461e2548e6e1dbc1bb':
avoid crashing when we don't have an h/w composer
Mathias Agopian [Fri, 10 Aug 2012 21:36:40 +0000 (14:36 -0700)]
avoid crashing when we don't have an h/w composer
should fix the emulator
Bug:
6956162
Change-Id: I38247b59d276b8db078c4dc2caba7d3fb545912c
Mathias Agopian [Fri, 10 Aug 2012 20:45:15 +0000 (13:45 -0700)]
am
3165cc21: libgui includes refactoring
* commit '
3165cc21cfea781988407b19bd83292b19f05f55':
libgui includes refactoring
Mathias Agopian [Fri, 10 Aug 2012 20:43:42 +0000 (13:43 -0700)]
am
1e260874: Add a display parameter to HWComposer where needed
* commit '
1e26087493ac0e7d7dc6dea8ad85cfef08b3271f':
Add a display parameter to HWComposer where needed
Mathias Agopian [Fri, 10 Aug 2012 20:40:13 +0000 (13:40 -0700)]
am
28947d7f: now able to set the layer stack on a DisplayDevice
* commit '
28947d7fbf9f486539322e8e12dd057568e180c2':
now able to set the layer stack on a DisplayDevice
Mathias Agopian [Fri, 10 Aug 2012 20:40:12 +0000 (13:40 -0700)]
am
69973992: improve Vector<> safety checks
* commit '
69973992d531ae7df20916c6fb3034b08a6d53c4':
improve Vector<> safety checks
Mathias Agopian [Thu, 9 Aug 2012 02:42:09 +0000 (19:42 -0700)]
libgui includes refactoring
Change-Id: I1d24ec17f5003ec2abab5f7472daaff4cc4cc2d3
Mathias Agopian [Thu, 9 Aug 2012 01:35:12 +0000 (18:35 -0700)]
Add a display parameter to HWComposer where needed
- also replace C casts with C++ casts
- only the interface is changed, HWComposer still doesn't
fully handle multiple displays
Change-Id: I48eb89bff2edb76bf1d4d41f46802b9b2a7166a8
Mathias Agopian [Thu, 9 Aug 2012 01:51:15 +0000 (18:51 -0700)]
now able to set the layer stack on a DisplayDevice
Change-Id: Ia9691cf221b9444c243eb468d9e276a30e600b6b
Mathias Agopian [Fri, 10 Aug 2012 02:39:15 +0000 (19:39 -0700)]
improve Vector<> safety checks
- make errors that will always cause a memory corruption always fatal
(for eg: KeyedVector<>::editValue{For|At}() failure)
- make other errors fatal in debug mode, those that can be caught by
the caller.
- fix typos
Change-Id: I65cc7d81035c37ce2906fc4500c50e5d5b5c49eb
The Android Open Source Project [Fri, 10 Aug 2012 15:52:49 +0000 (08:52 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: Ie9a1491c6957ea87bd50d4e19342b5f086ff08ee
The Android Automerger [Thu, 9 Aug 2012 16:29:52 +0000 (09:29 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Jamie Gennis [Wed, 8 Aug 2012 23:15:11 +0000 (16:15 -0700)]
am
599d4882: Merge "SurfaceTexture: Fix a fence fd leak." into jb-mr1-dev
* commit '
599d48825f040c074027ffaf9e4b5490428adacb':
SurfaceTexture: Fix a fence fd leak.
Jamie Gennis [Wed, 8 Aug 2012 23:13:20 +0000 (16:13 -0700)]
Merge "SurfaceTexture: Fix a fence fd leak." into jb-mr1-dev
Jamie Gennis [Wed, 8 Aug 2012 22:39:55 +0000 (15:39 -0700)]
SurfaceTexture: Fix a fence fd leak.
Bug:
6949010
Change-Id: I289992c964504b4fe5458dbd19b248a841ef043f
Mathias Agopian [Wed, 8 Aug 2012 22:33:45 +0000 (15:33 -0700)]
am
85aea748: add /d/sync to dumpstate
* commit '
85aea748861b5665e68b786b55f1c798f56fc0da':
add /d/sync to dumpstate