OSDN Git Service

android-x86/frameworks-native.git
11 years agoPrevent opaque windows from making framebuffer translucent
Jesse Hall [Tue, 21 May 2013 22:36:55 +0000 (15:36 -0700)]
Prevent opaque windows from making framebuffer translucent

To keep the code readable now that we have four different texenv
configurations, this change separates the decisions about what
configuration to use from the GL calls to set up the configuration.

Bug: 8963244
Change-Id: Ia07a306a7809ba8f93493d0160ccbd509e948581

11 years agoBufferQueue: remove freeAllBuffersExceptHeadLocked()
Lajos Molnar [Mon, 6 May 2013 23:23:07 +0000 (16:23 -0700)]
BufferQueue: remove freeAllBuffersExceptHeadLocked()

Now that we are having separate buffer-instances for the buffer-
queue, we can free all buffers; we don't have to keep the head
alive.

Change-Id: I023e9161a2501d99333f8868ce438afa914ec50f
Signed-off-by: Lajos Molnar <lajos@google.com>
Related-to-bug: 7093648

11 years agoBufferQueue: track buffer-queue by instance vs. by reference
Lajos Molnar [Fri, 3 May 2013 21:50:50 +0000 (14:50 -0700)]
BufferQueue: track buffer-queue by instance vs. by reference

Instead of representing the buffer-queue as a vector of buffer
indices, represent them as a vector of BufferItems (copies).
This allows modifying the buffer slots independent of the queued
buffers.

As part of this change, BufferSlot properties that are only
been relevant in the buffer-queue have been removed.

Also, invalid scalingMode in queueBuffer now returns an error.

ConsumerBase has also changed to allow reuse of the same
buffer slots by different buffers.

Change-Id: If2a698fa142b67c69ad41b8eaca6e127eb3ef75b
Signed-off-by: Lajos Molnar <lajos@google.com>
Related-to-bug: 7093648

11 years agoMake trace macros slightly more robust
Tim Murray [Thu, 23 May 2013 20:44:08 +0000 (13:44 -0700)]
Make trace macros slightly more robust

Change-Id: I9544eb7b27fc1a971cabadd8d5b4b4b80678febf

11 years agoPower manager now takes calling package name arg.
Dianne Hackborn [Mon, 20 May 2013 18:24:31 +0000 (11:24 -0700)]
Power manager now takes calling package name arg.

Change-Id: Iae57b8eb7abe4e66f0d2645db8cdf57acf7dcd3e

11 years agoam f0e52b64: (-s ours) Reconcile with jb-mr2-release - do not merge
The Android Open Source Project [Mon, 20 May 2013 15:22:44 +0000 (08:22 -0700)]
am f0e52b64: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit 'f0e52b648b435634d8cbcf52cac86c8dac9e4a63':

11 years agoReconcile with jb-mr2-release - do not merge
The Android Open Source Project [Mon, 20 May 2013 15:20:26 +0000 (08:20 -0700)]
Reconcile with jb-mr2-release - do not merge

Change-Id: I400727c668eff57b5760595787d21dd021464587

