Jeff Brown
65b2493675
am 01eb9792
: Fix layer removal transaction.
...
* commit '01eb979243a57bd33f8389aeeade8024dd0258c0':
Fix layer removal transaction.
2012-08-15 10:00:59 -07:00
The Android Open Source Project
1b488abc8e
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I444e336418583d709973a26579a4f1027ca4abfa
2012-08-15 08:27:33 -07:00
The Android Automerger
741fac3fee
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-15 06:34:21 -07:00
Jeff Brown
01eb979243
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
2012-08-15 01:16:16 -07:00
Jesse Hall
d007dc12c6
am ea599dff
: Don\'t crash when recovering from WM death
...
* commit 'ea599dfff03b45903dae3288274c31cb24fd483f':
Don't crash when recovering from WM death
2012-08-14 15:49:29 -07:00
Jesse Hall
ea599dfff0
Don't crash when recovering from WM death
...
Bug: 6956162
Change-Id: I27244b960c77187b4c4cd7297989c4c872e94a3a
2012-08-14 15:33:04 -07:00
The Android Automerger
92f49e7877
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-14 07:07:23 -07:00
Jeff Brown
1375ed00c1
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.
2012-08-13 23:36:43 -07:00
Jeff Brown
f0083bf528
Merge "Add a very simple helper function to log slow functions." into jb-mr1-dev
2012-08-13 23:35:08 -07:00
Mathias Agopian
4078cad3f3
am 20128300
: make sure to repaint the screen when unblank()ing
...
* commit '20128300e0cb7f459a60cfbcddb48190ce6545ed':
make sure to repaint the screen when unblank()ing
2012-08-13 18:34:27 -07:00
Mathias Agopian
20128300e0
make sure to repaint the screen when unblank()ing
...
Change-Id: I38e3a8e6bb31ef3d2f1fcaec7490cb92a4427db2
2012-08-13 18:32:13 -07:00
Mathias Agopian
65c9612c4f
am 8b736f13
: xdpi / ydpi were reported as 0
...
* commit '8b736f138cfd9b239a2c7073347a13c489534ae1':
xdpi / ydpi were reported as 0
2012-08-13 17:58:12 -07:00
Mathias Agopian
8b736f138c
xdpi / ydpi were reported as 0
...
Bug: 6975723
Change-Id: Ia7fa37ec11e2308804f5034959a37e508d292d31
2012-08-13 17:54:26 -07:00
Mathias Agopian
57160091f2
am 670d24a8
: Merge "improve [un]marshalling of non-binder objects" into jb-mr1-dev
...
* commit '670d24a8aeffee2788680be665bd74e0275cc2cf':
improve [un]marshalling of non-binder objects
2012-08-13 14:29:38 -07:00
Mathias Agopian
670d24a8ae
Merge "improve [un]marshalling of non-binder objects" into jb-mr1-dev
2012-08-13 14:28:25 -07:00
Jesse Hall
b58c6d5ef1
am 7e5099a9
: Add compile-time option to systrace GL-ES calls
...
* commit '7e5099a9ece6a3ed7edb1b5bf60a43422428326c':
Add compile-time option to systrace GL-ES calls
2012-08-13 12:14:29 -07:00
Jesse Hall
7e5099a9ec
Add compile-time option to systrace GL-ES calls
...
Change-Id: Ibec103bbf159626ad9745d0e071192ad424bc0e9
2012-08-13 12:13:05 -07:00
The Android Automerger
4350904287
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-13 08:09:24 -07:00
Mathias Agopian
8683fca395
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
2012-08-13 02:46:05 -07:00
Jeff Brown
6f12d57325
Add a very simple helper function to log slow functions.
...
Change-Id: I2e2e072206d02b572a330dd25857c161b5b563bf
2012-08-10 22:03:55 -07:00
Mathias Agopian
26b7d98b65
am e57f2925
: make multi-display more real
...
* commit 'e57f292595bec48f65c8088b00ff6beea01217e9':
make multi-display more real
2012-08-10 18:53:14 -07:00
Mathias Agopian
e57f292595
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
2012-08-10 17:32:33 -07:00
Mathias Agopian
f8aa5d8b92
am ef7b9c7e
: screenshots could stop working after camera was used
...
* commit 'ef7b9c7eac036cc1230c64821039d18f8cbd2c1c':
screenshots could stop working after camera was used
2012-08-10 15:27:01 -07:00
Mathias Agopian
ef7b9c7eac
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
2012-08-10 15:23:41 -07:00
Mathias Agopian
75479ad98f
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
2012-08-10 14:40:37 -07:00
Mathias Agopian
748f3df66f
avoid crashing when we don't have an h/w composer
...
should fix the emulator
Bug: 6956162
Change-Id: I38247b59d276b8db078c4dc2caba7d3fb545912c
2012-08-10 14:36:40 -07:00
Mathias Agopian
213da6a4a8
am 3165cc21
: libgui includes refactoring
...
* commit '3165cc21cfea781988407b19bd83292b19f05f55':
libgui includes refactoring
2012-08-10 13:45:15 -07:00
Mathias Agopian
8db7c47703
am 1e260874
: Add a display parameter to HWComposer where needed
...
* commit '1e26087493ac0e7d7dc6dea8ad85cfef08b3271f':
Add a display parameter to HWComposer where needed
2012-08-10 13:43:42 -07:00
Mathias Agopian
b4a278daa6
am 28947d7f
: now able to set the layer stack on a DisplayDevice
...
* commit '28947d7fbf9f486539322e8e12dd057568e180c2':
now able to set the layer stack on a DisplayDevice
2012-08-10 13:40:13 -07:00
Mathias Agopian
2461168726
am 69973992
: improve Vector<> safety checks
...
* commit '69973992d531ae7df20916c6fb3034b08a6d53c4':
improve Vector<> safety checks
2012-08-10 13:40:12 -07:00
Mathias Agopian
3165cc21cf
libgui includes refactoring
...
Change-Id: I1d24ec17f5003ec2abab5f7472daaff4cc4cc2d3
2012-08-10 13:18:24 -07:00
Mathias Agopian
1e26087493
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
2012-08-10 13:18:24 -07:00
Mathias Agopian
28947d7fbf
now able to set the layer stack on a DisplayDevice
...
Change-Id: Ia9691cf221b9444c243eb468d9e276a30e600b6b
2012-08-10 13:18:23 -07:00
Mathias Agopian
69973992d5
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
2012-08-10 13:15:00 -07:00
The Android Open Source Project
5a438f5235
Reconcile with jb-mr1-release - do not merge
...
Change-Id: Ie9a1491c6957ea87bd50d4e19342b5f086ff08ee
2012-08-10 08:52:49 -07:00
The Android Automerger
19f5a345ce
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-09 09:29:52 -07:00
Jamie Gennis
1fbcb3173b
am 599d4882
: Merge "SurfaceTexture: Fix a fence fd leak." into jb-mr1-dev
...
* commit '599d48825f040c074027ffaf9e4b5490428adacb':
SurfaceTexture: Fix a fence fd leak.
2012-08-08 16:15:11 -07:00
Jamie Gennis
599d48825f
Merge "SurfaceTexture: Fix a fence fd leak." into jb-mr1-dev
2012-08-08 16:13:21 -07:00
Jamie Gennis
3d1d09c0c1
SurfaceTexture: Fix a fence fd leak.
...
Bug: 6949010
Change-Id: I289992c964504b4fe5458dbd19b248a841ef043f
2012-08-08 15:39:55 -07:00
Mathias Agopian
15d656f3f5
am 85aea748
: add /d/sync to dumpstate
...
* commit '85aea748861b5665e68b786b55f1c798f56fc0da':
add /d/sync to dumpstate
2012-08-08 15:33:45 -07:00
Mathias Agopian
85aea74886
add /d/sync to dumpstate
...
Change-Id: I24f8f3e0420c2198ae3981fc067fb660898655e8
2012-08-08 15:32:02 -07:00
Keun young Park
b910bebf52
am a610da90
: Merge "enable java/jni build in PDK if supported" into jb-mr1-dev
...
* commit 'a610da900cf67f0cbd323c60a0dd55827df8313a':
enable java/jni build in PDK if supported
2012-08-08 12:26:18 -07:00
Keun young Park
a610da900c
Merge "enable java/jni build in PDK if supported" into jb-mr1-dev
2012-08-08 12:25:15 -07:00
The Android Open Source Project
9f2ef2fbf5
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I939b3c749ca86343996e1d4aefb32a7f30df037a
2012-08-08 08:17:08 -07:00
The Android Automerger
a1f4bf8412
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-08 06:47:25 -07:00
Keun young Park
203a3357c7
enable java/jni build in PDK if supported
...
- testFramerate requires platform java API
while all other tests only need SDK support
Change-Id: Iaefe23c41b3ace87522b5deefd6db2f5d80ed872
2012-08-07 17:09:19 -07:00
Jesse Hall
6eef3a3667
am b685c542
: Changes to support multi-display HWC
...
* commit 'b685c542836b93c99cd85053e07696406ea37adb':
Changes to support multi-display HWC
2012-08-07 13:50:44 -07:00
Jesse Hall
b685c54283
Changes to support multi-display HWC
...
Change-Id: I07efff54f2980dcb013935747b03e099b8f1181b
2012-08-07 12:16:36 -07:00
The Android Open Source Project
9a7768a4f3
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I699a2310b14b3168c32dca19e4c9055eeab79d1a
2012-08-07 11:03:48 -07:00
The Android Automerger
d02212da42
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-07 06:34:29 -07:00