Commit graph

1499 commits

Author SHA1 Message Date
Kenny Root
fea9aa6eb8 keymaster: add flags indicating feature support
For wrapping the disk encryption secret, we add a flag that indicates it
can be done without having to start some storage daemon which the
trusted OS will query to get data needed to load up the keys. This
usually means that the "key blob" we store is actually just the RSA key
encrypted with the device's KEK and not a reference to an encrypted
filesystem stored on /data

Also to allow other providers to upgrade to V3 of the header, we add
flags to show whether the keymaster supports different key types. This
allows keymaster HALs to support the whole device encryption secret
wrapping without needing to implement DSA and EC key handling. The V2
header made support implicit.

(cherry picked from commit 8a3849e26f)

Change-Id: I49be8403faf9f4c3888c84848b3009b44ab6d183
2014-04-18 14:03:35 -07:00
Aaron Whyte
1fbd8eff42 am dbcec633: am dd6e1a01: Merge "Reduced most MultiHal ALOGI to ALOGV, reducing bootup logspam." into klp-modular-dev
* commit 'dbcec633d3d9e7e63f287e39c691439424a9c288':
  Reduced most MultiHal ALOGI to ALOGV, reducing bootup logspam.
2014-04-16 20:36:13 +00:00
Aaron Whyte
dbcec633d3 am dd6e1a01: Merge "Reduced most MultiHal ALOGI to ALOGV, reducing bootup logspam." into klp-modular-dev
* commit 'dd6e1a018e318d8f95d507a2b7fc54eaa0fcabf5':
  Reduced most MultiHal ALOGI to ALOGV, reducing bootup logspam.
2014-04-16 20:33:03 +00:00
Aaron Whyte
dd6e1a018e Merge "Reduced most MultiHal ALOGI to ALOGV, reducing bootup logspam." into klp-modular-dev 2014-04-16 20:29:56 +00:00
Ariel Gertzenstein
9fe7e7a5b2 am 311c8922: (-s ours) am 40208a8b: DO NOT MERGE Fix PAN control callback definition to match what bluedroid is doing.
* commit '311c8922d7b9268b649eea4d6f578f3c65cab468':
  DO NOT MERGE    Fix PAN control callback definition to match what bluedroid is doing.
2014-04-16 19:49:16 +00:00
Ariel Gertzenstein
311c8922d7 am 40208a8b: DO NOT MERGE Fix PAN control callback definition to match what bluedroid is doing.
* commit '40208a8b2baf9629c12966e52f2f901b3019670c':
  DO NOT MERGE    Fix PAN control callback definition to match what bluedroid is doing.
2014-04-16 19:44:42 +00:00
Ariel Gertzenstein
40208a8b2b DO NOT MERGE Fix PAN control callback definition to match what bluedroid is doing.
There's a discrepancy in the order of arguments between the interface
and the implementation. bluedroid swaps the |error| and |local_role|
arguments when calling back so this change redefines the interface
for consistency.

http://b/12853951

Change-Id: I0ccfc6d6d2002d647d484ab7f53744863b569502
2014-04-16 14:53:45 -04:00
Aaron Whyte
f22e1c1808 Reduced most MultiHal ALOGI to ALOGV, reducing bootup logspam.
Bug: 14084750
Change-Id: I099aaaa24caf0213af373b5a600616674349ff95
2014-04-15 16:22:05 -07:00
Aaron Whyte
d821ba71b2 am da38fb2d: am 4d7ac52d: Fixed multihal handling of nonexistent sensor handles.
* commit 'da38fb2d13ceeee79a39146ca30e720e58572989':
  Fixed multihal handling of nonexistent sensor handles.
2014-04-15 23:20:40 +00:00
Aaron Whyte
da38fb2d13 am 4d7ac52d: Fixed multihal handling of nonexistent sensor handles.
* commit '4d7ac52d75b725ff25d68416747bfd43bbbc065d':
  Fixed multihal handling of nonexistent sensor handles.
2014-04-15 18:26:06 +00:00
Aaron Whyte
4d7ac52d75 Fixed multihal handling of nonexistent sensor handles.
This prevents crashes and undefined behavior when someone
calls sensor HAL methods with nonexistent handles.
It also adds checks and warnings if bad sensor HALs provide
garbage sensor handles in their sensor events.

Tested by making sure pedometer and tilt still work.

Bug: 13513595
Change-Id: Ie1489d3f2972bec82ee1c73189e532f6658d1eca
2014-04-15 11:00:14 -07:00
Aravind Akella
04c1521d1e Merge "Remove offset checks for reserved fields in sensor_t and sensors_event_t." 2014-04-11 21:06:22 +00:00
Aravind Akella
54770a5d8a Remove offset checks for reserved fields in sensor_t and sensors_event_t.
This reverts commit ea676f9ae6.

