Nick Kralevich
b281d81404
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.
2013-12-17 23:18:58 +00:00
Nick Kralevich
e2d412f046
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.
2013-12-17 23:12:20 +00:00
Nick Kralevich
e7394ba8bd
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.
2013-12-17 15:08:30 -08:00
Nick Kralevich
c02c35fbdc
Merge "restorecon /data/media when re-creating it for multi-user upgrade."
2013-12-17 23:02:36 +00:00
Stephen Smalley
47a351834f
restorecon /data/media when re-creating it for multi-user upgrade.
...
Change-Id: I112c61863f2104d1962697c54cff25106e9b48a0
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2013-12-17 16:04:20 -05:00
Christopher Tate
6fce2d2280
Fix MCC/MNC typo
...
Manual merge of https://android-review.googlesource.com/70831 across
the header refactoring.
Change-Id: I28b6a61e89b68d914124122882976a9d2f81a609
2013-12-16 15:04:10 -08:00
Brian Carlstrom
fe761ab6c7
Track Looper decoupling from ALooper
...
Change-Id: I612f0de7002e24948a4cbbea7b416b4fbb3929aa
2013-12-12 23:54:43 -08:00
Dan Stoza
3ed4e0b365
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
2013-12-12 10:58:56 -08:00
Narayan Kamath
ec3994f2b3
Merge changes I25acff1d,Iae67e62f
...
* changes:
Add libutils dependency for libandroidfw host build.
Reimplement ZipFileRO in terms of libziparchive.
2013-12-11 19:35:53 +00:00
Narayan Kamath
ce12e8c318
Add libutils dependency for libandroidfw host build.
...
(cherry picked from commit 070274ec0ccb8643c52e41e4119f356f0f51bc36)
Change-Id: I25acff1d36b3adce14b2576485bda93c914d7f5d
2013-12-11 19:16:11 +00:00
Todd Poynor
34ced636fb
am 2a83daa8
: dumpstate: dump console-ramoops instead of last_kmsg if present
...
* commit '2a83daa8a3e1eab292dc1464bbe78f025f4bc0e9':
dumpstate: dump console-ramoops instead of last_kmsg if present
2013-12-11 06:30:39 +00:00
Todd Poynor
2a83daa8a3
dumpstate: dump console-ramoops instead of last_kmsg if present
...
Change-Id: I41a922b33f0b6b4e8e150a92e46032501a165e33
2013-12-10 14:42:27 -08:00
Aravind Akella
0075d781b4
Merge "Bug fix for SensorFusion data rate."
2013-12-10 20:12:29 +00:00
Aravind Akella
8850909038
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
2013-12-10 01:57:12 +00:00
Dan Stoza
a6c2591791
Merge "libgui: Split SurfaceTexture tests into more files"
2013-12-09 18:38:51 +00:00
Dan Stoza
cb1fcdedaa
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
2013-12-09 09:52:02 -08:00
Narayan Kamath
aae73e748c
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
2013-12-09 16:34:30 +00:00
The Android Open Source Project
d837548947
am 1b5143bf
: am de8c8069
: Merge commit \'1ee45c2d2d816ee912624d81ff1b0aaa98e8fa74\' into HEAD
...
* commit '1b5143bfd6ae69ca37ee78e77bd1fcad78c105bd':
2013-12-06 01:43:29 +00:00
The Android Open Source Project
1b5143bfd6
am de8c8069
: Merge commit \'1ee45c2d2d816ee912624d81ff1b0aaa98e8fa74\' into HEAD
...
* commit 'de8c80692b0b2fcef705ba9b417477d2bba81e75':
2013-12-05 17:26:03 -08:00
The Android Open Source Project
de8c80692b
Merge commit '1ee45c2d2d816ee912624d81ff1b0aaa98e8fa74' into HEAD
2013-12-05 12:38:18 -08:00
Alistair Strachan
8f76b6bedf
gui: Fix return code assert in CpuConsumer_test.
...
The CpuConsumer error code was changed recently from INVALID_OPERATION to
NOT_ENOUGH_DATA, however the CpuConsumer_test was not updated. This change
fixes the return code checked by CpuConsumer_test so the test no longer
fails.
Change-Id: Ie548ddcb313fa34c130ac63355090cb44ac15ebf
2013-12-04 14:57:22 -08:00
Jesse Hall
3ab2ee8cb7
am 46cfde3b
: am 708602cc
: Merge "DispSync: remove delay when enabling vsync events"
...
* commit '46cfde3b65493d3b4ed0038ee7d6f7b66c2c2362':
DispSync: remove delay when enabling vsync events
2013-12-03 05:31:57 +00:00
Jesse Hall
46cfde3b65
am 708602cc
: Merge "DispSync: remove delay when enabling vsync events"
...
* commit '708602ccaad0f6e896c4bd4457503614b9ee81d0':
DispSync: remove delay when enabling vsync events
2013-12-02 21:19:56 -08:00
Jesse Hall
708602ccaa
Merge "DispSync: remove delay when enabling vsync events"
2013-12-03 05:12:31 +00:00
Jamie Gennis
629b987818
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
2013-12-02 21:06:09 -08:00
Nick Kralevich
17dc96ecde
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.
2013-12-02 23:31:01 +00:00
Nick Kralevich
651dc7440b
am bef08b8d
: Merge "Handle policy reloads within installd rather than restarting it."
...
* commit 'bef08b8d1b30976ff273fc9041bc8d934f52fea9':
Handle policy reloads within installd rather than restarting it.
2013-11-27 13:16:46 -08:00
Nick Kralevich
bef08b8d1b
Merge "Handle policy reloads within installd rather than restarting it."
2013-11-27 21:09:13 +00:00
Dan Stoza
f3730fb8f7
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
2013-11-26 15:48:53 -08:00
Dima Zavin
a66162b9eb
am f4325cee
: am 63b62e8c
: am 66ad04bc
: Merge "Remove incompatible ashmem.h"
...
* commit 'f4325ceea48103490aacbf335280e94ea24cdd8f':
Remove incompatible ashmem.h
2013-11-23 12:41:07 -08:00
Dima Zavin
f4325ceea4
am 63b62e8c
: am 66ad04bc
: Merge "Remove incompatible ashmem.h"
...
* commit '63b62e8cd48176abbfddb6bd67c138ae447f6ac7':
Remove incompatible ashmem.h
2013-11-23 12:36:54 -08:00
The Android Open Source Project
508203affe
am 24bff56f
: am fc3cdb93
: Merge commit \'afd0debe4bdf47dc0f968282ca1261842bb65d60\' into HEAD
...
* commit '24bff56ff591607d6515a286bb7908882dcb3bc1':
2013-11-23 12:29:35 -08:00
Dima Zavin
63b62e8cd4
am 66ad04bc
: Merge "Remove incompatible ashmem.h"
...
* commit '66ad04bc039c73763c55c8d3aad282378e05d257':
Remove incompatible ashmem.h
2013-11-22 20:45:07 -08:00
Dima Zavin
66ad04bc03
Merge "Remove incompatible ashmem.h"
2013-11-23 04:41:17 +00:00
The Android Open Source Project
24bff56ff5
am fc3cdb93
: Merge commit \'afd0debe4bdf47dc0f968282ca1261842bb65d60\' into HEAD
...
* commit 'fc3cdb936e6b34257a3bfaf30e89db8f11667cc5':
2013-11-22 17:41:41 -08:00
The Android Open Source Project
fc3cdb936e
Merge commit 'afd0debe4bdf47dc0f968282ca1261842bb65d60' into HEAD
...
Change-Id: Ic9aed2c57bdfeb250ce2dd7f0e9289ba5b6e936a
2013-11-22 11:20:20 -08:00
Elliott Hughes
ee47adfb1b
am 0d103b59
: am f2f74ca6
: Merge "Remove references to obsolete pmem functionality."
...
* commit '0d103b596dd9883898a062beaacf980d4439b835':
Remove references to obsolete pmem functionality.
2013-11-21 23:00:19 -08:00
Elliott Hughes
0d103b596d
am f2f74ca6
: Merge "Remove references to obsolete pmem functionality."
...
* commit 'f2f74ca65f34ae0cae6f0cca40f1c18aa771739d':
Remove references to obsolete pmem functionality.
2013-11-21 18:43:51 -08:00
Igor Murashkin
7ea777f097
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
2013-11-21 14:06:13 -08:00
Elliott Hughes
f2f74ca65f
Merge "Remove references to obsolete pmem functionality."
2013-11-21 20:42:33 +00:00
Elliott Hughes
a5a13a3ecf
Remove references to obsolete pmem functionality.
...
Change-Id: I5d3befd075e51614e6801115388a0a9f32fbb6ea
2013-11-21 12:22:39 -08:00
Igor Murashkin
4be18a3566
gui: Remove BufferQueue::MIN_UNDEQUEUED_BUFFERS
...
Change-Id: I7c0cc36046dbbdb9c0e85acfe5027293d1131275
2013-11-18 12:36:15 -08:00
Igor Murashkin
7d2d160cdc
gui: Update header docs for IGraphicBufferConsumer/Producer/BufferQueue
...
Also fix compiler warnings for libgui
Change-Id: I0ee38d9ad5eaa82d55bf812d291da8c433581cef
2013-11-13 17:34:03 -08:00
Jesse Hall
324c69b542
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
2013-11-08 13:01:20 -08:00
Jesse Hall
1ee45c2d2d
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
2013-11-08 12:58:20 -08:00
Jesse Hall
14e8b01a76
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
2013-11-07 12:37:13 -08:00
Jesse Hall
ad78055746
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
2013-11-06 21:12:40 -08:00
Jesse Hall
2d32aa5918
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
2013-11-06 20:48:51 -08:00
Jesse Hall
356c23865d
Merge "Provide virtual display output buffer to HWC in prepare" into klp-dev
2013-11-07 04:43:20 +00:00
Changwan Ryu
bcd66ecb41
Merge "Extend OpenMAX IL definitions to support AC3"
2013-11-06 18:22:41 +00:00