summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-08-08merge in mnc-release history after reset to mnc-devandroid-cts-6.0_r9android-cts-6.0_r8android-cts-6.0_r7android-cts-6.0_r6android-cts-6.0_r5android-cts-6.0_r4android-cts-6.0_r32android-cts-6.0_r31android-cts-6.0_r30android-cts-6.0_r3android-cts-6.0_r29android-cts-6.0_r28android-cts-6.0_r27android-cts-6.0_r26android-cts-6.0_r25android-cts-6.0_r24android-cts-6.0_r23android-cts-6.0_r22android-cts-6.0_r21android-cts-6.0_r20android-cts-6.0_r2android-cts-6.0_r19android-cts-6.0_r18android-cts-6.0_r17android-cts-6.0_r16android-cts-6.0_r15android-cts-6.0_r14android-cts-6.0_r13android-cts-6.0_r12android-cts-6.0_r1android-6.0.0_r7android-6.0.0_r6android-6.0.0_r5android-6.0.0_r4android-6.0.0_r3android-6.0.0_r2android-6.0.0_r1marshmallow-releasemarshmallow-cts-releaseThe Android Automerger
2015-08-07Merge "Add USB out_get_presentation_position() for timestamps" into mnc-devmarshmallow-devGlenn Kasten
2015-08-06Add USB out_get_presentation_position() for timestampsAndy Hung
Bug: 21196672 Change-Id: Ic509e91a9c0d3421b78371207d7e63425e895e71
2015-08-06merge in mnc-release history after reset to mnc-devThe Android Automerger
2015-08-04Implement Bluetooth settings factory reset (4/5)Ajay Panicker
Implemented the factory reset function to be used to reset all bluetooth settings on device to factory default Bug: 16161518 Change-Id: I69358db95582ddd0f2f640f76cf0931f797d369b
2015-07-29merge in mnc-release history after reset to mnc-devThe Android Automerger
2015-07-28Add better documentation to fingerprint.hJim Miller
Some vendors are confused by the use of errors vs acquired messages This adds documentation on how they should be used. Fixes bug 22728578 Change-Id: I5e6a8f7b159ec331a59202fa64b7320e43661429
2015-07-28merge in mnc-release history after reset to mnc-devThe Android Automerger
2015-07-23Correct keymaster1 documentation.Shawn Willden
Bug: 22291207 Change-Id: I130d2ab2110321dc2228d41a154750da3a3f0b75
2015-07-23merge in mnc-release history after reset to mnc-devThe Android Automerger
2015-07-22Merge "Add KM_TAG_MIN_MAC_LENGTH." into mnc-devAlex Klyubin
2015-07-15Add KM_TAG_MIN_MAC_LENGTH.Shawn Willden
This allows the binding of minimum length for MACs or tags to HMAC keys and AEAD symmetric keys. Later attempts to use these keys with a shorter MAC or tag specification (provided to begin() with KM_TAG_MAC_LENGTH) will fail with KM_ERROR_INVALID_MAC_LENGTH. Bug: 22337277 Change-Id: Ic5292ce01bdd6ecde25aad115e4b407aadc85f23
2015-07-13merge in mnc-release history after reset to mnc-devThe Android Automerger
2015-07-11Merge "Camera2 tests: Fix incorrect error code check" into mnc-devEino-Ville Talvala
2015-07-10Camera2 tests: Fix incorrect error code checkEino-Ville Talvala
Bug: 22410279 Change-Id: Iad74e90d148908aafd39878608c10fe03c689b8a
2015-07-10Remove out-of-date camera2 native tests.Ruben Brunk
Bug: 22410279 Change-Id: Ib4a39306115e05b8e430bdc8456ad940b3426a8e
2015-07-01merge in mnc-release history after reset to mnc-devThe Android Automerger
2015-06-26Fingerprint: Add post_enroll() API, adapt struct for binary compatibility, ↵Sasha Levitskiy
doc change. Change-Id: If7e5738f921b0e91e46efc813d9f3c4bd1502832 Signed-off-by: Sasha Levitskiy <sanek@google.com>
2015-06-25merge in mnc-release history after reset to mnc-devThe Android Automerger
2015-06-24Merge "Revert "Revert "Rename keymaster tag types to clarify that integers ↵Shawn Willden
are unsigned.""" into mnc-dev
2015-06-24Revert "Revert "Rename keymaster tag types to clarify that integers are ↵Shawn Willden
unsigned."" This reverts commit 1fb6c227deb04b66dc0fe947a7ebb027dde0ecda. Change-Id: Iccc8a7ff40a694b1e4420a5de4b847e62289ff42
2015-06-24Merge "Revert "Rename keymaster tag types to clarify that integers are ↵Shawn Willden
unsigned."" into mnc-dev
2015-06-24Revert "Rename keymaster tag types to clarify that integers are unsigned."Shawn Willden
This reverts commit 335920edaec77b77eac09f7966c337cbed93aa17. Change-Id: Ib65f744b93ad2b62d5848dcf743397124a08911b
2015-06-24Merge "Rename keymaster tag types to clarify that integers are unsigned." ↵Shawn Willden
into mnc-dev
2015-06-24Rename keymaster tag types to clarify that integers are unsigned.Shawn Willden
Bug: 22008538 Change-Id: I699a0f03aaf0f9f49a78b310763364fc2fb34c90
2015-06-24Merge "hardware: gatekeeper: Add delete and delete_all api's" into mnc-devAndres Morales
2015-06-24merge in mnc-release history after reset to mnc-devThe Android Automerger
2015-06-23Merge "Define a flag for whether a sensor supports data_injection mode or ↵Aravind Akella
not." into mnc-dev
2015-06-23hardware: gatekeeper: Add delete and delete_all api'sNaveen Ramaraj
Add delete and delete_all api for gatekeeper. Change-Id: I0511cb546ecba54b2a60692d6f704f24c55aa940
2015-06-23merge in mnc-release history after reset to mnc-devThe Android Automerger
2015-06-22Define a flag for whether a sensor supports data_injection mode or not.Aravind Akella
Change-Id: I46373bbd2e10859b84428fe32b76679ac4292607
2015-06-23Merge "audio HAL: reverse mutex locking order" into mnc-devEric Laurent
2015-06-19audio HAL: reverse mutex locking orderEric Laurent
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-18Add new error codes for rate-limit and max-use failures.Shawn Willden
Bug: 21607106 Change-Id: I2e5515efe51b84200ade8c4c4cc5db3800d4b658
2015-06-18Update comments on now-unsed user ID and app ID tags.Shawn Willden
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-18Remove KM_TAG_AEAD_TAG.Shawn Willden
Bug: 19919114 Change-Id: I06fdd0f9b8e247587d800031d3367078423baa50
2015-06-16merge in mnc-release history after reset to mnc-devThe Android Automerger
2015-06-15merge in mnc-release history after reset to mnc-devThe Android Automerger
2015-06-12Merge "Camera3: Document behavior of flush() corner cases." into mnc-devEino-Ville Talvala
2015-06-12Merge "Update USB channel mask handling" into mnc-devAndy Hung
2015-06-10Update USB channel mask handlingAndy Hung
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-10Camera3: Document behavior of flush() corner cases.Eino-Ville Talvala
Document how HAL should operate when process_capture_request is called while a flush() call is active. Bug: 21506384 Change-Id: Ic1842add68123432e49914e83d8f7d5c13d6650d
2015-06-10Fingerprint: Avoid passing structures where simple types should suffice.Sasha Levitskiy
Bug: 21282699 Change-Id: I02e13b7da0ad361a95b981f9745aac039151f356 Signed-off-by: Sasha Levitskiy <sanek@google.com>
2015-06-09Merge "Camera2 tests: Update for framework changes" into mnc-devEino-Ville Talvala
2015-06-09Camera2 tests: Update for framework changesEino-Ville Talvala
Change-Id: I9ac788cfe9a001ef33bdc52a9e8ba0bdcf3ded2c
2015-06-09SAP: Make it possible to enforce a 16-digit pin code (2/5)Casper Bonde
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-08Fingerprint: Remove unused API elements.Sasha Levitskiy
Change-Id: Iba2f6a5bc7a2923c3e9b92684a2fab2190f14fd5 Signed-off-by: Sasha Levitskiy <sanek@google.com>
2015-06-03Merge "Camera: Update for torch callbacks" into mnc-devChien-Yu Chen
2015-06-03Camera: Update for torch callbacksChien-Yu Chen
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-03gralloc: Sort usage flagsDan Stoza
Sorts the usage flags in increasing order so it's easier to see where the gaps are. Bug: 21609491 Change-Id: I98af3c67be84c6c5137767f3cd7a8bd63dfb5c03
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-05 03:01:48 +0000