Ajay Panicker
b7c35af905
Add guest mode functionality (3/5)
...
am: 72642d6
* commit '72642d65836f3b01f0b2c005ad1041069dff7288':
Add guest mode functionality (3/5)
2016-03-28 22:32:44 +00:00
Ajay Panicker
72642d6583
Add guest mode functionality (3/5)
...
Add a flag to enable() to start Bluetooth in restricted
mode. In restricted mode, all devices that are paired during
restricted mode are deleted upon leaving restricted mode.
Right now restricted mode is only entered while a guest
user is active
Bug: 27410683
Change-Id: Ibededbdb832275db4b6e78af83d26754f8b5a9ec
2016-03-28 18:35:03 +00:00
Shawn Willden
30a86713a9
Merge "Zero length in keymaster_free_param_set." into nyc-dev
...
am: 45e2e5f
* commit '45e2e5fc17d777aff95045000b1530cd9c9254f5':
Zero length in keymaster_free_param_set.
2016-03-26 21:44:22 +00:00
Shawn Willden
45e2e5fc17
Merge "Zero length in keymaster_free_param_set." into nyc-dev
2016-03-26 21:38:29 +00:00
Shawn Willden
f7b432e6f5
Merge "Add keymaster_security_level_t for attestation." into nyc-dev
...
am: 64e76f8
* commit '64e76f8febfbb439ff952c418505554f0138a145':
Add keymaster_security_level_t for attestation.
2016-03-26 16:08:54 +00:00
Shawn Willden
64e76f8feb
Merge "Add keymaster_security_level_t for attestation." into nyc-dev
2016-03-26 16:04:11 +00:00
Shawn Willden
ab2fd6fc67
Merge "Remove agree_key and add configure to keymaster2." into nyc-dev
...
am: 869ba42
* commit '869ba4241bfce1c274814134279eb983c99e6355':
Remove agree_key and add configure to keymaster2.
2016-03-26 15:22:23 +00:00
Shawn Willden
869ba4241b
Merge "Remove agree_key and add configure to keymaster2." into nyc-dev
2016-03-26 15:17:34 +00:00
Shawn Willden
e366efd5bb
Zero length in keymaster_free_param_set.
...
Change-Id: I0b9999e4c148d70369549cbd2fcdbbff7321a587
2016-03-25 11:39:35 -06:00
Shawn Willden
aeb15d64fc
Add keymaster_security_level_t for attestation.
...
Change-Id: Iffa71e3c285d35c2feafd04e8153306f086a3118
2016-03-25 11:39:35 -06:00
Shawn Willden
3080276974
Remove agree_key and add configure to keymaster2.
...
Key agreement (ECDH) has been punted from the N release, and a
configuration method has been added to support version binding.
Change-Id: Ia4aeee1bd7ab88cda3b9faa653470e608aa55942
2016-03-25 11:39:29 -06:00
Rob Herring
c3855dc8e2
Merge "vibrator: add support to use led-trigger interface"
...
am: 8944479
* commit '8944479e262c942f3d4e351bcb266a8d721466a5':
vibrator: add support to use led-trigger interface
2016-03-24 21:09:21 +00:00
Dmitry Shmidt
8944479e26
Merge "vibrator: add support to use led-trigger interface"
2016-03-24 20:33:19 +00:00
Dan Stoza
8efe9105ab
Merge "HWC2: Add const and alphabetize" into nyc-dev
...
am: f588e0b
* commit 'f588e0b3b9ab3b07b8833bccf9ab8a870d3943df':
HWC2: Add const and alphabetize
2016-03-24 18:41:02 +00:00
Dan Stoza
f588e0b3b9
Merge "HWC2: Add const and alphabetize" into nyc-dev
2016-03-24 18:33:44 +00:00
Dan Stoza
c46e96a5a2
HWC2: Add const and alphabetize
...
Alphabetizes the display functions and adds const to a float*
input parameter.
Bug: 22767098
Change-Id: I8cb4d6b27980753cfb17a8ad6b74cbbc984c5ac0
2016-03-24 10:12:15 -07:00
Dan Stoza
f4183baa85
Merge "HWC2: Fix a doc bug in setColorTransform" into nyc-dev
...
am: ca11094
* commit 'ca11094b4770fbe367bf62f0ace28bdb109305b1':
HWC2: Fix a doc bug in setColorTransform
2016-03-24 16:32:33 +00:00
Dan Stoza
ca11094b47
Merge "HWC2: Fix a doc bug in setColorTransform" into nyc-dev
2016-03-24 16:25:04 +00:00
Dan Stoza
5dfbe33cf3
HWC2: Fix a doc bug in setColorTransform
...
Fixes a minor error in the documentation of the setColorTransform
function.
Change-Id: Id1a94d6066f642579c6b935a6cc781505f25c11d
2016-03-24 09:23:11 -07:00
Jamie Howarth
eb48e669cb
Merge "Moved init and release." into nyc-dev
...
am: 99e6b64
* commit '99e6b647368df01bf8ddd66d18f6a5711d9d983f':
Moved init and release.
2016-03-23 21:00:57 +00:00
Keun-young Park
99e6b64736
Merge "Moved init and release." into nyc-dev
2016-03-23 20:53:16 +00:00
Jamie Howarth
b35ec7162d
Moved init and release.
...
Moved the init release calls in the vehicle-hal-tool.
I assume the correct sequence for a set is :-
VehicleNetworkService -> VehicleHAL vehicle_device_open
VehicleNetworkService -> VehicleHAL vehicle_device_init
VehicleNetworkService -> VehicleHAL vehicle_device_set
VehicleNetworkService -> VehicleHAL vehicle_device_release
bug: 27816048
Change-Id: I3ac37eaf69027824bc6247f25a99f27527c1a2b9
2016-03-23 13:43:18 -07:00
Rob Herring
61701df363
vibrator: add support to use led-trigger interface
...
The existing vibrator HAL uses the timed_output interface which will
never be moved out of kernel's staging tree. The kernel already has a
similar feature with GPIO controlled LEDs and LED triggers. While a
vibrator is not an LED, the control model is the same and can be reused.
Additionally, DT bindings already exist for GPIO controlled LEDs.
This adds support for the LED device in addition to the timed_output
device. It uses the "transient" trigger for the LED device named
"vibrator".
Change-Id: I90d52d6e50d83d255f484db148064069504f78e0
Signed-off-by: Rob Herring <robh@kernel.org>
2016-03-22 13:59:42 -05:00
Jakub Pawlowski
d2f1357954
Use handles to identify GATT attributes (2/4)
...
am: 8d7a02d
* commit '8d7a02d60744e56e8a71a05dbd62ffdbfa0b71c0':
Use handles to identify GATT attributes (2/4)
2016-03-22 03:44:42 +00:00
Jakub Pawlowski
8d7a02d607
Use handles to identify GATT attributes (2/4)
...
Bug: 27778668
Change-Id: Iff64153c2b783705fb4408f9911b13fa44af4f84
2016-03-21 20:10:10 -07:00
Jakub Pawlowski
32a0d434b9
Remove unused methods and callbacks
...
am: 98aa0dd
* commit '98aa0ddd6c3993ea43fdac6075a6d2b8725231bc':
Remove unused methods and callbacks
2016-03-22 02:58:39 +00:00
Jakub Pawlowski
98aa0ddd6c
Remove unused methods and callbacks
...
Bug: 27455533
Change-Id: Id2e265be02dc627e7fc81875c3000262cab2e35f
2016-03-22 02:53:16 +00:00
Jakub Pawlowski
73be7a31bc
Merge "Use handles to identify GATT attributes (2/4)"
...
am: 263fadf
* commit '263fadffcf8f00d2c5873e69e82d854f4aa53782':
Use handles to identify GATT attributes (2/4)
2016-03-22 02:47:09 +00:00
Andre Eisenbach
263fadffcf
Merge "Use handles to identify GATT attributes (2/4)"
2016-03-22 02:35:58 +00:00
Jakub Pawlowski
1d02bde221
Use handles to identify GATT attributes (2/4)
...
Bug: 27778668
Change-Id: Iff64153c2b783705fb4408f9911b13fa44af4f84
2016-03-22 01:18:45 +00:00
Andre Eisenbach
cc3acfd121
Merge "Bluetooth: Additional status codes for wakelock ops"
...
am: 8bfac80
* commit '8bfac80080f91f79904cff42d8eac6b3e30f1acc':
Bluetooth: Additional status codes for wakelock ops
2016-03-22 01:11:24 +00:00
Andre Eisenbach
8bfac80080
Merge "Bluetooth: Additional status codes for wakelock ops"
2016-03-22 01:03:13 +00:00
Andre Eisenbach
f65d1257d3
Bluetooth: Additional status codes for wakelock ops
...
Add additional status codes to better track wakelock acquisition or
release failures.
Bug: 27721443
Change-Id: I99fb442277dac81df0d84d9a9f7a3340158377a8
2016-03-21 17:23:23 -07:00
Ruchi Kandoi
4cdade5445
Merge "power: Adds a new power hint POWER_HINT_VR_MODE" into nyc-dev
...
am: bfa59e7
* commit 'bfa59e7fefab682c92fd0e8a2f25cc22b1252164':
power: Adds a new power hint POWER_HINT_VR_MODE
2016-03-21 19:47:42 +00:00
Ruchi Kandoi
bfa59e7fef
Merge "power: Adds a new power hint POWER_HINT_VR_MODE" into nyc-dev
2016-03-21 19:37:50 +00:00
Polina Bondarenko
1077515b5d
Merge "Re-worked hardware_properties to thermal HAL." into nyc-dev
...
am: 020fa12
* commit '020fa12eef9fb3e7c4e64d738f3f03064577f08e':
Re-worked hardware_properties to thermal HAL.
2016-03-19 08:49:36 +00:00
Polina Bondarenko
020fa12eef
Merge "Re-worked hardware_properties to thermal HAL." into nyc-dev
2016-03-19 08:43:33 +00:00
Andy Hung
2658e8a698
Merge "Update audio services for 64 bit compilation" into nyc-dev
...
am: b149109
* commit 'b149109eef09cb87f933a10e2c5074e56d8705a4':
Update audio services for 64 bit compilation
2016-03-18 20:28:54 +00:00
Andy Hung
b149109eef
Merge "Update audio services for 64 bit compilation" into nyc-dev
2016-03-18 20:23:26 +00:00
Andy Hung
19540e344b
Update audio services for 64 bit compilation
...
Bug: 27479136
Change-Id: I1cb6baf3c507c7004b3245176727be1fd96174df
2016-03-18 10:43:05 -07:00
Andre Eisenbach
3384991688
Bluetooth: Additional status codes for wakelock ops
...
am: cbe2d3a
* commit 'cbe2d3a8f4d51a0b52ac741160c11f4463d7b0d7':
Bluetooth: Additional status codes for wakelock ops
2016-03-18 01:36:14 +00:00
Andre Eisenbach
cbe2d3a8f4
Bluetooth: Additional status codes for wakelock ops
...
Add additional status codes to better track wakelock acquisition or
release failures.
Bug: 27721443
Change-Id: I99fb442277dac81df0d84d9a9f7a3340158377a8
2016-03-17 16:46:39 -07:00
Lifu Tang
fb851962df
Merge "Removed the comment that refers to deprecated flag" into nyc-dev
...
am: f0b5ccf
* commit 'f0b5ccf0f88d4cdc574973b394f13d89caa780f6':
Removed the comment that refers to deprecated flag
2016-03-17 19:30:19 +00:00
Lifu Tang
f0b5ccf0f8
Merge "Removed the comment that refers to deprecated flag" into nyc-dev
2016-03-17 19:23:38 +00:00
Glenn Kasten
211768ae32
Merge "Use audio_session_t consistently" into nyc-dev
...
am: 78b34a9
* commit '78b34a944cdad940d74fd676104f27b2d6fd1606':
Use audio_session_t consistently
2016-03-17 18:17:54 +00:00
Jamie Howarth
4578b79cef
Add support for all data types to vehicle-hal-tool.
...
am: 8b61aac
* commit '8b61aac596dc0baa3d9053fa0eed31551be944ea':
Add support for all data types to vehicle-hal-tool.
2016-03-17 18:17:54 +00:00
Lifu Tang
3fc3bc867e
Removed the comment that refers to deprecated flag
...
Bug: 27633183
Change-Id: I30fe79761305cd1fbac2f3f6cad68dc12eaec660
2016-03-17 10:45:00 -07:00
Glenn Kasten
78b34a944c
Merge "Use audio_session_t consistently" into nyc-dev
2016-03-17 14:22:51 +00:00
Polina Bondarenko
25cd7f0fb0
Re-worked hardware_properties to thermal HAL.
...
Bug: 27424857
Change-Id: Id7212421e499cc33c82e885756d68e89c2317acf
2016-03-17 10:09:24 +01:00
Jamie Howarth
8b61aac596
Add support for all data types to vehicle-hal-tool.
...
Added support for all data types to set, get, subscribe.
Change-Id: Ided5baa036eefc21d381607b19bd31522cfe95cb
2016-03-15 18:28:41 -07:00