Change-Id: I4c69b46f20fa3505e062363643711991e65d6cb4
2014-04-11 20:45:49 +00:00
Aravind Akella
7b36316c33 Merge "Add heart rate monitor, stringType and requiredPermissions to sensors.h" 2014-04-11 20:31:53 +00:00
Aravind Akella
f2f0ea9cbc am 7e027537: (-s ours) am d5b3c73d: Merge "DO NOT MERGE Add heart rate monitor, stringType and requiredPermissions to sensors.h" into klp-modular-dev
* commit '7e02753740b3be3f7100b461e628ce2f0c1823f4':
  DO NOT MERGE Add heart rate monitor, stringType and requiredPermissions to sensors.h
2014-04-11 19:40:33 +00:00
Aravind Akella
7e02753740 am d5b3c73d: Merge "DO NOT MERGE Add heart rate monitor, stringType and requiredPermissions to sensors.h" into klp-modular-dev
* commit 'd5b3c73d80ec851296037d2c7ed011ac306eb2f5':
  DO NOT MERGE Add heart rate monitor, stringType and requiredPermissions to sensors.h
2014-04-11 19:34:53 +00:00
Aravind Akella
d5b3c73d80 Merge "DO NOT MERGE Add heart rate monitor, stringType and requiredPermissions to sensors.h" into klp-modular-dev 2014-04-11 19:32:14 +00:00
Wonsik Kim
b8dc4abed1 Merge "tv_input: add buffer producer profile" 2014-04-11 04:23:54 +00:00
Aravind Akella
477fbd5c7d Add heart rate monitor, stringType and requiredPermissions to sensors.h
Merged and resolved conflicts with Ic66b792c8229867fa5ff760cdde3d7c6f3360296

Conflicts:
	include/hardware/sensors.h

Change-Id: I47b7e5f16b50fd5272590f6daba4a9d6833b3afb
2014-04-10 16:57:42 -07:00
Jianing Wei
f816eea8f1 Camera2 test: fix build break due to change in camera service.
Change-Id: If8785df9209c83ccd1454b89b46d5e885f897cae
2014-04-10 14:17:57 -07:00
Wonsik Kim
dce529a148 tv_input: add buffer producer profile
Change-Id: Id86e282a06d6353f05d47a2f198bde0534d9dcf2
2014-04-09 21:30:04 +09:00
Aravind Akella
b20f1a3eaf DO NOT MERGE Add heart rate monitor, stringType and requiredPermissions to sensors.h
This reverts commit d27d819897.

Change-Id: Ic66b792c8229867fa5ff760cdde3d7c6f3360296
2014-04-08 18:55:50 +00:00
Dan Stoza
692231f348 Merge "Remove deprecated BufferQueue constructor" 2014-04-08 18:29:56 +00:00
Sasha Levitskiy
46781fd8f6 Hardware: Fingerprint: Add current version.
Change-Id: I8025276da558d1bf07735cd9d71ba1586566dd07
Signed-off-by: Sasha Levitskiy <sanek@google.com>
2014-04-07 14:54:42 -07:00
Dan Stoza
5dce9e4f26 Remove deprecated BufferQueue constructor
Bug: 13415624
Change-Id: Ia2ed4b5bc7289f8d8ab6e6a431746b43c81842bc
2014-04-07 13:39:37 -07:00
Sasha Levitskiy
a747c069c6 Hardware: Fingerprint: Introducing Fingerprint HAL
Change-Id: I4e55c42841c3b6a1327a16bdf6d1d4bb3847c7f3
Signed-off-by: Sasha Levitskiy <sanek@google.com>
2014-04-07 18:14:34 +00:00
Etienne Le Grand
d5aa52756f am e6bee250: (-s ours) am 71a50543: Merge "Revert "Add heart rate monitor, stringType and requiredPermissions to sensors.h"" into klp-modular-dev
* commit 'e6bee250643159b835dd23f6837e360f4282d615':
  Revert "Add heart rate monitor, stringType and requiredPermissions to sensors.h"
2014-04-05 17:05:32 +00:00
Etienne Le Grand
90578ec858 am 66fad0e3: (-s ours) am 61c78d98: Merge "Add heart rate monitor, stringType and requiredPermissions to sensors.h" into klp-modular-dev
* commit '66fad0e3e7db1ca02fa0af968008ed02e47c593c':
  Add heart rate monitor, stringType and requiredPermissions to sensors.h
2014-04-05 17:00:03 +00:00
Etienne Le Grand
e6bee25064 am 71a50543: Merge "Revert "Add heart rate monitor, stringType and requiredPermissions to sensors.h"" into klp-modular-dev
* commit '71a50543134b56055ab5be1262495bc3c7ec0c74':
  Revert "Add heart rate monitor, stringType and requiredPermissions to sensors.h"
2014-04-05 09:05:55 +00:00
Etienne Le Grand
71a5054313 Merge "Revert "Add heart rate monitor, stringType and requiredPermissions to sensors.h"" into klp-modular-dev 2014-04-05 05:01:34 +00:00
Etienne Le Grand
d27d819897 Revert "Add heart rate monitor, stringType and requiredPermissions to sensors.h"
This reverts commit 0b8ec4f71f.

