OSDN Git Service
Ajay Panicker [Wed, 5 Aug 2015 18:29:11 +0000 (18:29 +0000)]
am
a7897020: am
b3759712: Implement Bluetooth settings factory reset (4/5)
* commit '
a7897020c32ec32a14bdcc397230e5ccd4028939':
Implement Bluetooth settings factory reset (4/5)
Ajay Panicker [Wed, 5 Aug 2015 18:10:36 +0000 (18:10 +0000)]
am
b3759712: Implement Bluetooth settings factory reset (4/5)
* commit '
b3759712b0ab4ae294731ee5889c2ebd131a156f':
Implement Bluetooth settings factory reset (4/5)
Ajay Panicker [Tue, 28 Jul 2015 23:53:53 +0000 (16:53 -0700)]
Implement Bluetooth settings factory reset (4/5)
Implemented the factory reset function to be used to reset all bluetooth
settings on device to factory default
Bug:
16161518
Change-Id: I69358db95582ddd0f2f640f76cf0931f797d369b
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: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
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: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: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: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: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: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: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 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 [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: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 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: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 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 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: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 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 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: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 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: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."
Dan Albert [Thu, 11 Jun 2015 18:04:52 +0000 (11:04 -0700)]
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
Shawn Willden [Mon, 1 Jun 2015 17:40:34 +0000 (11:40 -0600)]
Remove KM_TAG_CHUNK_LENGTH and add KM_TAG_AEAD_TAG
Bug:
19919114
Change-Id: I384f3d2fee2f68279c6518d9ac0a79e29bed0e52
Shawn Willden [Mon, 1 Jun 2015 17:32:35 +0000 (11:32 -0600)]
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
Shawn Willden [Mon, 1 Jun 2015 17:40:24 +0000 (11:40 -0600)]
Fix block mode numbering (CTR got added as 4 rather than 3)
Change-Id: I8c886c67ba081255ef18eb0f99ca1e6003fabb33
Sasha Levitskiy [Wed, 10 Jun 2015 23:17:06 +0000 (23:17 +0000)]
am
d4331fda: Fingerprint: Avoid passing structures where simple types should suffice.
* commit '
d4331fdae5247bdbac27f1db94cac504ea5afb78':
Fingerprint: Avoid passing structures where simple types should suffice.
Andy Hung [Wed, 10 Jun 2015 22:17:00 +0000 (15:17 -0700)]
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
Andre Eisenbach [Wed, 10 Jun 2015 22:16:54 +0000 (22:16 +0000)]
am
5dc18299: Merge "LE low power scan feature"
* commit '
5dc18299df564fd2b8f35cead043dd1ae52e1397':
LE low power scan feature
Eino-Ville Talvala [Wed, 10 Jun 2015 21:58:32 +0000 (14:58 -0700)]
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
Andre Eisenbach [Wed, 10 Jun 2015 21:12:37 +0000 (21:12 +0000)]
am
c9352622: Merge "Bluetooth native dumpsys logging support (1/5)"
* commit '
c93526225f351035c597d6278c2deb3ac32735a2':
Bluetooth native dumpsys logging support (1/5)
Sasha Levitskiy [Mon, 8 Jun 2015 20:14:15 +0000 (13:14 -0700)]
Fingerprint: Avoid passing structures where simple types should suffice.
Bug:
21282699
Change-Id: I02e13b7da0ad361a95b981f9745aac039151f356
Signed-off-by: Sasha Levitskiy <sanek@google.com>
Andre Eisenbach [Wed, 10 Jun 2015 20:46:58 +0000 (20:46 +0000)]
Merge "LE low power scan feature"
Satya Calloji [Tue, 31 Mar 2015 20:58:21 +0000 (13:58 -0700)]
LE low power scan feature
LE low power extended scan feature header changes
based on Google spec v0.95
Bug:
20029342
Change-Id: Id1020a4da177d0bc421fdd123c5355a291cc0475
Andre Eisenbach [Wed, 10 Jun 2015 20:19:20 +0000 (20:19 +0000)]
Merge "Bluetooth native dumpsys logging support (1/5)"
Eino-Ville Talvala [Tue, 9 Jun 2015 22:55:09 +0000 (22:55 +0000)]
am
17b8cee9: Merge "Camera2 tests: Update for framework changes" into mnc-dev
* commit '
17b8cee9a2df698448381d1b03cec2b618c27e97':
Camera2 tests: Update for framework changes
Eino-Ville Talvala [Tue, 9 Jun 2015 22:24:26 +0000 (22:24 +0000)]
Merge "Camera2 tests: Update for framework changes" into mnc-dev
Eino-Ville Talvala [Tue, 9 Jun 2015 22:23:34 +0000 (15:23 -0700)]
Camera2 tests: Update for framework changes
Change-Id: I9ac788cfe9a001ef33bdc52a9e8ba0bdcf3ded2c
Casper Bonde [Tue, 9 Jun 2015 22:09:36 +0000 (22:09 +0000)]
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)
Casper Bonde [Fri, 8 May 2015 12:33:58 +0000 (14:33 +0200)]
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>
Sasha Levitskiy [Tue, 9 Jun 2015 13:01:18 +0000 (13:01 +0000)]
am
a70ab95e: Fingerprint: Remove unused API elements.
* commit '
a70ab95eeaf61594594a57e4de957dac47889c96':
Fingerprint: Remove unused API elements.
Sasha Levitskiy [Tue, 2 Jun 2015 18:29:12 +0000 (11:29 -0700)]
Fingerprint: Remove unused API elements.
Change-Id: Iba2f6a5bc7a2923c3e9b92684a2fab2190f14fd5
Signed-off-by: Sasha Levitskiy <sanek@google.com>
Andre Eisenbach [Fri, 5 Dec 2014 17:35:57 +0000 (09:35 -0800)]
Bluetooth native dumpsys logging support (1/5)
Bug:
18508263
Change-Id: Id7b69a6ed7d817a0f048cb8ebf0889c600171926
Chien-Yu Chen [Wed, 3 Jun 2015 21:30:06 +0000 (21:30 +0000)]
am
c8812261: Merge "Camera: Update for torch callbacks" into mnc-dev
* commit '
c88122614c1593bc9384564b10f11bd7bb7e3b64':
Camera: Update for torch callbacks
Chien-Yu Chen [Wed, 3 Jun 2015 21:01:50 +0000 (21:01 +0000)]
Merge "Camera: Update for torch callbacks" into mnc-dev
Chien-Yu Chen [Wed, 3 Jun 2015 20:36:33 +0000 (13:36 -0700)]
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
Dan Stoza [Wed, 3 Jun 2015 19:14:54 +0000 (19:14 +0000)]
am
5e6082fd: Merge "gralloc: Sort usage flags"
* commit '
5e6082fd5611771ff9ff2911ed5cdca5d71f06b1':
gralloc: Sort usage flags
Dan Stoza [Wed, 3 Jun 2015 19:14:53 +0000 (19:14 +0000)]
am
f456512f: Merge "libhardware: fix gralloc usage bit redefine"
* commit '
f456512f9e54c534378683d0cd8f288b6312be2b':
libhardware: fix gralloc usage bit redefine
OSDN Git Service