11 years agomerge in jb-mr2-release history after reset to jb-mr2-dev
The Android Automerger [Sun, 19 May 2013 12:55:29 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev

11 years agoMerge "wifi-display: add support for metadata mode on encoder output"
Chong Zhang [Sat, 18 May 2013 00:02:10 +0000 (00:02 +0000)]
Merge "wifi-display: add support for metadata mode on encoder output"

11 years agoMerge "Remove unnecessary header file."
Nick Kralevich [Fri, 17 May 2013 21:58:50 +0000 (21:58 +0000)]
Merge "Remove unnecessary header file."

11 years agoam 2cad801d: (-s ours) am 23dacde4: [DO NOT MERGE] fix a bug where surfaceflinger...
Mathias Agopian [Fri, 17 May 2013 20:55:28 +0000 (13:55 -0700)]
am 2cad801d: (-s ours) am 23dacde4: [DO NOT MERGE] fix a bug where surfaceflinger and system_server could deadlock

* commit '2cad801d0d05190cf4ab7edc7ecffc5862ee18dd':
  [DO NOT MERGE] fix a bug where surfaceflinger and system_server could deadlock

11 years agoam 23dacde4: [DO NOT MERGE] fix a bug where surfaceflinger and system_server could...
Mathias Agopian [Fri, 17 May 2013 20:53:31 +0000 (13:53 -0700)]
am 23dacde4: [DO NOT MERGE] fix a bug where surfaceflinger and system_server could deadlock

* commit '23dacde4b624921df4f2c9646d20ca7acae357b6':
  [DO NOT MERGE] fix a bug where surfaceflinger and system_server could deadlock

11 years ago[DO NOT MERGE] fix a bug where surfaceflinger and system_server could deadlock
Mathias Agopian [Thu, 16 May 2013 02:14:52 +0000 (19:14 -0700)]
[DO NOT MERGE] fix a bug where surfaceflinger and system_server could deadlock

because surfaceflinger handles screenshot in a different
thread from the binder thread that requested it and because
the IGraphicBufferProducer is a synchronous interface
calling back into the system server; it is possible for
the latter to run out of binder threads (b/c it holds
a lock while calling into SF).

The solution is to make sure all calls on IGraphicBufferProducer
happen on the incoming binder thread. We achieve this by creating
a IGBP wrapper which is given to the screenshot code.

Bug: 8734824
Change-Id: Ife2441c7322e51ecfb20e0df03dacf6bce49578e

11 years agoRemove unnecessary header file.
Nick Kralevich [Fri, 17 May 2013 18:06:39 +0000 (11:06 -0700)]
Remove unnecessary header file.

In b2cac4ff37ed2a3521efb307b807b12f649634b8, the last
reference to property_get was removed, but the include
file remained. Remove it.

This is causing me unrelated problems.

Change-Id: I87bbfbfa5871f6da4a1b00037a225f67bbd75881

11 years agoam e6eef6c1: am ea74d3b7: make the warning timout of Fence::waitForever() implicit...
Mathias Agopian [Fri, 17 May 2013 17:18:45 +0000 (10:18 -0700)]
am e6eef6c1: am ea74d3b7: make the warning timout of Fence::waitForever() implicit and longer

* commit 'e6eef6c136b007f3a7e1e19884875b855c0c5f95':
  make the warning timout of Fence::waitForever() implicit and longer

11 years agoam ea74d3b7: make the warning timout of Fence::waitForever() implicit and longer
Mathias Agopian [Fri, 17 May 2013 17:16:51 +0000 (10:16 -0700)]
am ea74d3b7: make the warning timout of Fence::waitForever() implicit and longer

* commit 'ea74d3b78d607cde17790a7bb83e6f68ffd34cfd':
  make the warning timout of Fence::waitForever() implicit and longer

11 years agoMerge "various fixes to the sensorservice"
Mathias Agopian [Fri, 17 May 2013 01:49:42 +0000 (01:49 +0000)]
Merge "various fixes to the sensorservice"

11 years agovarious fixes to the sensorservice
Mathias Agopian [Sat, 11 May 2013 02:32:39 +0000 (19:32 -0700)]
various fixes to the sensorservice

1) "google" sensors are now reporting AOSP as the vendor string
2) don't expose the system's sensor fusion if the HAL provides it
3) use uncalibrated gyro if availble for the system's sensor fusion

Change-Id: I25140436cdb29d55e39fd6fbbf8c44a410a83d5c

11 years agomake the warning timout of Fence::waitForever() implicit and longer
Mathias Agopian [Fri, 17 May 2013 01:03:22 +0000 (18:03 -0700)]
make the warning timout of Fence::waitForever() implicit and longer

- timeout is now 3 seconds instead of 1
- simplifies the API a bit
- allows us to change/tweak this timeout globaly

Bug: 8988871

Change-Id: I8d3c6ec43a372f602fb3f29856710339f86c0ec9

11 years agowifi-display: add support for metadata mode on encoder output
Chong Zhang [Thu, 16 May 2013 20:11:27 +0000 (13:11 -0700)]
wifi-display: add support for metadata mode on encoder output

Bug: 8968123

Change-Id: I3d2b567d4908f5f49c0694589920babe1f6752cd

11 years agoam 92cf3553: (-s ours) Reconcile with jb-mr2-release - do not merge
The Android Open Source Project [Thu, 16 May 2013 12:48:22 +0000 (05:48 -0700)]
am 92cf3553: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit '92cf355308ffb28f8a460d69915ca5955016a632':

11 years agoReconcile with jb-mr2-release - do not merge
The Android Open Source Project [Thu, 16 May 2013 12:43:41 +0000 (05:43 -0700)]
Reconcile with jb-mr2-release - do not merge

Change-Id: Ic457c583534afce9b1697b3b34221a729e2bc5b2

11 years agoam 28fc78bf: am e8fed71d: Merge "Abort surface composition if hw surface is invalid"
Jesse Hall [Tue, 14 May 2013 06:31:54 +0000 (23:31 -0700)]
am 28fc78bf: am e8fed71d: Merge "Abort surface composition if hw surface is invalid"