Change-Id: I99051b6941cad570aef45ff568d1777f881fc33b
2014-04-05 05:01:27 +00:00
JP Abgrall
926462fa15 Merge "Revert "Fix Merge conflict (Add heart rate monitor ...to sensors.h)"" 2014-04-05 04:48:40 +00:00
Etienne Le Grand
9275d516fb Merge "Revert "Fix Merge conflict (Add heart rate monitor ...to sensors.h)"" 2014-04-05 04:48:27 +00:00
Etienne Le Grand
5bd1cb79bb Revert "Fix Merge conflict (Add heart rate monitor ...to sensors.h)"
This reverts commit c6854530e1.

Change-Id: Idc821b6645be6bfd9878cfc777010a123f013f0a
2014-04-05 04:48:21 +00:00
JP Abgrall
8ae345d0c9 Revert "Fix Merge conflict (Add heart rate monitor ...to sensors.h)"
This reverts commit c6854530e1.

Turns out more work in klp-something-something is needed.
So this needs undoing to get the builds fixed.

Change-Id: Ic38e2b312fa48c4489f54fc688fb0f1114c13d4a
2014-04-05 04:47:55 +00:00
Etienne Le Grand
dbf0045d47 Merge "Revert "Remove offset checks for reserved fields in sensor_t and sensors_event_t."" 2014-04-05 04:47:01 +00:00
Etienne Le Grand
ea676f9ae6 Revert "Remove offset checks for reserved fields in sensor_t and sensors_event_t."
This reverts commit 4db220ec85.

Change-Id: I61feb99c2024889e29e2b300ad4a4f5af1fdc282
2014-04-05 04:46:55 +00:00
JP Abgrall
c6854530e1 Fix Merge conflict (Add heart rate monitor ...to sensors.h)
Change-Id: I376e4dbb13d64f4987d4a8be82afddb625eefa54

Conflicts:
	include/hardware/sensors.h
2014-04-04 20:51:05 -07:00
Etienne Le Grand
66fad0e3e7 am 61c78d98: Merge "Add heart rate monitor, stringType and requiredPermissions to sensors.h" into klp-modular-dev
* commit '61c78d9804625ea2ec56c855602682aaa7dd5a75':
  Add heart rate monitor, stringType and requiredPermissions to sensors.h
2014-04-05 01:48:40 +00:00
Aravind Akella
ed39dc7f5e Merge "Remove offset checks for reserved fields in sensor_t and sensors_event_t." 2014-04-05 01:44:23 +00:00
Etienne Le Grand
61c78d9804 Merge "Add heart rate monitor, stringType and requiredPermissions to sensors.h" into klp-modular-dev 2014-04-05 01:44:19 +00:00
Aravind Akella
4db220ec85 Remove offset checks for reserved fields in sensor_t and sensors_event_t.
Change-Id: I3dcc4b4204932a73503ede45b188142b03dcdd31
2014-04-04 18:26:34 -07:00
Etienne Le Grand
0b8ec4f71f Add heart rate monitor, stringType and requiredPermissions to sensors.h
Change-Id: I376e4dbb13d64f4987d4a8be82afddb625eefa54
2014-04-03 12:50:11 -07:00
Paul McLean
f1436231cd Merge "Initial implementation of usb audio I/O" 2014-04-01 16:14:31 +00:00
Paul McLean
eedc92ea4d Initial implementation of usb audio I/O
Change-Id: Ib82783f0b25887e2d34a24fde346cee5003d5b89
2014-03-31 16:30:16 -07:00
Zhihai Xu
876a50f74a am ec580a3f: am 925855b5: Merge "LE: Add API to configure MTU for a given connection (1/4)" into klp-modular-dev
* commit 'ec580a3fd3cc9bc73099111b6afe7234e96b8a95':
  LE: Add API to configure MTU for a given connection (1/4)
2014-03-31 21:32:05 +00:00
Zhihai Xu
ec580a3fd3 am 925855b5: Merge "LE: Add API to configure MTU for a given connection (1/4)" into klp-modular-dev
* commit '925855b5de013cb709fb2d88d840f9c6e71cdcf6':
  LE: Add API to configure MTU for a given connection (1/4)
2014-03-31 21:25:03 +00:00
Zhihai Xu
925855b5de Merge "LE: Add API to configure MTU for a given connection (1/4)" into klp-modular-dev 2014-03-31 21:21:17 +00:00
Ruben Brunk
aab88308f7 Merge "hal3: Update documentation regarding hardware block operating modes." 2014-03-31 17:10:25 +00:00
Jinsuk Kim
19c91b63ed am b9254286: am 3bc29d3e: Merge "Added message_abort and operand enums" into klp-modular-dev
* commit 'b9254286c980c6cd2bb3817d87f4695a96feefcc':
  Added message_abort and operand enums
2014-03-31 01:50:58 +00:00