Commit Graph

46979 Commits

Author SHA1 Message Date
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
Jamie Gennis
a9311c17f6 am 14bd369e: Merge changes Ic3d35a93,I46ec942d into jb-mr1-dev
* commit '14bd369e4b711bfb267279c2161358542ed75b29':
  SurfaceTexture: fix an out of bounds array access
  surfaceflinger: refactor FrambufferSurface
2012-08-06 19:17:34 -07:00
Greg Hackmann
196c50d0eb am 92516c84: fix pdk build
* commit '92516c84ef2a167524007a0584fb26018b5cb9c4':
  fix pdk build
2012-08-06 19:16:06 -07:00
Jamie Gennis
14bd369e4b Merge changes Ic3d35a93,I46ec942d into jb-mr1-dev
* changes:
  SurfaceTexture: fix an out of bounds array access
  surfaceflinger: refactor FrambufferSurface
2012-08-06 19:15:51 -07:00
Jamie Gennis
45cb2ba1d5 SurfaceTexture: fix an out of bounds array access
Bug: 6879028
Change-Id: Ic3d35a9384c0a6dfa4000e7743a6f6859608b0bf
2012-08-06 18:55:01 -07:00
Jamie Gennis
1a4d883dcc surfaceflinger: refactor FrambufferSurface
This change refactors the FramebufferSurface class to inherit from the new
ConsumerBase class.

Bug: 6620200
Change-Id: I46ec942ddb019658e3c5e79465548b171b2261f2
2012-08-06 18:55:01 -07:00
Greg Hackmann
92516c84ef fix pdk build
Change-Id: Ia4db8e1e8ee18ac112bf13a5ab2a75edb08fc70f
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2012-08-06 13:55:56 -07:00
The Android Open Source Project
95bd5ab912 Reconcile with jb-mr1-release - do not merge
Change-Id: I4761d711f0886ee4e81496a0068e35bcb91bf8b3
2012-08-06 13:34:52 -07:00
Mathias Agopian
a730878db2 am 53095e25: libutils cleanup: remove unused or seldom used code from misc.{cpp|h}
* commit '53095e25d69206bea1ac15a7382ab8b61155c0c1':
  libutils cleanup: remove unused or seldom used code from misc.{cpp|h}
2012-08-06 13:16:39 -07:00
The Android Automerger
348b71e295 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-08-06 06:28:31 -07:00
Mathias Agopian
53095e25d6 libutils cleanup: remove unused or seldom used code from misc.{cpp|h}
Change-Id: I72206f16619d81887e3b85603494563faab3b445
2012-08-05 12:41:16 -07:00
Mathias Agopian
fe00fb0d73 am 028a7572: DisplayDevice doesn\'t need weak pointers or polymorphism
* commit '028a7572c81f91e4039b694cde1f55fdb3e483c7':
  DisplayDevice doesn't need weak pointers or polymorphism
2012-08-05 01:33:09 -07:00
Mathias Agopian
028a7572c8 DisplayDevice doesn't need weak pointers or polymorphism
let's use a LightRefBase for now.

Change-Id: Ida068fa902343a8f89ffb6d34c2cd4627ab43c6c
2012-08-05 01:23:51 -07:00
Mathias Agopian
0a569b66fd am 4297734c: turn DisplayDevice into a reference-counted object
* commit '4297734c1156fd8ede7e9c61b1e439f9e1c18cd9':
  turn DisplayDevice into a reference-counted object
2012-08-05 00:44:58 -07:00
Mathias Agopian
4297734c11 turn DisplayDevice into a reference-counted object
it's safer this way because this object owns an
EGLSurface which cannot be easily reference-counted.

it also gives us the ability to sub-class it, which
we might want to do soon.

Change-Id: I07358bb052dc5a13b4f2196b2c2b6e6e94c4bb4f
2012-08-05 00:40:46 -07:00
Mathias Agopian
dba3c59696 am d8552d79: DisplayDevice only needs ANativeWindow not SurfaceTextureClient
* commit 'd8552d796cbcb9a89711fc8f97b34838da5cbdb7':
  DisplayDevice only needs ANativeWindow not SurfaceTextureClient
2012-08-04 21:43:07 -07:00
Mathias Agopian
d8552d796c DisplayDevice only needs ANativeWindow not SurfaceTextureClient
Change-Id: Ib5be5af8bede435c8d5d9fabf586d28d0e74c2cb
2012-08-04 21:39:11 -07:00
Mathias Agopian
8766b0cc8f am 888c822c: remove a dependency of DisplayDevice on the refresh rate
* commit '888c822c4cb6976aab9256c58bae9e17e3e55c5c':
  remove a dependency of DisplayDevice on the refresh rate
2012-08-04 21:33:29 -07:00
Mathias Agopian
888c822c4c remove a dependency of DisplayDevice on the refresh rate
this remove a dependency (not all) on FramebufferSurface

Change-Id: Ie07ce70760cdcedfb41b5b41bea8da45637bf474
2012-08-04 21:23:47 -07:00
Mathias Agopian
7d892ee892 am 72131d9e: remove unneeded dependencies in libhardware
* commit '72131d9ef13ffaf3af4ca2fe700426b82baac9fa':
  remove unneeded dependencies in libhardware
2012-08-04 20:25:31 -07:00