* commit '28fc78bf5fbb6288a27f3f25565a960a1873b0ef':
  Abort surface composition if hw surface is invalid

11 years agoam e8fed71d: Merge "Abort surface composition if hw surface is invalid"
Jesse Hall [Tue, 14 May 2013 06:28:45 +0000 (23:28 -0700)]
am e8fed71d: Merge "Abort surface composition if hw surface is invalid"

* commit 'e8fed71da2d3e03ef933d308520bab5b860f05aa':
  Abort surface composition if hw surface is invalid

11 years agoMerge "Abort surface composition if hw surface is invalid"
Jesse Hall [Tue, 14 May 2013 00:24:28 +0000 (00:24 +0000)]
Merge "Abort surface composition if hw surface is invalid"

11 years agoAbort surface composition if hw surface is invalid
Michael Chock [Mon, 4 Mar 2013 23:15:46 +0000 (15:15 -0800)]
Abort surface composition if hw surface is invalid

If an invalid display device is detected during surface composition
(e.g., a simulated secondary display is removed), abort the
composition.

Change-Id: Ia6afb2e287882d8ae0614eb25463d3f85b687adf

11 years agoam 7a486528: am f0dcff89: Merge "gl_code.cpp: Remove a DOS style newline"
Jesse Hall [Mon, 13 May 2013 20:08:54 +0000 (13:08 -0700)]
am 7a486528: am f0dcff89: Merge "gl_code.cpp: Remove a DOS style newline"

* commit '7a4865287460a5f0ff26e22be5f0271735d32ac7':
  gl_code.cpp: Remove a DOS style newline

11 years agoam f0dcff89: Merge "gl_code.cpp: Remove a DOS style newline"
Jesse Hall [Mon, 13 May 2013 20:05:36 +0000 (13:05 -0700)]
am f0dcff89: Merge "gl_code.cpp: Remove a DOS style newline"

* commit 'f0dcff89acb998179757ca66b5c6a2c585a980e9':
  gl_code.cpp: Remove a DOS style newline

11 years agoMerge "gl_code.cpp: Remove a DOS style newline"
Jesse Hall [Mon, 13 May 2013 18:53:10 +0000 (18:53 +0000)]
Merge "gl_code.cpp: Remove a DOS style newline"

