OSDN Git Service

android-x86/frameworks-native.git
10 years agoam ade9a911: am f65ebc3b: am f5bcb391: Merge "SurfaceFlinger: mFbProducerSlot initail...
Jesse Hall [Tue, 28 Jan 2014 18:26:56 +0000 (18:26 +0000)]
am ade9a911: am f65ebc3b: am f5bcb391: Merge "SurfaceFlinger: mFbProducerSlot initailization"

* commit 'ade9a911d04dbd4bfbd3e80a917ea67a581b4797':
  SurfaceFlinger: mFbProducerSlot initailization

10 years agoam f65ebc3b: am f5bcb391: Merge "SurfaceFlinger: mFbProducerSlot initailization"
Jesse Hall [Tue, 28 Jan 2014 18:24:10 +0000 (18:24 +0000)]
am f65ebc3b: am f5bcb391: Merge "SurfaceFlinger: mFbProducerSlot initailization"

* commit 'f65ebc3be4d3a2e4c71c401d0e53f2ad5798be2a':
  SurfaceFlinger: mFbProducerSlot initailization

10 years agoam f5bcb391: Merge "SurfaceFlinger: mFbProducerSlot initailization"
Jesse Hall [Tue, 28 Jan 2014 18:22:35 +0000 (18:22 +0000)]
am f5bcb391: Merge "SurfaceFlinger: mFbProducerSlot initailization"

* commit 'f5bcb391c5a4282fa5fe14856faf1423a2bc44c5':
  SurfaceFlinger: mFbProducerSlot initailization

10 years agoMerge "SurfaceFlinger: mFbProducerSlot initailization"
Jesse Hall [Tue, 28 Jan 2014 18:17:46 +0000 (18:17 +0000)]
Merge "SurfaceFlinger: mFbProducerSlot initailization"

10 years agoSurfaceFlinger: mFbProducerSlot initailization
mayank parshar [Thu, 23 Jan 2014 09:38:31 +0000 (15:08 +0530)]
SurfaceFlinger: mFbProducerSlot initailization

b/12487813

SurfaceFlinger crash is observed during simulation of
Secondary display

Note: change 14e8b01a761180250671f3d6494532d8bd04fa8e
removed the initialization leading to the crash when
simulating secondary display.  Restore the initialization
to solve the problem.

Change-Id: Iae5845fb82735e01de5cc0dc582d13c27e3c614f
Signed-off-by: mayank parshar <mayankp@broadcom.com>
Signed-off-by: Pierre Couillaud <pierre@broadcom.com>
10 years agoam 0da82a6f: am 689a7f30: am 851b2cb1: Merge "Make libEGL build cleanly under 64...
Colin Cross [Tue, 28 Jan 2014 02:35:36 +0000 (02:35 +0000)]
am 0da82a6f: am 689a7f30: am 851b2cb1: Merge "Make libEGL build cleanly under 64-bit"

* commit '0da82a6f0d5b7f6466aa4622fc4cf1547f208499':
  Make libEGL build cleanly under 64-bit

10 years agoam 689a7f30: am 851b2cb1: Merge "Make libEGL build cleanly under 64-bit"
Colin Cross [Tue, 28 Jan 2014 02:29:37 +0000 (02:29 +0000)]
am 689a7f30: am 851b2cb1: Merge "Make libEGL build cleanly under 64-bit"

* commit '689a7f30ccd2e57eaadecedbe30690e2a44ce23a':
  Make libEGL build cleanly under 64-bit

10 years agoam 851b2cb1: Merge "Make libEGL build cleanly under 64-bit"
Colin Cross [Tue, 28 Jan 2014 02:27:41 +0000 (02:27 +0000)]
am 851b2cb1: Merge "Make libEGL build cleanly under 64-bit"

* commit '851b2cb18c329e0d19f9f56f68425b714007a274':
  Make libEGL build cleanly under 64-bit

10 years agoMerge "Make libEGL build cleanly under 64-bit"
Colin Cross [Tue, 28 Jan 2014 02:22:11 +0000 (02:22 +0000)]
Merge "Make libEGL build cleanly under 64-bit"

10 years agoMake libEGL build cleanly under 64-bit
Dan Stoza [Fri, 17 Jan 2014 19:38:34 +0000 (11:38 -0800)]
Make libEGL build cleanly under 64-bit

Change-Id: I255dfb70b166b7469d59352b1acfc7aececa07de

10 years agoam dec678db: am a21ba585: am 55f0668f: Merge "frameworks/native: convert LOCAL_MODULE...
Colin Cross [Tue, 28 Jan 2014 01:12:47 +0000 (01:12 +0000)]
am dec678db: am a21ba585: am 55f0668f: Merge "frameworks/native: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH"

* commit 'dec678dbd240e5c53afac8c3901d5beb23706378':
  frameworks/native: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH

10 years agoam a21ba585: am 55f0668f: Merge "frameworks/native: convert LOCAL_MODULE_PATH to...
Colin Cross [Tue, 28 Jan 2014 01:02:49 +0000 (01:02 +0000)]
am a21ba585: am 55f0668f: Merge "frameworks/native: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH"

