Commit graph

2402 commits

Author SHA1 Message Date
Aravind Akella
730c0797e5 am 077d3542: Merge "Define a flag for whether a sensor supports data_injection mode or not." into mnc-dev
* commit '077d354252f66c5b9b7353e9b0be5758bea997c6':
  Define a flag for whether a sensor supports data_injection mode or not.
2015-06-23 22:49:52 +00:00
Aravind Akella
077d354252 Merge "Define a flag for whether a sensor supports data_injection mode or not." into mnc-dev 2015-06-23 22:24:38 +00:00
Eric Laurent
99741914d1 am d6f50b4a: Merge "audio HAL: reverse mutex locking order" into mnc-dev
* commit 'd6f50b4a46a706b59cfee9e2e72b5c9bedc6eba1':
  audio HAL: reverse mutex locking order
2015-06-23 03:20:30 +00:00
Aravind Akella
c7f54134ca Define a flag for whether a sensor supports data_injection mode or not.
Change-Id: I46373bbd2e10859b84428fe32b76679ac4292607
2015-06-22 18:26:54 -07:00
Eric Laurent
d6f50b4a46 Merge "audio HAL: reverse mutex locking order" into mnc-dev 2015-06-23 00:52:19 +00:00
Eric Laurent
703180998f audio HAL: reverse mutex locking order
Do not use main audio HAL mutex but a specific stream mutex when
preventing control thread starvation by playback or capture threads.
This will prevent systematic locking of main HAL mutex in read ot write
and avoid glitches.

Bug: 21880828.
Bug: 18489202.

Change-Id: I3054e0d93b823bd9d2fb84a49e9c5bbbe728262a
2015-06-19 17:50:00 -07:00
Shawn Willden
bdea0d2bc3 am 396d6cbc: Add new error codes for rate-limit and max-use failures.
* commit '396d6cbce987deac076ac1a636d3f7282ec9338d':
  Add new error codes for rate-limit and max-use failures.
2015-06-19 16:15:26 +00:00
Shawn Willden
d2584ca4e4 am 7ac0c0f5: Update comments on now-unsed user ID and app ID tags.
* commit '7ac0c0f5ad1a7f5cc317b8f8d356edbb7f02ed24':
  Update comments on now-unsed user ID and app ID tags.
2015-06-19 13:58:58 +00:00
Shawn Willden
ddbf941aad am da89dde9: Remove KM_TAG_AEAD_TAG.
* commit 'da89dde9787dfbd8c053119ab52d9e671106b18e':
  Remove KM_TAG_AEAD_TAG.
2015-06-19 13:58:58 +00:00
Shawn Willden
396d6cbce9 Add new error codes for rate-limit and max-use failures.
Bug: 21607106
Change-Id: I2e5515efe51b84200ade8c4c4cc5db3800d4b658
2015-06-18 21:20:47 -06:00
Shawn Willden
7ac0c0f5ad Update comments on now-unsed user ID and app ID tags.
I'd just remove them but Trusty keymaster has been generating keys with
KM_TAG_ALL_USERS and KM_TAG_ALL_APPLICATIONS, so removing them without
breaking those keys is tricky.  Plus I think they may come back.

Bug: 21845167
Change-Id: I3b807e3e4bee64eba72b7fa6f1ee1929c4ca9dd0
2015-06-18 12:20:32 -06:00
Shawn Willden
da89dde978 Remove KM_TAG_AEAD_TAG.
Bug: 19919114
Change-Id: I06fdd0f9b8e247587d800031d3367078423baa50
2015-06-18 12:19:03 -06:00
Shawn Willden
678482075e am b138a64c: Merge "Remove KM_TAG_CHUNK_LENGTH and add KM_TAG_AEAD_TAG"
* commit 'b138a64cba78fad036b0f099668a2623c9ec5c18':
  Remove KM_TAG_CHUNK_LENGTH and add KM_TAG_AEAD_TAG
2015-06-13 01:55:40 +00:00
Shawn Willden
df977f0624 am c590cf31: Merge "Add output params to update() and finish()."
* commit 'c590cf313ce8d274bee2c49d09e62176a275e205':
  Add output params to update() and finish().
2015-06-13 01:55:39 +00:00
Shawn Willden
7665d1b610 am ed5a71fe: Merge "Fix block mode numbering (CTR got added as 4 rather than 3)"
* commit 'ed5a71fe7ae2fe3e2ce78505e54d81786d35434b':
  Fix block mode numbering (CTR got added as 4 rather than 3)