11 years agomerge in jb-mr2-release history after reset to jb-mr2-dev
The Android Automerger [Mon, 13 May 2013 12:55:40 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev

11 years agotake the "transparent region" into account for blending
Mathias Agopian [Sat, 11 May 2013 01:01:12 +0000 (18:01 -0700)]
take the "transparent region" into account for blending

until now it was only used to discard a layer entirely.
we're now reducing the size of the layer if it is still
visible, if possible.

this works for instance when a surfaceView is used and
only the menu bar is displayed over it.

Change-Id: I3f5527c5cd1e69ecc968272c8948f1513ada8c55

11 years agoreformat Rect.{cpp|h}
Mathias Agopian [Fri, 10 May 2013 03:37:10 +0000 (20:37 -0700)]
reformat Rect.{cpp|h}

Change-Id: I45b1f6646541a1abacce1e70df00a770e47b820e

11 years agomake all libsurfaceflinger and libsensorservice symbols's visibility hidden
Mathias Agopian [Thu, 9 May 2013 21:53:35 +0000 (14:53 -0700)]
make all libsurfaceflinger and libsensorservice symbols's visibility hidden

we only export the main entry-point.
this saves about 150KB.

Change-Id: I55eb2b6705386fdfa43860deb62f9cdd2a0982aa

11 years agoremove unused declarations and reformat
Mathias Agopian [Thu, 9 May 2013 20:04:32 +0000 (13:04 -0700)]
remove unused declarations and reformat

Change-Id: I4e168fb62c275e02621c4b6e0c6000d0f006c327

11 years agoremove reserved virtual slots
Mathias Agopian [Thu, 9 May 2013 20:03:05 +0000 (13:03 -0700)]
remove reserved virtual slots

these consume small amount of space (plt) in every library that
links against libutils.

Change-Id: I1b6b3dd9098aa5a051243f7a5dbf91cd7dcb8b2c

11 years agoam 87ab83d9: am f743e3db: Merge "Add support for HAL_PIXEL_FORMAT_YCbCr_420_888"...
Eino-Ville Talvala [Thu, 9 May 2013 17:19:01 +0000 (10:19 -0700)]
am 87ab83d9: am f743e3db: Merge "Add support for HAL_PIXEL_FORMAT_YCbCr_420_888" into jb-mr2-dev

* commit '87ab83d96b9d826e94a7169a6205bcf9c2ee633a':
  Add support for HAL_PIXEL_FORMAT_YCbCr_420_888

11 years agoam f743e3db: Merge "Add support for HAL_PIXEL_FORMAT_YCbCr_420_888" into jb-mr2-dev
Eino-Ville Talvala [Thu, 9 May 2013 17:15:17 +0000 (10:15 -0700)]
am f743e3db: Merge "Add support for HAL_PIXEL_FORMAT_YCbCr_420_888" into jb-mr2-dev

* commit 'f743e3db27dd639421913ee5e99d7a13ccc236ea':
  Add support for HAL_PIXEL_FORMAT_YCbCr_420_888

11 years agoMerge "Add support for HAL_PIXEL_FORMAT_YCbCr_420_888" into jb-mr2-dev
Eino-Ville Talvala [Thu, 9 May 2013 17:13:22 +0000 (17:13 +0000)]
Merge "Add support for HAL_PIXEL_FORMAT_YCbCr_420_888" into jb-mr2-dev

11 years agomerge in jb-mr2-release history after reset to jb-mr2-dev
The Android Automerger [Thu, 9 May 2013 12:55:26 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev

11 years agoMerge "new String8, String16 ctors to initialize empty static strings with static...
Mathias Agopian [Thu, 9 May 2013 01:13:50 +0000 (01:13 +0000)]
Merge "new String8, String16 ctors to initialize empty static strings with static linkage"

11 years agonew String8, String16 ctors to initialize empty static strings with static linkage
Mathias Agopian [Wed, 8 May 2013 23:04:13 +0000 (16:04 -0700)]
new String8, String16 ctors to initialize empty static strings with static linkage

when libutils is statically linked, the ordering of the static
initializer is not guaranteed and therefore it's unsafe to use
empty static strings: e.g.:

static String8 sThisStaticStringIsNotSafe;

instead, this new constructor can be used:

static String8 sThisStaticStringIsSafe(kEmptyString);

Change-Id: Ia3daf1cab1c97d021c0ee9c2b394b5e27e8d6c0d

11 years agoam dda42952: am 64f3b2fd: Merge "Remove experimental HWC virtual display support...
Jesse Hall [Wed, 8 May 2013 22:05:15 +0000 (15:05 -0700)]
am dda42952: am 64f3b2fd: Merge "Remove experimental HWC virtual display support" into jb-mr2-dev

* commit 'dda4295221f831560ca9d554cd9b7be1c672d0b6':
  Remove experimental HWC virtual display support

11 years agoam d2a92b5b: am db733579: Merge "atrace: add the \'dalvik\' trace category" into...
Jamie Gennis [Wed, 8 May 2013 22:03:56 +0000 (15:03 -0700)]
am d2a92b5b: am db733579: Merge "atrace: add the \'dalvik\' trace category" into jb-mr2-dev

* commit 'd2a92b5b97b5a107d327744f216abdea8e0cda89':
  atrace: add the 'dalvik' trace category

11 years agoam 2c228354: am b84d1cad: Correct native API documentation related to MediaDrm offlin...
Jeff Tinker [Wed, 8 May 2013 22:03:40 +0000 (15:03 -0700)]
am 2c228354: am b84d1cad: Correct native API documentation related to MediaDrm offline use case

* commit '2c2283549c72184145c9f030bbfe6124ee75d169':
  Correct native API documentation related to MediaDrm offline use case

11 years agoam 64f3b2fd: Merge "Remove experimental HWC virtual display support" into jb-mr2-dev
Jesse Hall [Wed, 8 May 2013 20:57:56 +0000 (13:57 -0700)]
am 64f3b2fd: Merge "Remove experimental HWC virtual display support" into jb-mr2-dev

* commit '64f3b2fd1ea9d30df6fd04ecdb086e540465bc18':
  Remove experimental HWC virtual display support

11 years agoMerge "Remove experimental HWC virtual display support" into jb-mr2-dev
Jesse Hall [Wed, 8 May 2013 20:53:42 +0000 (20:53 +0000)]
Merge "Remove experimental HWC virtual display support" into jb-mr2-dev

11 years agomerge in jb-mr2-release history after reset to jb-mr2-dev
The Android Automerger [Wed, 8 May 2013 12:55:32 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev

11 years agolibutils clean-up
Mathias Agopian [Tue, 7 May 2013 03:20:50 +0000 (20:20 -0700)]
libutils clean-up

Change-Id: I6ff4cfc736751de2912c697f954e45e275f2d386

11 years agoam db733579: Merge "atrace: add the \'dalvik\' trace category" into jb-mr2-dev
Jamie Gennis [Wed, 8 May 2013 01:23:18 +0000 (18:23 -0700)]
am db733579: Merge "atrace: add the \'dalvik\' trace category" into jb-mr2-dev

* commit 'db733579a4c64eddd7dadb4ac15f54658ccfc0fb':
  atrace: add the 'dalvik' trace category

11 years agoMerge "atrace: add the 'dalvik' trace category" into jb-mr2-dev
Jamie Gennis [Wed, 8 May 2013 01:21:17 +0000 (01:21 +0000)]
Merge "atrace: add the 'dalvik' trace category" into jb-mr2-dev

11 years agoam b84d1cad: Correct native API documentation related to MediaDrm offline use case
Jeff Tinker [Wed, 8 May 2013 00:20:56 +0000 (17:20 -0700)]
am b84d1cad: Correct native API documentation related to MediaDrm offline use case

* commit 'b84d1cad1d481f75aa03d55ac07e4ff58dbfb84a':
  Correct native API documentation related to MediaDrm offline use case

11 years agoMerge "String8: ensure static init done prior to empty string reference"
Todd Poynor [Tue, 7 May 2013 23:30:21 +0000 (23:30 +0000)]
Merge "String8: ensure static init done prior to empty string reference"

11 years agoMerge "flatland: add 1920x1200 to 16:10 resolutions"
Erik Gilling [Tue, 7 May 2013 22:48:05 +0000 (22:48 +0000)]
Merge "flatland: add 1920x1200 to 16:10 resolutions"

11 years agoMerge "flatland: add 3:2 tests"
Erik Gilling [Tue, 7 May 2013 22:47:54 +0000 (22:47 +0000)]
Merge "flatland: add 3:2 tests"

11 years agoatrace: add the 'dalvik' trace category
Jamie Gennis [Tue, 7 May 2013 22:20:39 +0000 (15:20 -0700)]
atrace: add the 'dalvik' trace category

Bug: 8856374
Change-Id: Ie7759328333d21d8123ce9d4f1a177cae5ede51e

11 years agoCorrect native API documentation related to MediaDrm offline use case
Jeff Tinker [Tue, 7 May 2013 21:07:10 +0000 (14:07 -0700)]
Correct native API documentation related to MediaDrm offline use case

These doc updates were made previously to the java API but some
did not make it into the native API.

Change-Id: I9b7bfcd77bc593685254baca1c148deb7e1f91c7
related-to-bug: 8621588

11 years agoAdd new Looper API to check whether the looper is idle.
Dianne Hackborn [Mon, 6 May 2013 21:25:20 +0000 (14:25 -0700)]
Add new Looper API to check whether the looper is idle.

This is just to support the watchdog to give it a faster
way to determine if a thread is deadlocked without having
to post a message to it.

Change-Id: I068dc8b9387caf94fe5811fb4aeb0f9b57b1a080

11 years agoflatland: add 1920x1200 to 16:10 resolutions
Erik Gilling [Tue, 7 May 2013 19:25:22 +0000 (12:25 -0700)]
flatland: add 1920x1200 to 16:10 resolutions

Change-Id: Ie7540c1ca4ec2c7ea8a307ce118d35479cdf499c

11 years agoflatland: add 3:2 tests
Erik Gilling [Tue, 7 May 2013 19:24:47 +0000 (12:24 -0700)]
flatland: add 3:2 tests

Change-Id: I90496207fbf972c9a8e6baa2188a7732a282f879

11 years agoString8: ensure static init done prior to empty string reference
Todd Poynor [Thu, 2 May 2013 22:41:35 +0000 (15:41 -0700)]
String8: ensure static init done prior to empty string reference

Avoid NULL deref on static initialization of empty String8 objects prior
to libutils static init.

Change-Id: I3d420041ba62b97ed8c2dfd2532a2dcd72b84ff1

11 years agoRemove experimental HWC virtual display support
Jesse Hall [Tue, 7 May 2013 18:58:47 +0000 (11:58 -0700)]
Remove experimental HWC virtual display support

Bug: 8384764
Change-Id: I97b52ed83ad85466bd91cb9291308994048568a1

11 years agoam ba8e30a3: am 223b953c: Add Dalvik heap definition for 7" xhdpi devices.
Dianne Hackborn [Tue, 7 May 2013 17:01:26 +0000 (10:01 -0700)]
am ba8e30a3: am 223b953c: Add Dalvik heap definition for 7" xhdpi devices.

* commit 'ba8e30a31d54d11d826649bafc404e520d3c6fad':
  Add Dalvik heap definition for 7" xhdpi devices.

11 years agomerge in jb-mr2-release history after reset to jb-mr2-dev
The Android Automerger [Tue, 7 May 2013 12:55:26 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev

11 years agoAdd support for HAL_PIXEL_FORMAT_YCbCr_420_888
Eino-Ville Talvala [Sun, 5 May 2013 01:07:43 +0000 (18:07 -0700)]
Add support for HAL_PIXEL_FORMAT_YCbCr_420_888

- Add fields to CpuConsumer::LockedBuffer for new information
- New lock methods for GraphicBuffer and GraphicBufferMapper for
  the format

Bug: 8734880
Change-Id: If31f82c62d64b6942cf4cc6e5715585c03273f12

11 years agoam 223b953c: Add Dalvik heap definition for 7" xhdpi devices.
Dianne Hackborn [Mon, 6 May 2013 22:21:02 +0000 (15:21 -0700)]
am 223b953c: Add Dalvik heap definition for 7" xhdpi devices.

* commit '223b953cf748d8197cba26545172db9dcaeea2b4':
  Add Dalvik heap definition for 7" xhdpi devices.

11 years agoAdd Dalvik heap definition for 7" xhdpi devices.
Dianne Hackborn [Mon, 6 May 2013 22:06:20 +0000 (15:06 -0700)]
Add Dalvik heap definition for 7" xhdpi devices.

Change-Id: I6a8e406ee98d3061d498bb2fbd1b97aa9e79b4b5

11 years agoam 3755dbec: am 3d3cc6e1: Merge "Report actual disk space used" into jb-mr2-dev
Marco Nelissen [Mon, 6 May 2013 20:56:06 +0000 (13:56 -0700)]
am 3755dbec: am 3d3cc6e1: Merge "Report actual disk space used" into jb-mr2-dev

* commit '3755dbec6f16330fb57b18c09319d209a3f8474f':
  Report actual disk space used

11 years agoam 3d3cc6e1: Merge "Report actual disk space used" into jb-mr2-dev
Marco Nelissen [Mon, 6 May 2013 18:11:38 +0000 (11:11 -0700)]
am 3d3cc6e1: Merge "Report actual disk space used" into jb-mr2-dev

* commit '3d3cc6e15ea6398105dc59d3135df3e64d5cf34e':
  Report actual disk space used

11 years agomerge in jb-mr2-release history after reset to jb-mr2-dev
The Android Automerger [Mon, 6 May 2013 12:55:30 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev

11 years agoMerge "Report actual disk space used" into jb-mr2-dev
Marco Nelissen [Sun, 5 May 2013 01:17:48 +0000 (01:17 +0000)]
Merge "Report actual disk space used" into jb-mr2-dev

11 years agoMerge "use a Framebuffer Object to render all screenshots"
Mathias Agopian [Thu, 2 May 2013 23:26:10 +0000 (23:26 +0000)]
Merge "use a Framebuffer Object to render all screenshots"

11 years agoMerge "change how the userspace GLES drivers are named"
Mathias Agopian [Thu, 2 May 2013 23:25:52 +0000 (23:25 +0000)]
Merge "change how the userspace GLES drivers are named"

11 years agoam ba018b3f: am 4fc27d79: Merge "Fix issue #8768456: Settings > App Info under report...
Dianne Hackborn [Thu, 2 May 2013 22:17:30 +0000 (15:17 -0700)]
am ba018b3f: am 4fc27d79: Merge "Fix issue #8768456: Settings > App Info under reports..." into jb-mr2-dev

* commit 'ba018b3fa5ab6f40bdcc2af62ddeeebd7bad1ea5':
  Fix issue #8768456: Settings > App Info under reports...

11 years agoam 4fc27d79: Merge "Fix issue #8768456: Settings > App Info under reports..." into...
Dianne Hackborn [Thu, 2 May 2013 22:15:17 +0000 (15:15 -0700)]
am 4fc27d79: Merge "Fix issue #8768456: Settings > App Info under reports..." into jb-mr2-dev

* commit '4fc27d79c29646b08ff059abc19cc4a7bccaa316':
  Fix issue #8768456: Settings > App Info under reports...

11 years agoMerge "Fix issue #8768456: Settings > App Info under reports..." into jb-mr2-dev
Dianne Hackborn [Thu, 2 May 2013 22:11:17 +0000 (22:11 +0000)]
Merge "Fix issue #8768456: Settings > App Info under reports..." into jb-mr2-dev

11 years agoam 958ef3d7: am c8639351: Generate new EGLExt class
Jesse Hall [Thu, 2 May 2013 20:49:25 +0000 (13:49 -0700)]
am 958ef3d7: am c8639351: Generate new EGLExt class

* commit '958ef3d79c48ddef3afa5327f7ed15a5ecfd2d1d':
  Generate new EGLExt class

11 years agoam c8639351: Generate new EGLExt class
Jesse Hall [Thu, 2 May 2013 20:48:00 +0000 (13:48 -0700)]
am c8639351: Generate new EGLExt class

* commit 'c86393510c8747519fe34e5aa38ce5218593c19c':
  Generate new EGLExt class

11 years agoGenerate new EGLExt class
Jesse Hall [Tue, 30 Apr 2013 20:45:14 +0000 (13:45 -0700)]
Generate new EGLExt class

Initially populated with EGL_ANDROID_presentation_time (moved from the
EGL14 class) and the ES-relevant parts of EGL_KHR_create_context.

Bug: 8678160
Change-Id: Ifed2ee3da264ca701ae1f4b309a0758f7fcc3acc

11 years agoFix issue #8768456: Settings > App Info under reports...
Dianne Hackborn [Thu, 2 May 2013 01:55:10 +0000 (18:55 -0700)]
Fix issue #8768456: Settings > App Info under reports...

...app storage size for apps w/ .so files

The lib directories are tagged with the apk install number,
so must be explicitly passed down to installd.

Change-Id: Iae8815afd6ba964f5b2ed86a0d04a91827391ed6

11 years agoReport actual disk space used
Marco Nelissen [Wed, 1 May 2013 17:10:59 +0000 (10:10 -0700)]
Report actual disk space used

Report size based on blocks used, not the "nominal" size.
b/8744465

Change-Id: Idbb72f47af6d475b51305a14be291bf01acb14bb

11 years agomerge in jb-mr2-release history after reset to jb-mr2-dev
The Android Automerger [Wed, 1 May 2013 12:55:47 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev

11 years agoam 34c0fb18: am cc8f8ad3: Merge "Fix glGetUniformIndices JNI prototype" into jb-mr2-dev
Jesse Hall [Wed, 1 May 2013 02:34:49 +0000 (19:34 -0700)]
am 34c0fb18: am cc8f8ad3: Merge "Fix glGetUniformIndices JNI prototype" into jb-mr2-dev

* commit '34c0fb183767b80e93a7cd77233ead5fe50bd822':
  Fix glGetUniformIndices JNI prototype

11 years agoam cc8f8ad3: Merge "Fix glGetUniformIndices JNI prototype" into jb-mr2-dev
Jesse Hall [Wed, 1 May 2013 02:32:39 +0000 (19:32 -0700)]
am cc8f8ad3: Merge "Fix glGetUniformIndices JNI prototype" into jb-mr2-dev

* commit 'cc8f8ad33d4f8f55ff30e1600cc59c7cf5113c8a':
  Fix glGetUniformIndices JNI prototype

11 years agoMerge "Fix glGetUniformIndices JNI prototype" into jb-mr2-dev
Jesse Hall [Wed, 1 May 2013 02:30:47 +0000 (02:30 +0000)]
Merge "Fix glGetUniformIndices JNI prototype" into jb-mr2-dev

11 years agoam ef4dbb6a: am 5d46b04b: Merge "Recommend different time source" into jb-mr2-dev
Andy McFadden [Wed, 1 May 2013 00:47:26 +0000 (17:47 -0700)]
am ef4dbb6a: am 5d46b04b: Merge "Recommend different time source" into jb-mr2-dev

* commit 'ef4dbb6af3db147f4c25ae1d7013b1a30fd8fed2':
  Recommend different time source

11 years agoam 5d46b04b: Merge "Recommend different time source" into jb-mr2-dev
Andy McFadden [Wed, 1 May 2013 00:45:36 +0000 (17:45 -0700)]
am 5d46b04b: Merge "Recommend different time source" into jb-mr2-dev

* commit '5d46b04bd5a8ec00ea527b68aa48907d3978a007':
  Recommend different time source

11 years agoMerge "Recommend different time source" into jb-mr2-dev
Andy McFadden [Wed, 1 May 2013 00:43:55 +0000 (00:43 +0000)]
Merge "Recommend different time source" into jb-mr2-dev

11 years agoFix glGetUniformIndices JNI prototype
Jesse Hall [Mon, 29 Apr 2013 22:58:38 +0000 (15:58 -0700)]
Fix glGetUniformIndices JNI prototype

Bug: 8657863
Change-Id: I130d1b54d0cbd1f8613d3108482526d05d73d9e4

11 years agoRecommend different time source
Andy McFadden [Fri, 26 Apr 2013 18:17:57 +0000 (11:17 -0700)]
Recommend different time source

We were recommending SystemClock#uptimeMillis() from Java code, but
millisecond resolution is a little coarse.  We don't have an
appropriate call in SystemClock, so use System.nanoTime() instead.

Bug 8733179

Change-Id: Ifb85a03eabf7ff168966adcb5ed5914bbf3884b2

11 years agoam 8369c473: am f6d1c393: EGL: expose the EGL_KHR_create_context extension
Jamie Gennis [Mon, 29 Apr 2013 19:14:26 +0000 (12:14 -0700)]
am 8369c473: am f6d1c393: EGL: expose the EGL_KHR_create_context extension

* commit '8369c4739a58367e9636c84facc272cf8ddcb070':
  EGL: expose the EGL_KHR_create_context extension

11 years agouse a Framebuffer Object to render all screenshots
Mathias Agopian [Wed, 24 Apr 2013 17:03:08 +0000 (19:03 +0200)]
use a Framebuffer Object to render all screenshots

this allows us to render into a buffer with a
pixelformat of our own choice; this is much faster
on all platform.

Bug: 8582615
Change-Id: I61298fc8e43fa6f92044c5123955cb5c7897dab7

11 years agoMerge "Fix range check"
Andy McFadden [Mon, 29 Apr 2013 18:22:25 +0000 (18:22 +0000)]
Merge "Fix range check"

11 years agomerge in jb-mr2-release history after reset to jb-mr2-dev
The Android Automerger [Mon, 29 Apr 2013 12:55:47 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev

11 years agoMerge "Build a static device libutils"
Bjorn Bringert [Mon, 29 Apr 2013 10:10:41 +0000 (10:10 +0000)]
Merge "Build a static device libutils"

11 years agoam f6d1c393: EGL: expose the EGL_KHR_create_context extension
Jamie Gennis [Sat, 27 Apr 2013 00:54:02 +0000 (17:54 -0700)]
am f6d1c393: EGL: expose the EGL_KHR_create_context extension

* commit 'f6d1c3930eeba6b089ba12fb82ecad1c6622e550':
  EGL: expose the EGL_KHR_create_context extension

11 years agochange how the userspace GLES drivers are named
Mathias Agopian [Tue, 23 Apr 2013 18:52:29 +0000 (20:52 +0200)]
change how the userspace GLES drivers are named

for single library:
  /vendor/lib/egl/GLES.so

for multiple libraries:
  /vendor/lib/egl/EGL.so
  /vendor/lib/egl/GLESv1_CM.so
  /vendor/lib/egl/GLESv2.so

EGL_BOARD_CONFIG as well as egl.cfg are not needed anymore.

To facilitate the transition, the loader will also look
for the older naming scheme.

Bug: 8631636
Change-Id: Id4b113468df29bae72b323f76598229914e1c7a1

11 years agoBuild a static device libutils
Bjorn Bringert [Fri, 22 Mar 2013 14:26:33 +0000 (14:26 +0000)]
Build a static device libutils

This is needed to make tools such as aapt more compatible when
built for the device.

Change-Id: I1261d47b6e24595f1be547b9202892863f66a1de

11 years agoEGL: expose the EGL_KHR_create_context extension
Jamie Gennis [Fri, 26 Apr 2013 01:48:41 +0000 (18:48 -0700)]
EGL: expose the EGL_KHR_create_context extension

Bug: 8616866
Change-Id: Ic60f9f21397a1760c552b6f141d5177d1cbaf1f8

11 years agoFix range check
Andy McFadden [Thu, 25 Apr 2013 22:58:25 +0000 (15:58 -0700)]
Fix range check

The getarray() function checks to see if there's enough room in
the buffer, but it's using a byte count for the available size
and a possibly non-byte count for the space required.  Dividing
down by the unit size corrects the problem.

Bug 8713753

Change-Id: Id42c0df65c3233dcc5f76d05e229f7d40d4c1f99

11 years agoam 83ad8957: am 5b6ebd71: Merge "libgui_test: fix a couple minor test issues" into...
Jamie Gennis [Thu, 25 Apr 2013 20:50:38 +0000 (13:50 -0700)]
am 83ad8957: am 5b6ebd71: Merge "libgui_test: fix a couple minor test issues" into jb-mr2-dev

* commit '83ad89579e22228c1a48a2a488b86fc0d41057a6':
  libgui_test: fix a couple minor test issues