* commit 'a21ba5856b6d3bdfcef183e09aa658e69ddb4786':
  frameworks/native: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH

10 years agoam 55f0668f: Merge "frameworks/native: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELA...
Colin Cross [Tue, 28 Jan 2014 00:59:40 +0000 (00:59 +0000)]
am 55f0668f: Merge "frameworks/native: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH"

* commit '55f0668ffd6fd7889e027b3072bf173a7ee48f08':
  frameworks/native: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH

10 years agoMerge "frameworks/native: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH"
Colin Cross [Tue, 28 Jan 2014 00:48:31 +0000 (00:48 +0000)]
Merge "frameworks/native: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH"

10 years agoframeworks/native: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH
Colin Cross [Sat, 25 Jan 2014 05:00:32 +0000 (21:00 -0800)]
frameworks/native: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH

LOCAL_MODULE_PATH doesn't work for multiarch builds, replace it
with LOCAL_MODULE_RELATIVE_PATH.

Change-Id: I4e4ceec61d026bbe74ba604554c06104bde42e5e

10 years agoMoved androidfw back to frameworks/base
Adam Lesinski [Mon, 27 Jan 2014 18:29:16 +0000 (10:29 -0800)]
Moved androidfw back to frameworks/base

Change-Id: Idd57bbbc86c936cbfd60e02f8ac8d4f8fbc94592

10 years agoAssetManager cookies should be int32_t and not void*.
Narayan Kamath [Fri, 24 Jan 2014 13:51:51 +0000 (13:51 +0000)]
AssetManager cookies should be int32_t and not void*.

Cookies are really indices into vectors and arrays, so
they don't need to be void*. We choose int32_t instead
of size_t to allow their width to be well specified.

Change-Id: I319f271bd4f102dee7cb9f00df4c75ea697456f5

10 years agoam 25f75c36: am 8c303f7e: am fcf9c1ba: Merge "SurfaceFlinger: mFbFence initialization"
Jesse Hall [Sun, 26 Jan 2014 16:50:36 +0000 (16:50 +0000)]
am 25f75c36: am 8c303f7e: am fcf9c1ba: Merge "SurfaceFlinger: mFbFence initialization"

* commit '25f75c361098086ffa2b87dcc3f22ac5f64c05be':
  SurfaceFlinger: mFbFence initialization

10 years agoam 8c303f7e: am fcf9c1ba: Merge "SurfaceFlinger: mFbFence initialization"
Jesse Hall [Sun, 26 Jan 2014 16:47:45 +0000 (16:47 +0000)]
am 8c303f7e: am fcf9c1ba: Merge "SurfaceFlinger: mFbFence initialization"

* commit '8c303f7e64b3de7748922e6f951d9e82bc96badd':
  SurfaceFlinger: mFbFence initialization

10 years agoam fcf9c1ba: Merge "SurfaceFlinger: mFbFence initialization"
Jesse Hall [Sun, 26 Jan 2014 16:45:40 +0000 (08:45 -0800)]
am fcf9c1ba: Merge "SurfaceFlinger: mFbFence initialization"

* commit 'fcf9c1bafb251c186191b9d066ed00d0b59b962a':
  SurfaceFlinger: mFbFence initialization

10 years agoMerge "SurfaceFlinger: mFbFence initialization"
Jesse Hall [Sun, 26 Jan 2014 08:15:15 +0000 (08:15 +0000)]
Merge "SurfaceFlinger: mFbFence initialization"

10 years agoSurfaceFlinger: mFbFence initialization
mayank parshar [Fri, 10 Jan 2014 04:57:45 +0000 (10:27 +0530)]
SurfaceFlinger: mFbFence initialization

MobC00383030
b/12487813

SurfaceFlinger crash is observed while connecting
to Wi-Fi display.

Note: change 14e8b01a761180250671f3d6494532d8bd04fa8e
removed the initialization leading to the crash when
running through the HWC composition path.  Restore the
initialization to solve the problem.

Change-Id: I581defc7135ac512080c0da06a62b1dae7d218c4
Signed-off-by: mayank parshar <mayankp@broadcom.com>
Signed-off-by: Pierre Couillaud <pierre@broadcom.com>
10 years agoam dd000905: am e3aeefd1: am af29b77a: Merge "libGLES_android: fix 64-bit compile...
Colin Cross [Sat, 25 Jan 2014 00:50:21 +0000 (00:50 +0000)]
am dd000905: am e3aeefd1: am af29b77a: Merge "libGLES_android: fix 64-bit compile errors"

* commit 'dd00090530340de22ca60f79446b5fe3050cd95f':
  libGLES_android: fix 64-bit compile errors

10 years agoam e3aeefd1: am af29b77a: Merge "libGLES_android: fix 64-bit compile errors"
Colin Cross [Sat, 25 Jan 2014 00:44:54 +0000 (00:44 +0000)]
am e3aeefd1: am af29b77a: Merge "libGLES_android: fix 64-bit compile errors"