2015-06-13 01:55:39 +00:00
Eino-Ville Talvala
1c218f6ec4 am 8e350b1a: Merge "Camera3: Document behavior of flush() corner cases." into mnc-dev
* commit '8e350b1a1d148ebf85e2c246e9f491fcdee51bdf':
  Camera3: Document behavior of flush() corner cases.
2015-06-12 23:07:34 +00:00
Andy Hung
117de6c702 am 8ae532dc: Merge "Update USB channel mask handling" into mnc-dev
* commit '8ae532dc48caa4375997f30b70fc85b461f05bef':
  Update USB channel mask handling
2015-06-12 22:49:19 +00:00
Eino-Ville Talvala
8e350b1a1d Merge "Camera3: Document behavior of flush() corner cases." into mnc-dev 2015-06-12 22:47:38 +00:00
Andy Hung
8ae532dc48 Merge "Update USB channel mask handling" into mnc-dev 2015-06-12 22:24:26 +00:00
Shawn Willden
b138a64cba Merge "Remove KM_TAG_CHUNK_LENGTH and add KM_TAG_AEAD_TAG" 2015-06-12 19:28:31 +00:00
Shawn Willden
c590cf313c Merge "Add output params to update() and finish()." 2015-06-12 19:26:28 +00:00
Shawn Willden
ed5a71fe7a Merge "Fix block mode numbering (CTR got added as 4 rather than 3)" 2015-06-12 19:25:21 +00:00
Dan Albert
b1988842df am 5e901ed4: Merge "Use abort() instead of a null dereference."
* commit '5e901ed49faed3465c9df8e6cf6c684249bb3c8c':
  Use abort() instead of a null dereference.
2015-06-11 20:05:53 +00:00
Dan Albert
5e901ed49f Merge "Use abort() instead of a null dereference." 2015-06-11 19:41:44 +00:00
Dan Albert
5b57857c7f Use abort() instead of a null dereference.
Clang deletes these because they're invalid. It's pretty awful of
clang to do this, but this should be abort() anyway.

Change-Id: I89423ff2c4d08db82077e56b726549e3783d38e1
2015-06-11 11:04:52 -07:00
Shawn Willden
a39ce12db8 Remove KM_TAG_CHUNK_LENGTH and add KM_TAG_AEAD_TAG
Bug: 19919114
Change-Id: I384f3d2fee2f68279c6518d9ac0a79e29bed0e52
2015-06-11 09:10:50 -06:00
Shawn Willden
75a885f500 Add output params to update() and finish().
Also, change signatures of several methods to pass structs rather than
array pointers and lengths.

Change-Id: Iaa1be186ebbd444202c47926ab57ac65d57416d7
2015-06-11 09:10:40 -06:00
Shawn Willden
b50083e235 Fix block mode numbering (CTR got added as 4 rather than 3)
Change-Id: I8c886c67ba081255ef18eb0f99ca1e6003fabb33
2015-06-11 09:10:32 -06:00
Sasha Levitskiy
be94ff37fd am d4331fda: Fingerprint: Avoid passing structures where simple types should suffice.
* commit 'd4331fdae5247bdbac27f1db94cac504ea5afb78':
  Fingerprint: Avoid passing structures where simple types should suffice.
2015-06-10 23:17:06 +00:00
Andy Hung
5e58a30b6f Update USB channel mask handling
1 and 2 channels will default to mono and stereo
n > 2 will default to channel index masks

Bug: 16245854
Change-Id: I39f9d43385a93f48e323653fbde2e38a99b6256f
2015-06-10 15:18:56 -07:00
Andre Eisenbach
bc685a6758 am 5dc18299: Merge "LE low power scan feature"
* commit '5dc18299df564fd2b8f35cead043dd1ae52e1397':
  LE low power scan feature
2015-06-10 22:16:54 +00:00
Eino-Ville Talvala
85fdb3ff7d Camera3: Document behavior of flush() corner cases.
Document how HAL should operate when process_capture_request is
called while a flush() call is active.

Bug: 21506384
Change-Id: Ic1842add68123432e49914e83d8f7d5c13d6650d
2015-06-10 14:58:32 -07:00
Andre Eisenbach
9a96fe506f am c9352622: Merge "Bluetooth native dumpsys logging support (1/5)"
* commit 'c93526225f351035c597d6278c2deb3ac32735a2':
  Bluetooth native dumpsys logging support (1/5)
2015-06-10 21:12:37 +00:00
Sasha Levitskiy
d4331fdae5 Fingerprint: Avoid passing structures where simple types should suffice.
Bug: 21282699

