Commit graph

2502 commits

Author SHA1 Message Date
Dimitry Ivanov
ac8abec905 resolve merge conflicts of bb958f0f5 to oc-dev-plus-aosp
Test: n/a
Change-Id: Iede624aa5210794d48b63d6053293028483b89c7
2017-05-25 09:57:15 -07:00
Dimitry Ivanov
af0264bbe9 Load vendor public libraries to sphal namespace
Load vendor public libraries to sphal namespace
if it exists - preserve old behavior of loading
these libraries to default namespace if sphal
namespace is not present on the device.

Bug: http://b/37410104
Test: cts-tradefed run singleCommand cts --skip-preconditions -m CtsJniTestCases
      on marlin (with enabled sphal configuration) and on angler where ld.config.txt
      is not present.

Change-Id: Iaa3fa437ba2900acc2e5b9c78039fe1553e4c9dd
2017-05-24 11:02:31 -07:00
Vijay Venkatraman
95f9a9678d Merge "Moved include/backtrace to libbacktrace/include" into oc-dev 2017-04-13 16:53:13 +00:00
Vijay Venkatraman
a130b80069 Moved include/backtrace to libbacktrace/include
Export libbacktrace_headers

cherry-pick from commit 8f2c28d572

Bug: 33241851
Test: Build sailfish
Change-Id: Ied4168425ded95724d051ffdc9965c5927bc05ae
Merged-In: Iba310ffc21d17ba542bed954a960ab305037061c
2017-04-13 09:26:20 -07:00
Vijay Venkatraman
8f2c28d572 Moved include/backtrace to libbacktrace/include
Export libbacktrace_headers

Bug: 33241851
Test: Build sailfish
Change-Id: Iba310ffc21d17ba542bed954a960ab305037061c
2017-04-11 11:22:43 -07:00
Vijay Venkatraman
88bff3613e Moved all files from include/system to libsystem/include/system
Bug: 33241851
Test: No changes for modules not using VNDK. For compiling with VNDK,
add libsystem_headers as dependency for using these headers

Merged-In: I2acce0ab771e10ac83461c2f931e2c19e922089e
Change-Id: I2acce0ab771e10ac83461c2f931e2c19e922089e
2017-04-11 16:13:42 +00:00
Treehugger Robot
1238292db5 Merge "NativeBridge: add "linked namespace" semantic corresponding to linker" 2017-04-07 21:46:18 +00:00
Vijay Venkatraman
deb32544ba Merge "Moved all files from include/system to libsystem/include/system" 2017-04-07 18:28:47 +00:00
Zhenhua WANG
caf7750f3f NativeBridge: add "linked namespace" semantic corresponding to linker
For dynamic linking perspective, semantics of NativeBridge needs to
align with dynamic linker. This patch adds "linked namespace" semantic
which shares some libraries from one namespace to another.

Bug: 37123321
Test: Fugu: netflix, play movies, youtube
Test: make test-art-host-run-test-115-native-bridge

cherry picked from commit e8fb11dfa1