* commit 'e3aeefd1f8a5ac0e4b2106fc1cf190ad4f75078c':
  libGLES_android: fix 64-bit compile errors

10 years agoam af29b77a: Merge "libGLES_android: fix 64-bit compile errors"
Colin Cross [Sat, 25 Jan 2014 00:42:36 +0000 (16:42 -0800)]
am af29b77a: Merge "libGLES_android: fix 64-bit compile errors"

* commit 'af29b77ab7dab5a1b5af27e7f7eeeb14584c101c':
  libGLES_android: fix 64-bit compile errors

10 years agoMerge "libGLES_android: fix 64-bit compile errors"
Colin Cross [Sat, 25 Jan 2014 00:38:15 +0000 (00:38 +0000)]
Merge "libGLES_android: fix 64-bit compile errors"

10 years agolibGLES_android: fix 64-bit compile errors
Colin Cross [Fri, 24 Jan 2014 22:35:39 +0000 (14:35 -0800)]
libGLES_android: fix 64-bit compile errors

Fix size of vertex_t on 64-bit architectures
Fix __get_tls casts, the TLS area is a void**
Cast through uintptr_t to store integers in a pointer
Use %zu to print size_t

Change-Id: I91079ec76025237e6d2081784c5348518b0ce122

10 years agoMake libEGL build cleanly under 64-bit
Dan Stoza [Fri, 17 Jan 2014 19:38:34 +0000 (11:38 -0800)]
Make libEGL build cleanly under 64-bit

Change-Id: I255dfb70b166b7469d59352b1acfc7aececa07de

10 years agoreleax wait timeout on start of dumpstate service
Guang Zhu [Wed, 15 Jan 2014 23:57:32 +0000 (15:57 -0800)]
releax wait timeout on start of dumpstate service

Bug: 12181612
Change-Id: If7ae97de1e42890dac37d036ead669ccda65e688

10 years agoMerge "libgui: Add a test for SRGB surfaces"
Dan Stoza [Wed, 8 Jan 2014 17:48:13 +0000 (17:48 +0000)]
Merge "libgui: Add a test for SRGB surfaces"

10 years agolibgui: Add a test for SRGB surfaces
Dan Stoza [Tue, 7 Jan 2014 23:25:02 +0000 (15:25 -0800)]
libgui: Add a test for SRGB surfaces

Add SRGBTest.RenderToSRGBSurface, which validates that passing the
SRGB colorspace attributes to eglCreateWindowSurface actually
results in an SRGB surface by comparing the output values to those
of a standard RGB surface.

Change-Id: I3d5fef8070ed8fa2357ddd1c5fcc849ae3fbd12a

10 years agoImprove error message
Andy McFadden [Tue, 7 Jan 2014 23:54:17 +0000 (15:54 -0800)]
Improve error message

The previous message indicated that the fault was due to an already-
connected window, which was misleading at times.

Bug 12439318

Change-Id: I1e0a042673dd245d1b0d237af963c52946803eb6

10 years agoam 03691218: am e5f7bf74: am b6c21004: Merge "Implement per-display EGLConfig and...
Jesse Hall [Fri, 3 Jan 2014 18:36:29 +0000 (18:36 +0000)]
am 03691218: am e5f7bf74: am b6c21004: Merge "Implement per-display EGLConfig and configless EGLContext"

* commit '03691218ada2fb7e084ad4ae7ddd54f9b28d5611':
  Implement per-display EGLConfig and configless EGLContext

10 years agoam 4c37d088: am 6c7dcfa9: am 662d3134: Merge "Move EGLConfig selection to RenderEngine"
Jesse Hall [Fri, 3 Jan 2014 18:36:28 +0000 (18:36 +0000)]
am 4c37d088: am 6c7dcfa9: am 662d3134: Merge "Move EGLConfig selection to RenderEngine"

* commit '4c37d0886ca06c290e205cad2798406361bbbf53':
  Move EGLConfig selection to RenderEngine

10 years agoam e5f7bf74: am b6c21004: Merge "Implement per-display EGLConfig and configless EGLCo...
Jesse Hall [Fri, 3 Jan 2014 18:31:54 +0000 (18:31 +0000)]
am e5f7bf74: am b6c21004: Merge "Implement per-display EGLConfig and configless EGLContext"

* commit 'e5f7bf7471b21226c9a6b875e9e8f2fb2cba72e2':
  Implement per-display EGLConfig and configless EGLContext

10 years agoam 6c7dcfa9: am 662d3134: Merge "Move EGLConfig selection to RenderEngine"
Jesse Hall [Fri, 3 Jan 2014 18:31:53 +0000 (18:31 +0000)]
am 6c7dcfa9: am 662d3134: Merge "Move EGLConfig selection to RenderEngine"

* commit '6c7dcfa956847a9f061fd1b2baa9dc43585599af':
  Move EGLConfig selection to RenderEngine

