OSDN Git Service
Nick Vaccaro [Tue, 4 Aug 2015 19:17:00 +0000 (19:17 +0000)]
am
993779c3: am
3f93d2a9: Merge "libhardware: sensors: update multi hal to support 64bit builds"
* commit '
993779c3c46016e561a797e13d2560cc6320e6e8':
libhardware: sensors: update multi hal to support 64bit builds
Nick Vaccaro [Tue, 4 Aug 2015 19:09:33 +0000 (19:09 +0000)]
am
3f93d2a9: Merge "libhardware: sensors: update multi hal to support 64bit builds"
* commit '
3f93d2a9705df0c4c341ac3e75b3751da82c98c6':
libhardware: sensors: update multi hal to support 64bit builds
Nick Vaccaro [Tue, 4 Aug 2015 18:58:04 +0000 (18:58 +0000)]
Merge "libhardware: sensors: update multi hal to support 64bit builds"
Jim Miller [Tue, 28 Jul 2015 23:45:23 +0000 (23:45 +0000)]
am
7da2c5fe: am
3fabfd8e: am
929e0a19: Add better documentation to fingerprint.h
* commit '
7da2c5fe2a17ad2216a5c6d18561e3932bc741f9':
Add better documentation to fingerprint.h
Jim Miller [Tue, 28 Jul 2015 23:20:06 +0000 (23:20 +0000)]
am
3fabfd8e: am
929e0a19: Add better documentation to fingerprint.h
* commit '
3fabfd8e4c3a66529846e21bc926f01019b6f769':
Add better documentation to fingerprint.h
Jim Miller [Tue, 28 Jul 2015 22:41:05 +0000 (22:41 +0000)]
am
929e0a19: Add better documentation to fingerprint.h
* commit '
929e0a194ed989af9b9de62126a962ebf9d191cc':
Add better documentation to fingerprint.h
Jim Miller [Sat, 25 Jul 2015 01:25:40 +0000 (18:25 -0700)]
Add better documentation to fingerprint.h
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
Tim Kilbourn [Tue, 28 Jul 2015 21:49:23 +0000 (21:49 +0000)]
Merge "MouseInputMapper"
Tim Kilbourn [Wed, 20 May 2015 00:15:52 +0000 (17:15 -0700)]
MouseInputMapper
Maps relative movements of a mouse or scroll wheel and mouse button
presses. All other logic from CursorInputMapper will be handled in the
host.
Change-Id: I00a966a6194d4810b7b6ac5cc815287ecf7dfb84
Shawn Willden [Mon, 27 Jul 2015 21:34:45 +0000 (21:34 +0000)]
am
25bff5c7: am
afac8dd6: am
70335f3d: Correct keymaster1 documentation.
* commit '
25bff5c76efcac69b2773ff48392a9626149838f':
Correct keymaster1 documentation.
Shawn Willden [Mon, 27 Jul 2015 21:18:07 +0000 (21:18 +0000)]
am
afac8dd6: am
70335f3d: Correct keymaster1 documentation.
* commit '
afac8dd61e6f0554f24b6d4375b8eb426ea08884':
Correct keymaster1 documentation.
Shawn Willden [Mon, 27 Jul 2015 20:51:19 +0000 (20:51 +0000)]
am
70335f3d: Correct keymaster1 documentation.
* commit '
70335f3d30cf32a6f0352b75430aa6474821399d':
Correct keymaster1 documentation.
Ching Tzung Lin [Thu, 23 Jul 2015 23:39:58 +0000 (23:39 +0000)]
am
be103ec8: am
d4884e2f: Merge "Fix compilation error on emerald-dev" into cw-e-dev
* commit '
be103ec8c72908ba5bb2a76806f03a825878e353':
Fix compilation error on emerald-dev
Ching Tzung Lin [Thu, 23 Jul 2015 23:24:44 +0000 (23:24 +0000)]
am
d4884e2f: Merge "Fix compilation error on emerald-dev" into cw-e-dev
* commit '
d4884e2f3c138a7cc881bb1fb34b672a1c9db595':
Fix compilation error on emerald-dev
Ching Tzung Lin [Thu, 23 Jul 2015 22:57:03 +0000 (22:57 +0000)]
Merge "Fix compilation error on emerald-dev" into cw-e-dev
Alex Klyubin [Thu, 23 Jul 2015 20:26:59 +0000 (20:26 +0000)]
am
a6ab9737: am
f9df59a7: Merge "Add KM_TAG_MIN_MAC_LENGTH." into mnc-dev
* commit '
a6ab97371cdf0361c7ec4c799841e4b8e3eb50cd':
Add KM_TAG_MIN_MAC_LENGTH.
Alex Klyubin [Thu, 23 Jul 2015 20:10:17 +0000 (20:10 +0000)]
am
f9df59a7: Merge "Add KM_TAG_MIN_MAC_LENGTH." into mnc-dev
* commit '
f9df59a7ff292b536a557280cb8b2fc93eedabd0':
Add KM_TAG_MIN_MAC_LENGTH.
Shawn Willden [Wed, 8 Jul 2015 15:57:16 +0000 (09:57 -0600)]
Correct keymaster1 documentation.
Bug:
22291207
Change-Id: I130d2ab2110321dc2228d41a154750da3a3f0b75
Ching Tzung Lin [Thu, 23 Jul 2015 17:18:06 +0000 (10:18 -0700)]
Fix compilation error on emerald-dev
Change-Id: I324fb9b1b54e31610fe4fdce8edbb6979e666cbb
Alex Klyubin [Wed, 22 Jul 2015 15:24:28 +0000 (15:24 +0000)]
Merge "Add KM_TAG_MIN_MAC_LENGTH." into mnc-dev
Shawn Willden [Wed, 8 Jul 2015 12:04:52 +0000 (06:04 -0600)]
Add KM_TAG_MIN_MAC_LENGTH.
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
Eino-Ville Talvala [Tue, 14 Jul 2015 15:17:10 +0000 (15:17 +0000)]
am
79797687: am
d95a340b: Merge "Camera2 tests: Fix incorrect error code check" into mnc-dev
* commit '
797976876f6afde0a3a114c1b8a12f26b4ebd666':
Camera2 tests: Fix incorrect error code check
Ruben Brunk [Tue, 14 Jul 2015 15:17:09 +0000 (15:17 +0000)]
am
fa843087: am
49f58811: Remove out-of-date camera2 native tests.
* commit '
fa8430875ced1b31396cdea392b85cd33c1fee6c':
Remove out-of-date camera2 native tests.
Eino-Ville Talvala [Tue, 14 Jul 2015 15:06:53 +0000 (15:06 +0000)]
am
d95a340b: Merge "Camera2 tests: Fix incorrect error code check" into mnc-dev
* commit '
d95a340b9f74b38703e78b3e2e8bc43f49c3ebf8':
Camera2 tests: Fix incorrect error code check
Ruben Brunk [Tue, 14 Jul 2015 15:06:52 +0000 (15:06 +0000)]
am
49f58811: Remove out-of-date camera2 native tests.
* commit '
49f58811ea29ff8bed5e307d8018ead075731881':
Remove out-of-date camera2 native tests.
Eino-Ville Talvala [Sat, 11 Jul 2015 00:32:25 +0000 (00:32 +0000)]
Merge "Camera2 tests: Fix incorrect error code check" into mnc-dev
Eino-Ville Talvala [Fri, 10 Jul 2015 22:04:24 +0000 (15:04 -0700)]
Camera2 tests: Fix incorrect error code check
Bug:
22410279
Change-Id: Iad74e90d148908aafd39878608c10fe03c689b8a
Ruben Brunk [Fri, 10 Jul 2015 21:45:56 +0000 (14:45 -0700)]
Remove out-of-date camera2 native tests.
Bug:
22410279
Change-Id: Ib4a39306115e05b8e430bdc8456ad940b3426a8e
Shawn Willden [Fri, 10 Jul 2015 12:24:24 +0000 (12:24 +0000)]
am
8ec92022: am
0a76e80b: Merge "Fix extern "C" guards."
* commit '
8ec920226e0c8f393e2c81389bdca8ed2c4282fd':
Fix extern "C" guards.
Shawn Willden [Fri, 10 Jul 2015 12:11:02 +0000 (12:11 +0000)]
am
0a76e80b: Merge "Fix extern "C" guards."
* commit '
0a76e80be826cf7928ab554c303d4f9591b59b27':
Fix extern "C" guards.
Shawn Willden [Fri, 10 Jul 2015 11:47:05 +0000 (11:47 +0000)]
Merge "Fix extern "C" guards."
Satya Durga Srinivasu Prabhala [Wed, 21 Jan 2015 02:53:35 +0000 (18:53 -0800)]
libhardware: sensors: update multi hal to support 64bit builds
To get multi hal working on both 32 & 64 bit targets,
removing hardcoded paths & checks in multi HAL.
Sensor HAL libs must be installed path that is available through
LD_LIBRARY_PATH.
/system/lib & /system/vendor/lib for 32-bit targets.
/system/lib64 & /system/vendor/lib64 for 64-bit targets.
Change-Id: Ib1c1f25f08855c4584d53cc04fbe82a3a768b180
Shawn Willden [Wed, 8 Jul 2015 15:40:54 +0000 (09:40 -0600)]
Fix extern "C" guards.
Cherry-pick from internal.
Change-Id: I11ed50352865a099c3040a1558a48960ae7db416
Sasha Levitskiy [Wed, 1 Jul 2015 00:18:53 +0000 (00:18 +0000)]
am
669288c5: am
a36ffbe0: Fingerprint: Add post_enroll() API, adapt struct for binary compatibility, doc change.
* commit '
669288c53b0e38a135670827720745d3707a93e6':
Fingerprint: Add post_enroll() API, adapt struct for binary compatibility, doc change.
Sasha Levitskiy [Wed, 1 Jul 2015 00:06:11 +0000 (00:06 +0000)]
am
a36ffbe0: Fingerprint: Add post_enroll() API, adapt struct for binary compatibility, doc change.
* commit '
a36ffbe0bbccbc2173589da1941dd39ee01a8004':
Fingerprint: Add post_enroll() API, adapt struct for binary compatibility, doc change.
Sasha Levitskiy [Wed, 24 Jun 2015 23:32:43 +0000 (16:32 -0700)]
Fingerprint: Add post_enroll() API, adapt struct for binary compatibility, doc change.
Change-Id: If7e5738f921b0e91e46efc813d9f3c4bd1502832
Signed-off-by: Sasha Levitskiy <sanek@google.com>
Shawn Willden [Thu, 25 Jun 2015 05:51:14 +0000 (05:51 +0000)]
am
60e658b7: am
bf31aab2: Merge "Rename keymaster tag types to clarify that integers are unsigned."
* commit '
60e658b7f697f518b7463ad739e44814c5b91993':
Rename keymaster tag types to clarify that integers are unsigned.
Shawn Willden [Thu, 25 Jun 2015 05:43:04 +0000 (05:43 +0000)]
am
bf31aab2: Merge "Rename keymaster tag types to clarify that integers are unsigned."
* commit '
bf31aab2c8c2644e8f4d5baedaf2798c9760a0b7':
Rename keymaster tag types to clarify that integers are unsigned.
Shawn Willden [Thu, 25 Jun 2015 05:14:00 +0000 (05:14 +0000)]
am
0730e1e0: am
c24b5621: (-s ours) Merge changes I2e5515ef,I3b807e3e
* commit '
0730e1e0ab71f02816710ffed8ea5e4500d883cc':
Add new error codes for rate-limit and max-use failures.
Update comments on now-unsed user ID and app ID tags.
Shawn Willden [Thu, 25 Jun 2015 05:13:59 +0000 (05:13 +0000)]
am
75d0f806: am
3058325d: (-s ours) Merge "Remove KM_TAG_AEAD_TAG."
* commit '
75d0f8063f641c7722579a6a899361b31d6e0787':
Remove KM_TAG_AEAD_TAG.
Shawn Willden [Thu, 25 Jun 2015 04:37:53 +0000 (04:37 +0000)]
Merge "Rename keymaster tag types to clarify that integers are unsigned."
Shawn Willden [Wed, 24 Jun 2015 19:27:45 +0000 (12:27 -0700)]
Rename keymaster tag types to clarify that integers are unsigned.
Bug:
22008538
Change-Id: I699a0f03aaf0f9f49a78b310763364fc2fb34c90
Shawn Willden [Thu, 25 Jun 2015 04:27:28 +0000 (04:27 +0000)]
am
c24b5621: (-s ours) Merge changes I2e5515ef,I3b807e3e
* commit '
c24b5621c405d0151959ee1e1440c3b58e7f6b3f':
Add new error codes for rate-limit and max-use failures.
Update comments on now-unsed user ID and app ID tags.
Shawn Willden [Thu, 25 Jun 2015 04:20:25 +0000 (04:20 +0000)]
am
3058325d: (-s ours) Merge "Remove KM_TAG_AEAD_TAG."
* commit '
3058325de9557ae1eeb71b2ff765f6dc8c867086':
Remove KM_TAG_AEAD_TAG.
Shawn Willden [Thu, 25 Jun 2015 03:34:21 +0000 (03:34 +0000)]
Merge changes I2e5515ef,I3b807e3e
* changes:
Add new error codes for rate-limit and max-use failures.
Update comments on now-unsed user ID and app ID tags.
Shawn Willden [Thu, 25 Jun 2015 03:31:08 +0000 (03:31 +0000)]
Merge "Remove KM_TAG_AEAD_TAG."
Shawn Willden [Thu, 18 Jun 2015 18:16:17 +0000 (12:16 -0600)]
Add new error codes for rate-limit and max-use failures.
Bug:
21607106
Change-Id: I2e5515efe51b84200ade8c4c4cc5db3800d4b658
Shawn Willden [Thu, 18 Jun 2015 18:15:09 +0000 (12:15 -0600)]
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
Shawn Willden [Thu, 18 Jun 2015 18:09:20 +0000 (12:09 -0600)]
Remove KM_TAG_AEAD_TAG.
Bug:
19919114
Change-Id: I06fdd0f9b8e247587d800031d3367078423baa50
Shawn Willden [Thu, 25 Jun 2015 00:32:09 +0000 (00:32 +0000)]
am
de2c43f8: am
12fff70f: Merge "Revert "Revert "Rename keymaster tag types to clarify that integers are unsigned.""" into mnc-dev
* commit '
de2c43f8847849fc044c92b24f5f4b48391604d5':
Revert "Revert "Rename keymaster tag types to clarify that integers are unsigned.""
Shawn Willden [Wed, 24 Jun 2015 23:10:03 +0000 (23:10 +0000)]
am
12fff70f: Merge "Revert "Revert "Rename keymaster tag types to clarify that integers are unsigned.""" into mnc-dev
* commit '
12fff70fbdfe9293072fa5061e148bf136d765ca':
Revert "Revert "Rename keymaster tag types to clarify that integers are unsigned.""
Shawn Willden [Wed, 24 Jun 2015 22:43:55 +0000 (22:43 +0000)]
Merge "Revert "Revert "Rename keymaster tag types to clarify that integers are unsigned.""" into mnc-dev
Shawn Willden [Wed, 24 Jun 2015 21:31:48 +0000 (21:31 +0000)]
am
f75c57a8: am
f9232031: Merge "Revert "Rename keymaster tag types to clarify that integers are unsigned."" into mnc-dev
* commit '
f75c57a808a70228c7fe8a3bff2f790c9ec2b9f1':
Revert "Rename keymaster tag types to clarify that integers are unsigned."
Shawn Willden [Wed, 24 Jun 2015 21:16:19 +0000 (21:16 +0000)]
am
f9232031: Merge "Revert "Rename keymaster tag types to clarify that integers are unsigned."" into mnc-dev
* commit '
f9232031b2b7763d10569602c6de65cf525a8ee2':
Revert "Rename keymaster tag types to clarify that integers are unsigned."
Shawn Willden [Wed, 24 Jun 2015 21:08:22 +0000 (21:08 +0000)]
am
14fe770e: am
6563afa4: Merge "Rename keymaster tag types to clarify that integers are unsigned." into mnc-dev
* commit '
14fe770e2b86a186898b19de53a33d2290978987':
Rename keymaster tag types to clarify that integers are unsigned.
Shawn Willden [Wed, 24 Jun 2015 20:59:14 +0000 (20:59 +0000)]
Revert "Revert "Rename keymaster tag types to clarify that integers are unsigned.""
This reverts commit
1fb6c227deb04b66dc0fe947a7ebb027dde0ecda.
Change-Id: Iccc8a7ff40a694b1e4420a5de4b847e62289ff42
Shawn Willden [Wed, 24 Jun 2015 20:55:44 +0000 (20:55 +0000)]
am
6563afa4: Merge "Rename keymaster tag types to clarify that integers are unsigned." into mnc-dev
* commit '
6563afa40b9fbccc278e1e3f84f6164d113300ca':
Rename keymaster tag types to clarify that integers are unsigned.
Shawn Willden [Wed, 24 Jun 2015 20:53:19 +0000 (20:53 +0000)]
Merge "Revert "Rename keymaster tag types to clarify that integers are unsigned."" into mnc-dev
Shawn Willden [Wed, 24 Jun 2015 20:52:32 +0000 (20:52 +0000)]
Revert "Rename keymaster tag types to clarify that integers are unsigned."
This reverts commit
335920edaec77b77eac09f7966c337cbed93aa17.
Change-Id: Ib65f744b93ad2b62d5848dcf743397124a08911b
Shawn Willden [Wed, 24 Jun 2015 20:28:37 +0000 (20:28 +0000)]
Merge "Rename keymaster tag types to clarify that integers are unsigned." into mnc-dev
Shawn Willden [Wed, 24 Jun 2015 19:27:45 +0000 (12:27 -0700)]
Rename keymaster tag types to clarify that integers are unsigned.
Bug:
22008538
Change-Id: I699a0f03aaf0f9f49a78b310763364fc2fb34c90
Andres Morales [Wed, 24 Jun 2015 18:34:02 +0000 (18:34 +0000)]
am
1209f36d: am
f8b5a37e: Merge "hardware: gatekeeper: Add delete and delete_all api\'s" into mnc-dev
* commit '
1209f36dc51ff5933af4b2b4bea43e928153a4d6':
hardware: gatekeeper: Add delete and delete_all api's
Andres Morales [Wed, 24 Jun 2015 18:23:41 +0000 (18:23 +0000)]
am
f8b5a37e: Merge "hardware: gatekeeper: Add delete and delete_all api\'s" into mnc-dev
* commit '
f8b5a37ef96002b61fb4d3be687964319faeddc0':
hardware: gatekeeper: Add delete and delete_all api's
Andres Morales [Wed, 24 Jun 2015 18:06:18 +0000 (18:06 +0000)]
Merge "hardware: gatekeeper: Add delete and delete_all api's" into mnc-dev
Aravind Akella [Tue, 23 Jun 2015 23:18:18 +0000 (23:18 +0000)]
am
730c0797: am
077d3542: Merge "Define a flag for whether a sensor supports data_injection mode or not." into mnc-dev
* commit '
730c0797e5fa8127bd31c4d78a12230cac1d6829':
Define a flag for whether a sensor supports data_injection mode or not.
Aravind Akella [Tue, 23 Jun 2015 22:49:52 +0000 (22:49 +0000)]
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.
Aravind Akella [Tue, 23 Jun 2015 22:24:37 +0000 (22:24 +0000)]
Merge "Define a flag for whether a sensor supports data_injection mode or not." into mnc-dev
Naveen Ramaraj [Tue, 23 Jun 2015 00:47:18 +0000 (17:47 -0700)]
hardware: gatekeeper: Add delete and delete_all api's
Add delete and delete_all api for gatekeeper.
Change-Id: I0511cb546ecba54b2a60692d6f704f24c55aa940
Eric Laurent [Tue, 23 Jun 2015 05:38:08 +0000 (05:38 +0000)]
am
99741914: am
d6f50b4a: Merge "audio HAL: reverse mutex locking order" into mnc-dev
* commit '
99741914d15f38546053b34224dddb5c98c744ea':
audio HAL: reverse mutex locking order
Eric Laurent [Tue, 23 Jun 2015 03:20:30 +0000 (03:20 +0000)]
am
d6f50b4a: Merge "audio HAL: reverse mutex locking order" into mnc-dev
* commit '
d6f50b4a46a706b59cfee9e2e72b5c9bedc6eba1':
audio HAL: reverse mutex locking order
Aravind Akella [Tue, 23 Jun 2015 01:26:54 +0000 (18:26 -0700)]
Define a flag for whether a sensor supports data_injection mode or not.
Change-Id: I46373bbd2e10859b84428fe32b76679ac4292607
Eric Laurent [Tue, 23 Jun 2015 00:52:18 +0000 (00:52 +0000)]
Merge "audio HAL: reverse mutex locking order" into mnc-dev
Eric Laurent [Sat, 20 Jun 2015 00:49:17 +0000 (17:49 -0700)]
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
Shawn Willden [Fri, 19 Jun 2015 16:25:00 +0000 (16:25 +0000)]
am
bdea0d2b: am
396d6cbc: Add new error codes for rate-limit and max-use failures.
* commit '
bdea0d2bc30bd2aca568c1135c8d9862e6a1a1d3':
Add new error codes for rate-limit and max-use failures.
Shawn Willden [Fri, 19 Jun 2015 16:15:26 +0000 (16:15 +0000)]
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.
Shawn Willden [Fri, 19 Jun 2015 14:11:08 +0000 (14:11 +0000)]
am
d2584ca4: am
7ac0c0f5: Update comments on now-unsed user ID and app ID tags.
* commit '
d2584ca4e4effc306ed77fed7fe100c728b11d2d':
Update comments on now-unsed user ID and app ID tags.
Shawn Willden [Fri, 19 Jun 2015 14:11:07 +0000 (14:11 +0000)]
am
ddbf941a: am
da89dde9: Remove KM_TAG_AEAD_TAG.
* commit '
ddbf941aad84209b9413114171cd8bbd5955a139':
Remove KM_TAG_AEAD_TAG.
Shawn Willden [Fri, 19 Jun 2015 13:58:58 +0000 (13:58 +0000)]
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.
Shawn Willden [Fri, 19 Jun 2015 13:58:58 +0000 (13:58 +0000)]
am
da89dde9: Remove KM_TAG_AEAD_TAG.
* commit '
da89dde9787dfbd8c053119ab52d9e671106b18e':
Remove KM_TAG_AEAD_TAG.
Shawn Willden [Thu, 18 Jun 2015 18:16:17 +0000 (12:16 -0600)]
Add new error codes for rate-limit and max-use failures.
Bug:
21607106
Change-Id: I2e5515efe51b84200ade8c4c4cc5db3800d4b658
Shawn Willden [Thu, 18 Jun 2015 18:15:09 +0000 (12:15 -0600)]
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
Shawn Willden [Thu, 18 Jun 2015 18:09:20 +0000 (12:09 -0600)]
Remove KM_TAG_AEAD_TAG.
Bug:
19919114
Change-Id: I06fdd0f9b8e247587d800031d3367078423baa50
Shawn Willden [Sat, 13 Jun 2015 02:02:59 +0000 (02:02 +0000)]
am
67848207: am
b138a64c: Merge "Remove KM_TAG_CHUNK_LENGTH and add KM_TAG_AEAD_TAG"
* commit '
678482075ed1cbec461f6c0a0e822c8a5e73ae73':
Remove KM_TAG_CHUNK_LENGTH and add KM_TAG_AEAD_TAG
Shawn Willden [Sat, 13 Jun 2015 02:02:58 +0000 (02:02 +0000)]
am
df977f06: am
c590cf31: Merge "Add output params to update() and finish()."
* commit '
df977f06249d9cfbba015851f2dbb6b5ed79913c':
Add output params to update() and finish().
Shawn Willden [Sat, 13 Jun 2015 02:02:57 +0000 (02:02 +0000)]
am
7665d1b6: am
ed5a71fe: Merge "Fix block mode numbering (CTR got added as 4 rather than 3)"
* commit '
7665d1b6109dbbb33f27ae1452919ce4beda7f84':
Fix block mode numbering (CTR got added as 4 rather than 3)
Shawn Willden [Sat, 13 Jun 2015 01:55:40 +0000 (01:55 +0000)]
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
Shawn Willden [Sat, 13 Jun 2015 01:55:39 +0000 (01:55 +0000)]
am
c590cf31: Merge "Add output params to update() and finish()."
* commit '
c590cf313ce8d274bee2c49d09e62176a275e205':
Add output params to update() and finish().
Shawn Willden [Sat, 13 Jun 2015 01:55:39 +0000 (01:55 +0000)]
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)
Eino-Ville Talvala [Fri, 12 Jun 2015 23:20:17 +0000 (23:20 +0000)]
am
1c218f6e: am
8e350b1a: Merge "Camera3: Document behavior of flush() corner cases." into mnc-dev
* commit '
1c218f6ec46a7c4ff381ed89edd6d9aa4e93828b':
Camera3: Document behavior of flush() corner cases.
Eino-Ville Talvala [Fri, 12 Jun 2015 23:07:34 +0000 (23:07 +0000)]
am
8e350b1a: Merge "Camera3: Document behavior of flush() corner cases." into mnc-dev
* commit '
8e350b1a1d148ebf85e2c246e9f491fcdee51bdf':
Camera3: Document behavior of flush() corner cases.
Andy Hung [Fri, 12 Jun 2015 23:02:07 +0000 (23:02 +0000)]
am
117de6c7: am
8ae532dc: Merge "Update USB channel mask handling" into mnc-dev
* commit '
117de6c702a08aa3b0c56a501f638b427c816875':
Update USB channel mask handling
Andy Hung [Fri, 12 Jun 2015 22:49:19 +0000 (22:49 +0000)]
am
8ae532dc: Merge "Update USB channel mask handling" into mnc-dev
* commit '
8ae532dc48caa4375997f30b70fc85b461f05bef':
Update USB channel mask handling
Eino-Ville Talvala [Fri, 12 Jun 2015 22:47:38 +0000 (22:47 +0000)]
Merge "Camera3: Document behavior of flush() corner cases." into mnc-dev
Andy Hung [Fri, 12 Jun 2015 22:24:23 +0000 (22:24 +0000)]
Merge "Update USB channel mask handling" into mnc-dev
Shawn Willden [Fri, 12 Jun 2015 19:28:30 +0000 (19:28 +0000)]
Merge "Remove KM_TAG_CHUNK_LENGTH and add KM_TAG_AEAD_TAG"
Shawn Willden [Fri, 12 Jun 2015 19:26:27 +0000 (19:26 +0000)]
Merge "Add output params to update() and finish()."
Shawn Willden [Fri, 12 Jun 2015 19:25:21 +0000 (19:25 +0000)]
Merge "Fix block mode numbering (CTR got added as 4 rather than 3)"
Dan Albert [Thu, 11 Jun 2015 20:25:48 +0000 (20:25 +0000)]
am
b1988842: am
5e901ed4: Merge "Use abort() instead of a null dereference."
* commit '
b1988842df47187031718ccffa458ccafa9c2d6e':
Use abort() instead of a null dereference.
Dan Albert [Thu, 11 Jun 2015 20:05:53 +0000 (20:05 +0000)]
am
5e901ed4: Merge "Use abort() instead of a null dereference."
* commit '
5e901ed49faed3465c9df8e6cf6c684249bb3c8c':
Use abort() instead of a null dereference.
Dan Albert [Thu, 11 Jun 2015 19:41:42 +0000 (19:41 +0000)]
Merge "Use abort() instead of a null dereference."
OSDN Git Service
