Kenny Root
a4cef69367
Use canonical UniquePtr.h header
...
Change-Id: I0487bd53fc946e1a488d7109eebd402d1ecc5a0a
2013-09-11 14:51:09 -07:00
Kenny Root
6a09617eaa
Merge "keymaster: use new version fields in hw_module"
2013-09-10 18:14:58 +00:00
Kenny Root
36ab8ed76f
keymaster: use new version fields in hw_module
...
The original version of this HAL used a field in keymaster_module to
represent the module's version number, but a later revision of the HAL
interface added a distinguisher between HAL module and device versions.
This is needed to support upgrade code in keystore.
(cherry picked from commit c124b23f94
)
Bug: 10600582
Change-Id: Ia2b0cbeca5c507600228c39ec7a8402f819f8804
2013-09-10 18:14:49 +00:00
Kenny Root
bd5015e0f3
Merge "Add support for DSA and ECDSA key types"
2013-09-03 07:11:08 +00:00
Kenny Root
6e1683f5d5
Add support for DSA and ECDSA key types
...
Change-Id: I4b7d11c0915c716a0f1be65f5933f33a36e0fb4b
2013-09-03 00:09:18 -07:00
The Android Open Source Project
cb7f5b94a3
Reconcile with jb-mr2-zeroday-release - do not merge
...
Change-Id: I2c24ec07adc57969cc48647a07afca7337923d51
2013-07-08 15:35:35 -07:00
The Android Automerger
f780878cd2
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
2013-07-08 05:55:35 -07:00
Eino-Ville Talvala
43c754f49c
am 4c543a14
: Enable native HAL tests to work for camera3 devices
...
* commit '4c543a1456cd34a94e2c3a09879aa65ed8cd2f3a':
Enable native HAL tests to work for camera3 devices
2013-07-02 12:36:39 -07:00
Eino-Ville Talvala
4c543a1456
Enable native HAL tests to work for camera3 devices
...
Change-Id: Ie11270cc8cf301ec94795b595f0517ee3bad2817
2013-06-27 18:02:24 -07:00
The Android Open Source Project
0ab04716dc
Reconcile with jb-mr2-zeroday-release - do not merge
...
Change-Id: I645db66e377a7f385129f72507f19036d4029445
2013-06-26 12:33:43 -07:00
The Android Automerger
01ad343cdf
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
2013-06-26 12:17:24 -07:00
Iliyan Malchev
1b8e21aa2d
am 1a70c0fd
: libhardware: deprecate POWER_HINT_VIDEO_ENCODE/_DECODE
...
* commit '1a70c0fd39eed070c2c28fc0731fa689d15931c4':
libhardware: deprecate POWER_HINT_VIDEO_ENCODE/_DECODE
2013-06-25 19:00:07 -07:00
Iliyan Malchev
1a70c0fd39
libhardware: deprecate POWER_HINT_VIDEO_ENCODE/_DECODE
...
Bug: 9581070
Change-Id: Ifb47ed0d4fc201732ca6593d41317ec356ead2ba
Signed-off-by: Iliyan Malchev <malchev@google.com>
2013-06-25 18:55:59 -07:00
Mekala Natarajan
a2ce3e82d5
am 501fc0f1
: Power: Add multimedia hints
...
* commit '501fc0f18249468d485415a3a7f892c644271e63':
Power: Add multimedia hints
2013-06-25 15:11:07 -07:00
Mekala Natarajan
501fc0f182
Power: Add multimedia hints
...
Add hints for video encode and decode use cases. These
hints are sent when the relevant use case starts and ends.
Clients can also send metadata along with the hint to provide
context to the power HAL so that it can make more informed
decisions about how to tweak system-level parameters.
Bug: 9325608
Change-Id: I4731acbe50a7401a95ec9231c4e1a4795098fcd4
Signed-off-by: Iliyan Malchev <malchev@google.com>
2013-06-20 09:54:28 -07:00
The Android Open Source Project
94a155a41a
Reconcile with jb-mr2-release - do not merge
...
Change-Id: I31743534d947232b1cce9b36877c58d43e459d08
2013-05-23 08:05:38 -07:00
The Android Automerger
2ffc283435
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-05-23 05:55:23 -07:00
Eino-Ville Talvala
b3d4dae427
am 73dba5e0
: Camera3: Document missing AF transitions.
...
* commit '73dba5e043d44910a8cee4def742f58607fc5894':
Camera3: Document missing AF transitions.
2013-05-22 09:20:06 -07:00
Eino-Ville Talvala
73dba5e043
Camera3: Document missing AF transitions.
...
Bug: 9075581
Change-Id: I7688cee904987f404b4ab7ff0e5212182f85a271
2013-05-21 16:31:27 -07:00
The Android Open Source Project
9b5408ffd6
Reconcile with jb-mr2-release - do not merge
...
Change-Id: I1e981404c88dd61fe418ae799d599ae4d072555c
2013-05-16 05:43:48 -07:00
The Android Automerger
abd5bc6654
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-05-15 05:55:32 -07:00
Brian Carlstrom
ee37c3a845
am 63b64337
: Add larger RSA key sizes
...
* commit '63b64337fbaa10b282f85a7e887b40ced6d6d632':
Add larger RSA key sizes
2013-05-14 15:56:46 -07:00
Brian Carlstrom
63b64337fb
Add larger RSA key sizes
...
Bug: 8734191
Change-Id: I82413505b32d5cdd2c4330c63d5f66e6b7e34634
2013-05-14 15:32:33 -07:00
The Android Automerger
8282f0ba9d
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-05-09 05:55:29 -07:00
Jesse Hall
f20cae6b94
am 4ed61b22
: Merge "Move virtual displays out of HWC 1.2, mark experimental" into jb-mr2-dev
...
* commit '4ed61b22e046ed544f6afb50abd0af25d478d8b1':
Move virtual displays out of HWC 1.2, mark experimental
2013-05-08 13:57:55 -07:00
Jesse Hall
4ed61b22e0
Merge "Move virtual displays out of HWC 1.2, mark experimental" into jb-mr2-dev
2013-05-08 20:53:34 +00:00
Eino-Ville Talvala
df336e2de4
am c6ff6c40
: Merge "gralloc: Clarify alloc stride for HAL_PIXEL_FORMAT_YCbCr_420_888" into jb-mr2-dev
...
* commit 'c6ff6c40dd4408c7aac0e079a6d26359902c240f':
gralloc: Clarify alloc stride for HAL_PIXEL_FORMAT_YCbCr_420_888
2013-05-08 09:56:53 -07:00
Eino-Ville Talvala
c6ff6c40dd
Merge "gralloc: Clarify alloc stride for HAL_PIXEL_FORMAT_YCbCr_420_888" into jb-mr2-dev
2013-05-08 16:55:15 +00:00
The Android Automerger
ef5f7cd508
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-05-08 05:55:35 -07:00
Eino-Ville Talvala
c2f433d00c
am b605944f
: Camera3: Document cropping behavior
...
* commit 'b605944f0a0590d0f31d48a14eaf8e6a075ddba1':
Camera3: Document cropping behavior
2013-05-07 17:05:52 -07:00
Jesse Hall
380f45dade
Move virtual displays out of HWC 1.2, mark experimental
...
Bug: 8384764
Change-Id: I388ff3f46893b395e5c4187242f51ad7bb58da24
2013-05-07 12:03:27 -07:00
Eino-Ville Talvala
6efab252d5
gralloc: Clarify alloc stride for HAL_PIXEL_FORMAT_YCbCr_420_888
...
Bug: 8734880
Change-Id: I0cca7fd1965e1547991be06b6b18d6302dbe8670
2013-05-06 14:05:05 -07:00
Eino-Ville Talvala
b605944f0a
Camera3: Document cropping behavior
...
Redefined somewhat from HAL2, to be simpler for everyone.
Bug: 8756080
Change-Id: I6b7608c74c06cc6a0bfe07997444e3b07c3edb10
2013-05-01 15:23:21 -07:00
The Android Automerger
43d9b5626c
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-04-30 05:56:08 -07:00
Alex Ray
1a0be33faa
am 74b8c4e5
: Merge "gralloc: add lock_ycbcr method" into jb-mr2-dev
...
* commit '74b8c4e57b6d0db6bdb79d298ef8bb19cad3be2e':
gralloc: add lock_ycbcr method
2013-04-29 12:11:54 -07:00
Alex Ray
74b8c4e57b
Merge "gralloc: add lock_ycbcr method" into jb-mr2-dev
2013-04-29 19:10:07 +00:00
Kenny Root
03fa29dbc6
am eca8b3cd
: keymaster_test: simulate binder pages
...
* commit 'eca8b3cdf0f906062285d03a0d08e3104625df94':
keymaster_test: simulate binder pages
2013-04-29 11:27:55 -07:00
The Android Automerger
c6f5e626d2
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-04-29 05:55:52 -07:00
Kenny Root
eca8b3cdf0
keymaster_test: simulate binder pages
...
Make sure pages we use in the unit tests are read-only maps from
/dev/zero
Bug: 8736730
Change-Id: I15d816a8fd3dd7313277c9f5c44c4a102a899d03
2013-04-27 09:01:19 -07:00
Alex Ray
06e3bf2566
gralloc: add lock_ycbcr method
...
This method is meant for locking the flexible YCbCr format documented in
the system graphics header.
Bug: 8734880
Change-Id: I45ae8937dcc16d0ae8a204a136121f78b4cc51e0
2013-04-26 13:51:10 -07:00
Eino-Ville Talvala
ddf31fd62a
am 75f0d0ec
: Merge "Camera3: Clarify SHUTTER timing, ownership of request contents" into jb-mr2-dev
...
* commit '75f0d0ec0db5ab01e0937e4068c4be9e799e9853':
Camera3: Clarify SHUTTER timing, ownership of request contents
2013-04-25 12:30:37 -07:00
Eino-Ville Talvala
75f0d0ec0d
Merge "Camera3: Clarify SHUTTER timing, ownership of request contents" into jb-mr2-dev
2013-04-25 19:28:27 +00:00
The Android Automerger
bdcf9d0a9c
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-04-24 05:55:34 -07:00
Etienne Le Grand
4daa2f8ea9
am 7a813e84
: Modify sign of bias in uncalibrated magnetometer
...
* commit '7a813e844252612cd8f7fa4e391825477d8b63d0':
Modify sign of bias in uncalibrated magnetometer
2013-04-23 14:38:46 -07:00
Etienne Le Grand
7a813e8442
Modify sign of bias in uncalibrated magnetometer
...
bug 8632692
Change-Id: If92f0030e53d41a7d0bc3c3b003f5eb939123945
2013-04-23 14:32:22 -07:00
Eino-Ville Talvala
71af102b48
Camera3: Clarify SHUTTER timing, ownership of request contents
...
- Clarify ownership of fence file descriptors, including in case of
errors.
- Make it clear notify SHUTTER must be called before the first
process_capture_result.
Change-Id: I644054a7a055c2e8a6a164c5ab6439ef2a0d1df1
2013-04-22 14:19:21 -07:00
The Android Automerger
b7a85896df
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-04-22 05:55:46 -07:00
Igor Murashkin
a3f1b92b77
am 29156e43
: Merge "Make raw tests optional, add sanity checks for format/resolutions static info." into jb-mr2-dev
...
* commit '29156e437858087c393c21e0502a1652fb77dd13':
Make raw tests optional, add sanity checks for format/resolutions static info.
2013-04-19 10:38:32 -07:00
Igor Murashkin
29156e4378
Merge "Make raw tests optional, add sanity checks for format/resolutions static info." into jb-mr2-dev
2013-04-19 17:34:04 +00:00
Alex Ray
071d9e4b82
am a7c66429
: Revert "gralloc: add lock_ycbcr method"
...
* commit 'a7c66429136efe294240ebe96cfe67881514849f':
Revert "gralloc: add lock_ycbcr method"
2013-04-18 15:10:15 -07:00