10 years agoam b6c21004: Merge "Implement per-display EGLConfig and configless EGLContext"
Jesse Hall [Fri, 3 Jan 2014 18:30:11 +0000 (10:30 -0800)]
am b6c21004: Merge "Implement per-display EGLConfig and configless EGLContext"

* commit 'b6c2100458bd4dda880ec24dc7d1f39825d5243d':
  Implement per-display EGLConfig and configless EGLContext

10 years agoam 662d3134: Merge "Move EGLConfig selection to RenderEngine"
Jesse Hall [Fri, 3 Jan 2014 18:30:10 +0000 (10:30 -0800)]
am 662d3134: Merge "Move EGLConfig selection to RenderEngine"

* commit '662d3134cb3fe3f18a0a6bfbc24368c2291c8e19':
  Move EGLConfig selection to RenderEngine

10 years agoMerge "Implement per-display EGLConfig and configless EGLContext"
Jesse Hall [Fri, 3 Jan 2014 18:25:07 +0000 (18:25 +0000)]
Merge "Implement per-display EGLConfig and configless EGLContext"

10 years agoMerge "Move EGLConfig selection to RenderEngine"
Jesse Hall [Fri, 3 Jan 2014 18:24:30 +0000 (18:24 +0000)]
Merge "Move EGLConfig selection to RenderEngine"

10 years agoImplement per-display EGLConfig and configless EGLContext
Jesse Hall [Tue, 24 Dec 2013 05:02:15 +0000 (21:02 -0800)]
Implement per-display EGLConfig and configless EGLContext

Bug: 12230666
Change-Id: Icca608b108cbdcab9cf01a9236d8cdbda000a836
Signed-off-by: Jesse Hall <jessehall@google.com>
10 years agoMove EGLConfig selection to RenderEngine
Jesse Hall [Tue, 24 Dec 2013 04:44:38 +0000 (20:44 -0800)]
Move EGLConfig selection to RenderEngine

Bug: 12230666
Change-Id: I8d1111a7e0fd9d9e2525e6a80da8ce46d7dd085d
Signed-off-by: Jesse Hall <jessehall@google.com>
10 years agoMerge "b/12068020 add nonce to InputDeviceDescriptor"
RoboErik [Thu, 19 Dec 2013 21:15:04 +0000 (21:15 +0000)]
Merge "b/12068020 add nonce to InputDeviceDescriptor"

10 years agob/12068020 add nonce to InputDeviceDescriptor
RoboErik [Thu, 19 Dec 2013 19:54:29 +0000 (11:54 -0800)]
b/12068020 add nonce to InputDeviceDescriptor

Adds a nonce field to allow generation of unique descriptors for
input devices.

Change-Id: I978b6c5e9edc9e0a6aa60f85cd8d4efc42ac2999

10 years agoam 285bfefb: am c1bf6fa9: am 7fea2361: Merge "Track Looper decoupling from ALooper"
Brian Carlstrom [Thu, 19 Dec 2013 07:58:30 +0000 (07:58 +0000)]
am 285bfefb: am c1bf6fa9: am 7fea2361: Merge "Track Looper decoupling from ALooper"

* commit '285bfefb01f24e98348628c115eb6c524417ea82':
  Track Looper decoupling from ALooper

10 years agoam c1bf6fa9: am 7fea2361: Merge "Track Looper decoupling from ALooper"
Brian Carlstrom [Thu, 19 Dec 2013 07:25:24 +0000 (07:25 +0000)]
am c1bf6fa9: am 7fea2361: Merge "Track Looper decoupling from ALooper"

* commit 'c1bf6fa9495b21f25e7ab1a491b918df71be6e1a':
  Track Looper decoupling from ALooper

10 years agoam 7fea2361: Merge "Track Looper decoupling from ALooper"
Brian Carlstrom [Thu, 19 Dec 2013 07:21:51 +0000 (23:21 -0800)]
am 7fea2361: Merge "Track Looper decoupling from ALooper"

* commit '7fea23613a8bcfae2d6f13234c3f0d7c9c3ef570':
  Track Looper decoupling from ALooper

10 years agoMerge "Track Looper decoupling from ALooper"
Brian Carlstrom [Thu, 19 Dec 2013 07:13:03 +0000 (07:13 +0000)]
Merge "Track Looper decoupling from ALooper"

10 years agoam e2d412f0: am e7394ba8: am c02c35fb: Merge "restorecon /data/media when re-creating...
Nick Kralevich [Tue, 17 Dec 2013 23:18:58 +0000 (23:18 +0000)]
am e2d412f0: am e7394ba8: am c02c35fb: Merge "restorecon /data/media when re-creating it for multi-user upgrade."

* commit 'e2d412f0466ac6a1a33e2c2563ed2192b58bfa87':
  restorecon /data/media when re-creating it for multi-user upgrade.

10 years agoam e7394ba8: am c02c35fb: Merge "restorecon /data/media when re-creating it for multi...
Nick Kralevich [Tue, 17 Dec 2013 23:12:20 +0000 (23:12 +0000)]
am e7394ba8: am c02c35fb: Merge "restorecon /data/media when re-creating it for multi-user upgrade."