Change-Id: I02e13b7da0ad361a95b981f9745aac039151f356
Signed-off-by: Sasha Levitskiy <sanek@google.com>
2015-06-10 14:10:47 -07:00
Andre Eisenbach
5dc18299df Merge "LE low power scan feature" 2015-06-10 20:46:59 +00:00
Satya Calloji
47565882c7 LE low power scan feature
LE low power extended scan feature header changes
based on Google spec v0.95

Bug: 20029342
Change-Id: Id1020a4da177d0bc421fdd123c5355a291cc0475
2015-06-10 20:46:51 +00:00
Andre Eisenbach
c93526225f Merge "Bluetooth native dumpsys logging support (1/5)" 2015-06-10 20:19:25 +00:00
Eino-Ville Talvala
966fbc673a am 17b8cee9: Merge "Camera2 tests: Update for framework changes" into mnc-dev
* commit '17b8cee9a2df698448381d1b03cec2b618c27e97':
  Camera2 tests: Update for framework changes
2015-06-09 22:55:09 +00:00
Eino-Ville Talvala
17b8cee9a2 Merge "Camera2 tests: Update for framework changes" into mnc-dev 2015-06-09 22:24:27 +00:00
Eino-Ville Talvala
cd6984e762 Camera2 tests: Update for framework changes
Change-Id: I9ac788cfe9a001ef33bdc52a9e8ba0bdcf3ded2c
2015-06-09 15:23:34 -07:00
Casper Bonde
6dd42b5e6b am 5ccdc518: SAP: Make it possible to enforce a 16-digit pin code (2/5)
* commit '5ccdc518ab33153625536ad31e7c9466511072ab':
  SAP: Make it possible to enforce a 16-digit pin code (2/5)
2015-06-09 22:09:36 +00:00
Casper Bonde
5ccdc518ab SAP: Make it possible to enforce a 16-digit pin code (2/5)
This change enable the posibility to enforce using a
16-digit pin or MITM for a RFCOMM or L2CAP connection.

This is needed for the SIM access profile.

Change-Id: I4d43eefa76e8abc1bcfad6dfd9004d8e82168bf4
Signed-off-by: Casper Bonde <c.bonde@samsung.com>
2015-06-09 13:57:53 -07:00
Sasha Levitskiy
e7a11e2dd2 am a70ab95e: Fingerprint: Remove unused API elements.
* commit 'a70ab95eeaf61594594a57e4de957dac47889c96':
  Fingerprint: Remove unused API elements.
2015-06-09 13:01:18 +00:00
Sasha Levitskiy
a70ab95eea Fingerprint: Remove unused API elements.
Change-Id: Iba2f6a5bc7a2923c3e9b92684a2fab2190f14fd5
Signed-off-by: Sasha Levitskiy <sanek@google.com>
2015-06-08 14:00:39 -07:00
Andre Eisenbach
9a83650cef Bluetooth native dumpsys logging support (1/5)
Bug: 18508263
Change-Id: Id7b69a6ed7d817a0f048cb8ebf0889c600171926
2015-06-08 00:07:51 -07:00
Chien-Yu Chen
14531c7909 am c8812261: Merge "Camera: Update for torch callbacks" into mnc-dev
* commit 'c88122614c1593bc9384564b10f11bd7bb7e3b64':
  Camera: Update for torch callbacks
2015-06-03 21:30:06 +00:00
Chien-Yu Chen
c88122614c Merge "Camera: Update for torch callbacks" into mnc-dev 2015-06-03 21:02:00 +00:00
Chien-Yu Chen
5c6230ebf6 Camera: Update for torch callbacks
Clarify that HAL shouldn't send AVAILABLE_OFF in addition to
NOT_AVAILABLE when open() is called.

Update the comments to use the right torch status enums.

Bug: 21475390
Change-Id: If9adf4bd169048fc9760ef504d3a36414cfbb196
2015-06-03 13:59:39 -07:00
Dan Stoza
e3f11466b4 am 5e6082fd: Merge "gralloc: Sort usage flags"
* commit '5e6082fd5611771ff9ff2911ed5cdca5d71f06b1':
  gralloc: Sort usage flags
2015-06-03 19:14:54 +00:00
Dan Stoza
5e2442369a am f456512f: Merge "libhardware: fix gralloc usage bit redefine"
* commit 'f456512f9e54c534378683d0cd8f288b6312be2b':
  libhardware: fix gralloc usage bit redefine
2015-06-03 19:14:53 +00:00