Change-Id: I71ce1dde19d61363d5eb9731fd4795a8c315b3a0
2017-04-07 10:42:51 -07:00
Adam Lesinski
47f5581927 Merge "ZipWriter: Do not write DataDescriptor for STORED files" 2017-04-07 00:33:20 +00:00
Adam Lesinski
e2fa70bcb0 ZipWriter: Do not write DataDescriptor for STORED files
Older implementations of ZIP (Java's ZipInputStream) don't
like a Data Descriptor trailing after an uncompressed entry.

If the FILE is seekable, and the entry is uncompressed, seek
back to the header and write out the crc and sizes.

(cherry-pick of commit 639814d946)

Bug: 36686974
Test: make ziparchive_tests
Change-Id: I61664515e5afa3e2ba814874eeac847a2aaac319
2017-04-06 17:03:32 -07:00
Vijay Venkatraman
b3ef9022e9 Moved all files from include/system to libsystem/include/system
Bug: 33241851
Test: No changes for modules not using VNDK. For compiling with VNDK,
add libsystem_headers as dependency for using these headers

Change-Id: I1a8a44073424cc0db625e31d44cb16b78c5a9ca1
Merged-In: I2acce0ab771e10ac83461c2f931e2c19e922089e
2017-04-06 10:28:50 -07:00
Adam Lesinski
639814d946 ZipWriter: Do not write DataDescriptor for STORED files
Older implementations of ZIP (Java's ZipInputStream) don't
like a Data Descriptor trailing after an uncompressed entry.

If the FILE is seekable, and the entry is uncompressed, seek
back to the header and write out the crc and sizes.

Bug: 36686974
Test: make ziparchive_tests
Change-Id: I61664515e5afa3e2ba814874eeac847a2aaac319
2017-04-05 10:54:15 -07:00
Zhenhua WANG
e8fb11dfa1 NativeBridge: add "linked namespace" semantic corresponding to linker
For dynamic linking perspective, semantics of NativeBridge needs to
align with dynamic linker. This patch adds "linked namespace" semantic
which shares some libraries from one namespace to another.

Test: make test-art-host-run-test-115-native-bridge
Change-Id: I71ce1dde19d61363d5eb9731fd4795a8c315b3a0
2017-03-29 17:34:11 -07:00
Adam Lesinski
e80f0cc5fb Merge "libziparchive: Add ability to backup in ZipWriter" am: 0e19795a62 am: a41597ba0e
am: 797852c435

Change-Id: I10f76ce5bec477f1e27ef7456e20cdedd9e3833f
2017-03-23 18:15:01 +00:00
Adam Lesinski
a41597ba0e Merge "libziparchive: Add ability to backup in ZipWriter"
am: 0e19795a62

Change-Id: Id15ab4bf8bd40640d2a301f0464230b620e8b603
2017-03-23 18:07:27 +00:00
Treehugger Robot
0e19795a62 Merge "libziparchive: Add ability to backup in ZipWriter" 2017-03-23 17:59:47 +00:00
Christopher Ferris
496f95f821 Merge "Do not access device maps." am: a06e1c9eef am: cc99ba7ff5
am: 69549a561b

Change-Id: I470d78666c959cfaec33f26b6931ba2ea6c0d6c0
2017-03-23 01:18:38 +00:00
Christopher Ferris
cc99ba7ff5 Merge "Do not access device maps."
am: a06e1c9eef

Change-Id: Id30b71a301953d8450bd66552a020437c5e91b94
2017-03-23 00:53:18 +00:00
Christopher Ferris
a06e1c9eef Merge "Do not access device maps." 2017-03-23 00:32:40 +00:00
Adam Lesinski
537713bace libziparchive: Add ability to backup in ZipWriter
Based on the compressed size of a file entry,
the decision needs to be made to instead store the file
uncompressed. This adds support to ZipWriter to backup
its last file entry.

The file is now always truncated when the EOCD is written out,
to account for the case where a file entry is backed-up and the
resulting file written is much smaller, leaving garbage data at
the end of the file.

This change also includes a rename of FileInfo -> FileEntry.
This struct was private (now public), so it shouldn't affect any
clients.

Bug: 35461578
Test: make ziparchive-tests
Change-Id: I23dc584406274ab7b8ce62b3fbc3562ca4c2603e
2017-03-22 16:46:42 -07:00
Christopher Ferris
f5e568e653 Do not access device maps.
It's possible that a device map has memory controlled by a single entry
device driver. Thus, you can deadlock if a process is touching that
device memory and we try to unwind it and also touch that device memory.
Simply skip any attempts to step through, or get function names from
device memory maps.

Bug: 36130325

Test: Ran new unit tests, ran bionic unit tests, ran art ThreadStress.
Change-Id: Ibc62d7ec8106c619ee08968f05e04aea55d7cbfa
2017-03-22 14:55:05 -07:00
Mathias Agopian
34c9fbb6d1 Deprecate system/window.h
Renamed it to system/window-deprecated.h and
added a comment to that effect. 
window.h now includes system/window-deprecated.h,
which should make it obvious it shouldn’t be used.

Test: compiled
Bug: 34453351
Change-Id: Ie6953fd4383ba6289bd8950c389d14d9ac41f7d5
2017-03-22 20:57:27 +00:00
Vijay Venkatraman
39958cb6e8 Merge "Moved include/android_filesystem_*.h and canned_fs_config.h to libcutils" am: a4bc98941a am: c0c4aeb556
am: 3286d2d0d2

Change-Id: I203baad63ece6cb9b223018a8664d625a6a5046d
2017-03-22 18:36:06 +00:00
Vijay Venkatraman
c0c4aeb556 Merge "Moved include/android_filesystem_*.h and canned_fs_config.h to libcutils"
am: a4bc98941a

Change-Id: Ib90d711895c8a75f5abec2284ff66723c4f5b35e
2017-03-22 18:31:55 +00:00
Vijay Venkatraman
d4e2386057 Moved include/android_filesystem_*.h and canned_fs_config.h to libcutils
Bug: 33241851
Test: No changes needed for modules not using VNDK.
For VNDK, enable BOARD_VNDK_VERSION in BoardConfig.mk
and add libcutils to modules that need these headers.

Change-Id: I6102778aab35ed26a5ddde11230502dcd4edc852
2017-03-21 17:34:58 -07:00
TreeHugger Robot
7486e65a6c Merge "Remove retire frame event." 2017-03-21 22:07:58 +00:00
Jeff Sharkey
db36227d43 Merge "Allocate new UID for OTA update resource tracking." am: 1ed1d3dac9 am: 2e86917f92
am: 80a09ebab3

Change-Id: Ia8eb25608f9bb52b497fdb4ede134ce563a74f64
2017-03-20 23:18:50 +00:00
Jeff Sharkey
2e86917f92 Merge "Allocate new UID for OTA update resource tracking."
am: 1ed1d3dac9

Change-Id: Ic365e6f4084d063363005cd42b66ee0799691031
2017-03-20 23:11:37 +00:00
Jeff Sharkey
e1bddc78bf Allocate new UID for OTA update resource tracking.
Recent changes to OTA updates started "blaming" network usage on the
system UID, which makes it difficult to triage incoming bugreports
that claim heavy network usage.  Instead, this change gives OTA
updates an explicit UID to make triage easier.

Test: builds, boots
Bug: 36130264
Change-Id: I0a0cc009f3d891b19b419bc12cd237ef8ac64519
2017-03-20 14:57:42 -06:00
Brian Anderson
4e080e5128 Remove retire frame event.
Test: adb shell /data/nativetest/libgui_test/libgui_test
  --gtest_filter=*GetFrameTimestamps*

Change-Id: I9e7fa878fe7cc339d33c221d56b56cce1709aa74
2017-03-16 16:12:21 -07:00
Andrew Scull
164b70e927 Merge "Add eSE AID." am: e323976e74 am: 4614ba5134
am: 31a515bdcd

Change-Id: Iaf6592b934bf810d7a7b587a19fe4bf39016d22e
2017-03-16 18:10:22 +00:00
Andrew Scull
4614ba5134 Merge "Add eSE AID."
am: e323976e74

Change-Id: I0ce8f821fa1e2028a1d7a1275773b54bd250a612
2017-03-16 18:03:21 +00:00
Treehugger Robot
e323976e74 Merge "Add eSE AID." 2017-03-16 17:58:48 +00:00
Andrew Scull
b364328a59 Add eSE AID.
This is used by components that communicate with the embedded secure
element.

Test: Boot system with a daemon and device using this AID.
Bug: 35628284
Change-Id: I1fd1a300c69fefbd19fda69add5d3b098be873c2
2017-03-16 15:05:19 +00:00
Mathias Agopian
c1d77bedad Add an “is valid” query to ANativeWindow
This will help avoid certain crash (null dereference),
and return an error instead. This is useful for
app developers as java language apps are not
expected to crash when passed bad arguments

This doesn’t fix bug 36065206, but was prompted
by it.

Test: compile / run
Bug: 36065206
Change-Id: I329874821f5cd780eeaacf8945859af5ab790cf4
2017-03-08 15:04:09 -08:00
Courtney Goeltzenleuchter
fbef1c3c79 Add queries for surface color space support
Add two queries to query if the current surface can support
wide-color (Display-P3) or HDR.
Test: TBD CTS test

Change-Id: I2c68b0e1b1e0c2a0257e0c93f60cb8d84de20b4a
2017-03-03 08:04:43 -07:00
Courtney Goeltzenleuchter
7ab0579800 Add dataspace to match upstream EGL extension
EGL's EGL_EXT_gl_colorspace_bt2020_pq extension
supports a bt2020 color space with a ST2084
transfer function (Dolby Perceptual Quantizer)
Test: make
Change-Id: Ibdacb00ce48189b1faf16fb8dd071caff2ec2a98
2017-03-01 18:25:15 -07:00
bohu
294d44be33 DO NOT MERGE ANYWHERE Qemu-pipe: refactor qemu_pipe.h into libqemu_pipe
Traditionally, qemu_pipe has both the declaration and implentation of each
function in one header file--qemu_pipe.h, and it is getting incovenient to
maintain.

This CL separates the implementation of functions from the header file,
and makes qemu_pipe a static library for other modules to link to.

Note that the interface and implementation of qemu_pipe are kept unchanged,
and future CLs will enhance the implementation to make it more reliable and
more compatible with old and new API levels.

Following projects are affected by this refactoring, and they are modified
accordingly:

device/generic/goldfish
device/generic/goldfish-opengl
hardware/ril/reference-ril

Change-Id: I541ecbf0cc7eadeef9d4e37ffd9ca7bfcc5c94c0
2017-03-01 16:33:44 -08:00
Brian Anderson
b5ade03417 Replace "GL" naming with "GPU".
Test: Manual testing with Chrome.

Change-Id: Ib9c861f27c59ed17bd2155d9b8b4224cd90e8935
2017-02-16 12:19:26 -08:00
Brian Anderson
ad79a39037 Add NATIVE_WINDOW_GET_COMPOSITOR_TIMING
Helps support eglGetCompositorTimingANDROID.

Test: Manual testing with Chrome.
Change-Id: I107cf14228dcde8da130bde6d477d0d0f1b38c5f
2017-02-03 15:24:00 -08:00
Brian Anderson
d1dbcd6f82 Add native_window_get_next_frame_id.
Test: Tested with Chrome.
Change-Id: I2fce20837359e4b6f8212d3672537f4eb920b69a
2017-02-03 14:59:00 -08:00
Mark Salyzyn
28e4276693 Merge "Revert "Continue using the legacy NDK android/log.h."" am: 33aa9fc0e1 am: cb29e6e94f am: f598640e48
am: 764b040b1c

Change-Id: Ibf469562e5aee08459aad2088534124065576797
2017-01-31 00:24:29 +00:00
Mark Salyzyn
bdac221cc3 Revert "Continue using the legacy NDK android/log.h."
Use refreshed android/log.h for NDK

This effectively a modern revert of the commit
b7c3996f7c

Test: build
Bug: 30465923
Bug: 34250038
Change-Id: I7d4a5134bb711051283c36a2d5bc803436dca12e
2017-01-30 22:14:59 +00:00
Courtney Goeltzenleuchter
15c151bd6d Merge "Add SMPTE2086 structures" 2017-01-30 16:35:57 +00:00
Courtney Goeltzenleuchter
75d8680794 Merge "Add enums for 10bit color formats" 2017-01-30 15:49:53 +00:00
TreeHugger Robot
45f6de6a4a Merge "Add dataspace for sensor direct report" 2017-01-27 23:43:45 +00:00
Ian Elliott
5429c76fd5 Merge "Remove old macro/function to get {min|max}RefreshDuration" 2017-01-27 20:54:07 +00:00
Courtney Goeltzenleuchter
cae6767698 Add SMPTE2086 structures
Add necessary data structures to hold SMPTE2086 data
describing the capabilities of the mastering display.
Test: TBD
Bug: 29940137

Change-Id: I085112f07e453d9f8bc73bbd6a8f91605c12e75d
2017-01-26 16:48:22 -07:00
Courtney Goeltzenleuchter
bde1241327 Add enums for 10bit color formats
To improve wide-color behavior it's useful to have more bits
per color component. This defines 10:10:10:2 and 10:10:10:X
for that use.
This can be used for any color space / dataspace that is
compatible with unsigned integer components, e.g. Display-P3,
BT2020, etc.
Test: TBD
Bug: 29940137

Change-Id: Ieb8757e76b1d5bc45ce37c2473289eed7db66139
2017-01-26 16:48:13 -07:00