* commit 'e7394ba8bd9cd90a0fb72f6c50522a41cd7877fd':
  restorecon /data/media when re-creating it for multi-user upgrade.

10 years agoam c02c35fb: Merge "restorecon /data/media when re-creating it for multi-user upgrade."
Nick Kralevich [Tue, 17 Dec 2013 23:08:30 +0000 (15:08 -0800)]
am c02c35fb: Merge "restorecon /data/media when re-creating it for multi-user upgrade."

* commit 'c02c35fbdc90acbb6483fddd9a8822a16a63689d':
  restorecon /data/media when re-creating it for multi-user upgrade.

10 years agoMerge "restorecon /data/media when re-creating it for multi-user upgrade."
Nick Kralevich [Tue, 17 Dec 2013 23:02:36 +0000 (23:02 +0000)]
Merge "restorecon /data/media when re-creating it for multi-user upgrade."

10 years agorestorecon /data/media when re-creating it for multi-user upgrade.
Stephen Smalley [Tue, 17 Dec 2013 21:04:20 +0000 (16:04 -0500)]
restorecon /data/media when re-creating it for multi-user upgrade.

Change-Id: I112c61863f2104d1962697c54cff25106e9b48a0
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
10 years agoFix MCC/MNC typo
Christopher Tate [Mon, 16 Dec 2013 23:04:10 +0000 (15:04 -0800)]
Fix MCC/MNC typo

Manual merge of https://android-review.googlesource.com/70831 across
the header refactoring.

Change-Id: I28b6a61e89b68d914124122882976a9d2f81a609

10 years agoTrack Looper decoupling from ALooper
Brian Carlstrom [Fri, 13 Dec 2013 07:13:18 +0000 (23:13 -0800)]
Track Looper decoupling from ALooper

Change-Id: I612f0de7002e24948a4cbbea7b416b4fbb3929aa

10 years agolibgui: Add a test suite for SRGB testing
Dan Stoza [Wed, 11 Dec 2013 23:21:11 +0000 (15:21 -0800)]
libgui: Add a test suite for SRGB testing

This is the start of an SRGB test suite. Currently it has a test for
SRGB texture reads in GLES3.

Change-Id: I553ee2691dc92b98cae7a003084d4e2823d40d95

10 years agoMerge changes I25acff1d,Iae67e62f
Narayan Kamath [Wed, 11 Dec 2013 19:35:52 +0000 (19:35 +0000)]
Merge changes I25acff1d,Iae67e62f

* changes:
  Add libutils dependency for libandroidfw host build.
  Reimplement ZipFileRO in terms of libziparchive.

10 years agoAdd libutils dependency for libandroidfw host build.
Narayan Kamath [Wed, 11 Dec 2013 16:48:07 +0000 (16:48 +0000)]
Add libutils dependency for libandroidfw host build.

(cherry picked from commit 070274ec0ccb8643c52e41e4119f356f0f51bc36)

Change-Id: I25acff1d36b3adce14b2576485bda93c914d7f5d

10 years agoam 2a83daa8: dumpstate: dump console-ramoops instead of last_kmsg if present
Todd Poynor [Wed, 11 Dec 2013 06:30:39 +0000 (06:30 +0000)]
am 2a83daa8: dumpstate: dump console-ramoops instead of last_kmsg if present

* commit '2a83daa8a3e1eab292dc1464bbe78f025f4bc0e9':
  dumpstate: dump console-ramoops instead of last_kmsg if present

10 years agodumpstate: dump console-ramoops instead of last_kmsg if present
Todd Poynor [Fri, 22 Nov 2013 23:44:22 +0000 (15:44 -0800)]
dumpstate: dump console-ramoops instead of last_kmsg if present

Change-Id: I41a922b33f0b6b4e8e150a92e46032501a165e33

10 years agoMerge "Bug fix for SensorFusion data rate."
Aravind Akella [Tue, 10 Dec 2013 20:12:29 +0000 (20:12 +0000)]
Merge "Bug fix for SensorFusion data rate."

10 years agoBug fix for SensorFusion data rate.
Aravind Akella [Fri, 6 Dec 2013 00:24:59 +0000 (16:24 -0800)]
Bug fix for SensorFusion data rate.

SensorFusion is always returning data at the slowest possible sampling rate (5 Hz). batch() is getting called twice, first time with the requested rate and second time with the slowest rate (which overwrites the requested rate). Fix batch call in SensorFusion::activate()

Bug: 12064319
Change-Id: If62f3e514233f69810336fd22b136b4395b667d3

10 years agoMerge "libgui: Split SurfaceTexture tests into more files"
Dan Stoza [Mon, 9 Dec 2013 18:38:51 +0000 (18:38 +0000)]
Merge "libgui: Split SurfaceTexture tests into more files"

10 years agolibgui: Split SurfaceTexture tests into more files
Dan Stoza [Tue, 3 Dec 2013 20:37:36 +0000 (12:37 -0800)]
libgui: Split SurfaceTexture tests into more files

Extract the many different test fixtures and suites in SurfaceTexture_test.cpp
into separate files. No real functional changes, just tweaking headers to keep
things building (and adding a few copyright headers I forgot last time).

Change-Id: Id801bd5d617f0cc61d22508fb9b71b41694bdecf

10 years agoReimplement ZipFileRO in terms of libziparchive.
Narayan Kamath [Tue, 3 Dec 2013 13:16:03 +0000 (13:16 +0000)]
Reimplement ZipFileRO in terms of libziparchive.

This lets us share zip archive processing code with both
the runtime (Art, dalvik) and critical java code
(StrictJarFile).

This change also moves several utility methods to ZipUtils
and dedups code across several zip inflation methods.

One of the side effects of this change is that several
processing loops are now O(n) instead of O(n^2).

bug: 10193060

(cherry picked from commit afd31e08299008fdc5c2813f21b2573f29dc53df)

Change-Id: Iae67e62f1dc6dfc3f43e29bc38e3ffd1cb14d191

10 years agoam 1b5143bf: am de8c8069: Merge commit \'1ee45c2d2d816ee912624d81ff1b0aaa98e8fa74...
The Android Open Source Project [Fri, 6 Dec 2013 01:43:29 +0000 (01:43 +0000)]
am 1b5143bf: am de8c8069: Merge commit \'1ee45c2d2d816ee912624d81ff1b0aaa98e8fa74\' into HEAD

* commit '1b5143bfd6ae69ca37ee78e77bd1fcad78c105bd':

10 years agoam de8c8069: Merge commit \'1ee45c2d2d816ee912624d81ff1b0aaa98e8fa74\' into HEAD
The Android Open Source Project [Fri, 6 Dec 2013 01:26:03 +0000 (17:26 -0800)]
am de8c8069: Merge commit \'1ee45c2d2d816ee912624d81ff1b0aaa98e8fa74\' into HEAD

* commit 'de8c80692b0b2fcef705ba9b417477d2bba81e75':

10 years agoMerge commit '1ee45c2d2d816ee912624d81ff1b0aaa98e8fa74' into HEAD
The Android Open Source Project [Thu, 5 Dec 2013 20:38:18 +0000 (12:38 -0800)]
Merge commit '1ee45c2d2d816ee912624d81ff1b0aaa98e8fa74' into HEAD

10 years agoam 46cfde3b: am 708602cc: Merge "DispSync: remove delay when enabling vsync events"
Jesse Hall [Tue, 3 Dec 2013 05:31:57 +0000 (05:31 +0000)]
am 46cfde3b: am 708602cc: Merge "DispSync: remove delay when enabling vsync events"

* commit '46cfde3b65493d3b4ed0038ee7d6f7b66c2c2362':
  DispSync: remove delay when enabling vsync events

10 years agoam 708602cc: Merge "DispSync: remove delay when enabling vsync events"
Jesse Hall [Tue, 3 Dec 2013 05:19:56 +0000 (21:19 -0800)]
am 708602cc: Merge "DispSync: remove delay when enabling vsync events"

* commit '708602ccaad0f6e896c4bd4457503614b9ee81d0':
  DispSync: remove delay when enabling vsync events

10 years agoMerge "DispSync: remove delay when enabling vsync events"
Jesse Hall [Tue, 3 Dec 2013 05:12:31 +0000 (05:12 +0000)]
Merge "DispSync: remove delay when enabling vsync events"

10 years agoDispSync: remove delay when enabling vsync events
Jamie Gennis [Tue, 29 Oct 2013 20:36:12 +0000 (13:36 -0700)]
DispSync: remove delay when enabling vsync events

This change fixes a bug that caused an extra frame of latency when enabling
vsync event callbacks in DispSync.  The bug was related to the logic that
prevents the two events from firing with very little time between them due to
updates to the vsync model.

Bug: 11479720
Change-Id: Ie7eaff9e92ffb7b7b6cb4d3d4402c96cbd29af7e

10 years agoam 651dc744: am bef08b8d: Merge "Handle policy reloads within installd rather than...
Nick Kralevich [Mon, 2 Dec 2013 23:31:01 +0000 (23:31 +0000)]
am 651dc744: am bef08b8d: Merge "Handle policy reloads within installd rather than restarting it."

* commit '651dc7440b10c8a4090bd5469a2e90d3bfe8356e':
  Handle policy reloads within installd rather than restarting it.

10 years agoam bef08b8d: Merge "Handle policy reloads within installd rather than restarting...
Nick Kralevich [Wed, 27 Nov 2013 21:16:46 +0000 (13:16 -0800)]
am bef08b8d: Merge "Handle policy reloads within installd rather than restarting it."

* commit 'bef08b8d1b30976ff273fc9041bc8d934f52fea9':
  Handle policy reloads within installd rather than restarting it.

10 years agoMerge "Handle policy reloads within installd rather than restarting it."
Nick Kralevich [Wed, 27 Nov 2013 21:09:12 +0000 (21:09 +0000)]
Merge "Handle policy reloads within installd rather than restarting it."

10 years agolibgui: Fix a couple of minor bugs, extract GLTest
Dan Stoza [Tue, 26 Nov 2013 23:10:10 +0000 (15:10 -0800)]
libgui: Fix a couple of minor bugs, extract GLTest

Fix a couple of minor bugs in existing tests, and extract the GLTest class into
its own files.

Change-Id: I7d9570a0d3dbc9c5d7f9b13f2017607af42744b3

10 years agoam f4325cee: am 63b62e8c: am 66ad04bc: Merge "Remove incompatible ashmem.h"
Dima Zavin [Sat, 23 Nov 2013 20:41:07 +0000 (12:41 -0800)]
am f4325cee: am 63b62e8c: am 66ad04bc: Merge "Remove incompatible ashmem.h"

* commit 'f4325ceea48103490aacbf335280e94ea24cdd8f':
  Remove incompatible ashmem.h

10 years agoam 63b62e8c: am 66ad04bc: Merge "Remove incompatible ashmem.h"
Dima Zavin [Sat, 23 Nov 2013 20:36:54 +0000 (12:36 -0800)]
am 63b62e8c: am 66ad04bc: Merge "Remove incompatible ashmem.h"

* commit '63b62e8cd48176abbfddb6bd67c138ae447f6ac7':
  Remove incompatible ashmem.h

10 years agoam 24bff56f: am fc3cdb93: Merge commit \'afd0debe4bdf47dc0f968282ca1261842bb65d60...
The Android Open Source Project [Sat, 23 Nov 2013 20:29:35 +0000 (12:29 -0800)]
am 24bff56f: am fc3cdb93: Merge commit \'afd0debe4bdf47dc0f968282ca1261842bb65d60\' into HEAD

* commit '24bff56ff591607d6515a286bb7908882dcb3bc1':

10 years agoam 66ad04bc: Merge "Remove incompatible ashmem.h"
Dima Zavin [Sat, 23 Nov 2013 04:45:07 +0000 (20:45 -0800)]
am 66ad04bc: Merge "Remove incompatible ashmem.h"

* commit '66ad04bc039c73763c55c8d3aad282378e05d257':
  Remove incompatible ashmem.h

10 years agoMerge "Remove incompatible ashmem.h"
Dima Zavin [Sat, 23 Nov 2013 04:41:17 +0000 (04:41 +0000)]
Merge "Remove incompatible ashmem.h"

10 years agoam fc3cdb93: Merge commit \'afd0debe4bdf47dc0f968282ca1261842bb65d60\' into HEAD
The Android Open Source Project [Sat, 23 Nov 2013 01:41:41 +0000 (17:41 -0800)]
am fc3cdb93: Merge commit \'afd0debe4bdf47dc0f968282ca1261842bb65d60\' into HEAD

* commit 'fc3cdb936e6b34257a3bfaf30e89db8f11667cc5':

10 years agoMerge commit 'afd0debe4bdf47dc0f968282ca1261842bb65d60' into HEAD
The Android Open Source Project [Fri, 22 Nov 2013 19:20:20 +0000 (11:20 -0800)]
Merge commit 'afd0debe4bdf47dc0f968282ca1261842bb65d60' into HEAD

Change-Id: Ic9aed2c57bdfeb250ce2dd7f0e9289ba5b6e936a

10 years agoam 0d103b59: am f2f74ca6: Merge "Remove references to obsolete pmem functionality."
Elliott Hughes [Fri, 22 Nov 2013 07:00:19 +0000 (23:00 -0800)]
am 0d103b59: am f2f74ca6: Merge "Remove references to obsolete pmem functionality."

* commit '0d103b596dd9883898a062beaacf980d4439b835':
  Remove references to obsolete pmem functionality.

10 years agoam f2f74ca6: Merge "Remove references to obsolete pmem functionality."
Elliott Hughes [Fri, 22 Nov 2013 02:43:51 +0000 (18:43 -0800)]
am f2f74ca6: Merge "Remove references to obsolete pmem functionality."

* commit 'f2f74ca65f34ae0cae6f0cca40f1c18aa771739d':
  Remove references to obsolete pmem functionality.

10 years agogui: Add tests for IGraphicBufferProducer
Igor Murashkin [Tue, 19 Nov 2013 00:58:36 +0000 (16:58 -0800)]
gui: Add tests for IGraphicBufferProducer

* Basic tests only. Needs more complicated queue/dequeue tests.
* Also needs consumer-side tests to really be thorough.

Change-Id: I1099dd56d65b6e9dfa15377726d6054ce657c0ca

10 years agoMerge "Remove references to obsolete pmem functionality."
Elliott Hughes [Thu, 21 Nov 2013 20:42:32 +0000 (20:42 +0000)]
Merge "Remove references to obsolete pmem functionality."

10 years agoRemove references to obsolete pmem functionality.
Elliott Hughes [Thu, 21 Nov 2013 20:22:39 +0000 (12:22 -0800)]
Remove references to obsolete pmem functionality.

Change-Id: I5d3befd075e51614e6801115388a0a9f32fbb6ea

10 years agogui: Remove BufferQueue::MIN_UNDEQUEUED_BUFFERS
Igor Murashkin [Mon, 18 Nov 2013 20:26:56 +0000 (12:26 -0800)]
gui: Remove BufferQueue::MIN_UNDEQUEUED_BUFFERS

Change-Id: I7c0cc36046dbbdb9c0e85acfe5027293d1131275

10 years agogui: Update header docs for IGraphicBufferConsumer/Producer/BufferQueue
Igor Murashkin [Wed, 13 Nov 2013 02:02:20 +0000 (18:02 -0800)]
gui: Update header docs for IGraphicBufferConsumer/Producer/BufferQueue

Also fix compiler warnings for libgui

Change-Id: I0ee38d9ad5eaa82d55bf812d291da8c433581cef

10 years agoam 1ee45c2d: am 14e8b01a: Don\'t change the framebuffer target until we render a...
Jesse Hall [Fri, 8 Nov 2013 21:01:20 +0000 (13:01 -0800)]
am 1ee45c2d: am 14e8b01a: Don\'t change the framebuffer target until we render a new one

* commit '1ee45c2d2d816ee912624d81ff1b0aaa98e8fa74':
  Don't change the framebuffer target until we render a new one

10 years agoam 14e8b01a: Don\'t change the framebuffer target until we render a new one
Jesse Hall [Fri, 8 Nov 2013 20:58:20 +0000 (12:58 -0800)]
am 14e8b01a: Don\'t change the framebuffer target until we render a new one

* commit '14e8b01a761180250671f3d6494532d8bd04fa8e':
  Don't change the framebuffer target until we render a new one

10 years agoDon't change the framebuffer target until we render a new one
Jesse Hall [Thu, 7 Nov 2013 20:28:26 +0000 (12:28 -0800)]
Don't change the framebuffer target until we render a new one

Continuing to send the last-rendered framebuffer to HWC on subsequent
frames allows the HWC to read partially-composed regions that haven't
changed, instead of re-composing from scratch.

Bug: 11573910
Change-Id: I8829877d2a06001f1e1b3f168cbba71c7b217b2d

10 years agoam 2d32aa59: am 356c2386: Merge "Provide virtual display output buffer to HWC in...
Jesse Hall [Thu, 7 Nov 2013 05:12:40 +0000 (21:12 -0800)]
am 2d32aa59: am 356c2386: Merge "Provide virtual display output buffer to HWC in prepare" into klp-dev

* commit '2d32aa5918de1c12c54a32e8eb28bbc96d430796':
  Provide virtual display output buffer to HWC in prepare

10 years agoam 356c2386: Merge "Provide virtual display output buffer to HWC in prepare" into...
Jesse Hall [Thu, 7 Nov 2013 04:48:51 +0000 (20:48 -0800)]
am 356c2386: Merge "Provide virtual display output buffer to HWC in prepare" into klp-dev

* commit '356c23865d588659f1eea55bbe7e2b16b9cff08e':
  Provide virtual display output buffer to HWC in prepare

10 years agoMerge "Provide virtual display output buffer to HWC in prepare" into klp-dev
Jesse Hall [Thu, 7 Nov 2013 04:43:19 +0000 (04:43 +0000)]
Merge "Provide virtual display output buffer to HWC in prepare" into klp-dev

10 years agoMerge "Extend OpenMAX IL definitions to support AC3"
Changwan Ryu [Wed, 6 Nov 2013 18:22:41 +0000 (18:22 +0000)]
Merge "Extend OpenMAX IL definitions to support AC3"

10 years agoam f111ee13: am 49318631: Merge "Don\'t use implementation-defined format with CPU...
Jesse Hall [Wed, 6 Nov 2013 16:52:02 +0000 (08:52 -0800)]
am f111ee13: am 49318631: Merge "Don\'t use implementation-defined format with CPU consumers" into klp-dev

* commit 'f111ee13a6f5d8606c5dc7a5cc07cedf929e69a8':
  Don't use implementation-defined format with CPU consumers

10 years agoam 49318631: Merge "Don\'t use implementation-defined format with CPU consumers"...
Jesse Hall [Wed, 6 Nov 2013 15:38:36 +0000 (07:38 -0800)]
am 49318631: Merge "Don\'t use implementation-defined format with CPU consumers" into klp-dev

* commit '493186312a9a8c0215da0d6d3a9b0369491c0796':
  Don't use implementation-defined format with CPU consumers

10 years agoMerge "Don't use implementation-defined format with CPU consumers" into klp-dev
Jesse Hall [Wed, 6 Nov 2013 15:35:08 +0000 (15:35 +0000)]
Merge "Don't use implementation-defined format with CPU consumers" into klp-dev