OSDN Git Service
Ronghua Wu [Wed, 27 Jan 2016 01:02:15 +0000 (01:02 +0000)]
Merge "Add vp9 profiles and levels omx types."
Wonsik Kim [Wed, 27 Jan 2016 00:31:28 +0000 (00:31 +0000)]
Merge "omx: extend OMX_VIDEO_PARAM_HEVCTYPE for encoder use case"
Mark Salyzyn [Tue, 26 Jan 2016 21:55:15 +0000 (21:55 +0000)]
Merge "Revert "dumpstate: Add security log dump"" am:
316923d359
am:
fd0d76730f
* commit '
fd0d76730f06bec15c90e9a9da64ee19361c3a9f':
Revert "dumpstate: Add security log dump"
Nick Vaccaro [Tue, 26 Jan 2016 21:55:08 +0000 (21:55 +0000)]
Merge "[DO NOT MERGE ANYWHERE] Fix bodysensor permission" into cw-e-dev am:
ca19b6a4d3 -s ours am:
a0a1599d8b -s ours am:
972e9479a7 -s ours
am:
b4f7fea19c -s ours
* commit '
b4f7fea19c3bcf4e9738c632cc83104ed7c44467':
[DO NOT MERGE ANYWHERE] Fix bodysensor permission
Mark Salyzyn [Tue, 26 Jan 2016 20:48:08 +0000 (20:48 +0000)]
Merge "Revert "dumpstate: Add security log dump""
am:
316923d359
* commit '
316923d3597af72d1cbd9eb2745a02706275fdb8':
Revert "dumpstate: Add security log dump"
Mark Salyzyn [Tue, 26 Jan 2016 20:41:51 +0000 (20:41 +0000)]
Merge "Revert "dumpstate: Add security log dump""
Nick Vaccaro [Tue, 26 Jan 2016 20:20:05 +0000 (20:20 +0000)]
Merge "[DO NOT MERGE ANYWHERE] Fix bodysensor permission" into cw-e-dev am:
ca19b6a4d3 -s ours am:
a0a1599d8b -s ours
am:
972e9479a7 -s ours
* commit '
972e9479a700d9d80aca7c036ed96ce6db4e78e5':
[DO NOT MERGE ANYWHERE] Fix bodysensor permission
Nick Vaccaro [Tue, 26 Jan 2016 20:17:31 +0000 (20:17 +0000)]
Merge "[DO NOT MERGE ANYWHERE] Fix bodysensor permission" into cw-e-dev am:
ca19b6a4d3 -s ours
am:
a0a1599d8b -s ours
* commit '
a0a1599d8b8d8da38a47a939864d6f80bf6b9a09':
[DO NOT MERGE ANYWHERE] Fix bodysensor permission
Nick Vaccaro [Tue, 26 Jan 2016 20:15:15 +0000 (20:15 +0000)]
Merge "[DO NOT MERGE ANYWHERE] Fix bodysensor permission" into cw-e-dev
am:
ca19b6a4d3 -s ours
* commit '
ca19b6a4d347dae318157988134471f9d40e2052':
[DO NOT MERGE ANYWHERE] Fix bodysensor permission
Nick Vaccaro [Tue, 26 Jan 2016 20:13:29 +0000 (20:13 +0000)]
Merge "[DO NOT MERGE ANYWHERE] Fix bodysensor permission" into cw-e-dev
Peng Xu [Fri, 22 Jan 2016 07:15:04 +0000 (23:15 -0800)]
[DO NOT MERGE ANYWHERE] Fix bodysensor permission
Bug:
26481493
Bug:
26447970
Change-Id: Iaadf64814c03ae8098c8553ac98d19b77c1eabcd
Mark Salyzyn [Tue, 26 Jan 2016 15:24:08 +0000 (07:24 -0800)]
Revert "dumpstate: Add security log dump"
This reverts commit
c7ad8cb82f035576c28707a8cbeb16b7ead2a4e7.
Bug:
26029733
Change-Id: I0c61f4d2c0aa9e07c6cc7b190d803e98c3a98d40
Polina Bondarenko [Tue, 26 Jan 2016 12:12:34 +0000 (12:12 +0000)]
Merge "Add HardwarePropertiesManager constants to native layer."
Nick Kralevich [Mon, 25 Jan 2016 23:05:16 +0000 (15:05 -0800)]
dumpstate.cpp: collect command line earlier
We need to collect the command line before we use it.
Bug:
26777547
Change-Id: I715adce62511c4cc553eb462d853559687a1677f
Tim Murray [Mon, 25 Jan 2016 18:45:04 +0000 (18:45 +0000)]
Merge "Set cpuset from surfaceflinger."
Martijn Coenen [Mon, 25 Jan 2016 09:53:32 +0000 (09:53 +0000)]
Merge "Implementation of HCE for NFC-F." am:
695d489450
am:
6c98d282de
* commit '
6c98d282de7604fcbdbc07be009d9e5a3a0d9f44':
Implementation of HCE for NFC-F.
Martijn Coenen [Mon, 25 Jan 2016 09:51:45 +0000 (09:51 +0000)]
Merge "Implementation of HCE for NFC-F."
am:
695d489450
* commit '
695d489450cc6ce102979846fe5e8ac565d9151a':
Implementation of HCE for NFC-F.
Martijn Coenen [Mon, 25 Jan 2016 09:47:27 +0000 (09:47 +0000)]
Merge "Implementation of HCE for NFC-F."
Yoshinobu Ito [Mon, 18 Jan 2016 12:02:47 +0000 (21:02 +0900)]
Implementation of HCE for NFC-F.
This impementation includes HCE(Host-based Card Emulation) for NFC-F
which emulates NFC Forum Type 3 Tag on a smartphone.
Signed-off-by: Daisuke Ito <DaisukeE.Ito@jp.sony.com>
Yoshinobu Ito <Yoshinobu.Ito@jp.sony.com>
Change-Id: I1618a7fba801e0705ff3cc078206a1446b3dd56d
Michael Wright [Fri, 22 Jan 2016 00:31:40 +0000 (00:31 +0000)]
Merge "Add NDK Choreographer API headers"
Michael Wright [Mon, 7 Dec 2015 20:26:38 +0000 (15:26 -0500)]
Add NDK Choreographer API headers
Change-Id: Ib75d3341db4e48b328b7b92497a303c01c53fc90
David Brazdil [Thu, 21 Jan 2016 10:46:43 +0000 (10:46 +0000)]
Merge "installd: Rename USEJIT to EXTRACTONLY"
Wonsik Kim [Tue, 8 Dec 2015 14:21:36 +0000 (23:21 +0900)]
omx: extend OMX_VIDEO_PARAM_HEVCTYPE for encoder use case
Bug:
22879917
Change-Id: I613786900815702185b71929ede4e2dbdecf8ab2
Ronghua Wu [Thu, 21 Jan 2016 00:44:18 +0000 (00:44 +0000)]
Merge "media: add OMX_VIDEO_CodingDolbyVision."
Tim Murray [Tue, 10 Nov 2015 22:29:45 +0000 (14:29 -0800)]
Set cpuset from surfaceflinger.
SurfaceFlinger shouldn't be limited to little cores exclusively, as the
binder threads should be placed on big cores when they are in the
critical path for a RenderThread.
bug
25745866
Change-Id: I9fb65f6d951733f91b4735ff27018411b58b2bfb
David Brazdil [Wed, 30 Dec 2015 11:16:04 +0000 (11:16 +0000)]
installd: Rename USEJIT to EXTRACTONLY
Change-Id: I8d68e32dd9bbb7f6eee2f3aad886792d85cb12ca
Calin Juravle [Tue, 19 Jan 2016 19:51:48 +0000 (19:51 +0000)]
Merge "Add profile guided compilation hooks in installd"
Calin Juravle [Thu, 24 Dec 2015 10:36:41 +0000 (12:36 +0200)]
Add profile guided compilation hooks in installd
Bug:
26080105
Change-Id: I6aaddffe79c55b9a6560c2d6542cf87abbd4fb11
Janis Danisevskis [Tue, 12 Jan 2016 14:45:55 +0000 (14:45 +0000)]
Change permissions of apps' home dir to 0700 for SDK > 23
This patchset changes the installd such that apps' home
directory has permissions set to 0700 if build for a
target SDK version. In consequence the commands
create_app_data and move_complete_app
get one more parameter, the target SDK version.
Apps built for a lower SDK version will still have
home directories with permissions set to 0751.
Bug:
7208882
Change-Id: I0213834dd946c72f5d7e31965a9dc517ced268db
Jeff Sharkey [Sat, 16 Jan 2016 00:41:09 +0000 (00:41 +0000)]
Merge "Remove older migration code."
Ronghua Wu [Sat, 16 Jan 2016 00:30:57 +0000 (16:30 -0800)]
Add vp9 profiles and levels omx types.
Bug:
25684127
Change-Id: Iec3cd44538be50a552477ea049f9cc34c126a5c6
Jeff Sharkey [Wed, 13 Jan 2016 16:37:46 +0000 (09:37 -0700)]
Remove older migration code.
We used to offer to migrate pre-multi-user devices to the new
multi-user layout around JB, but the new layout has been the default
for many years now, so it's safe to remove this logic.
All core directory creation is now handled by init.rc where FBE
policies can be setup correctly, so we shouldn't be in the business
of doing system bootstrapping here.
Remove some lingering FBE debugging code.
Bug:
26466827
Change-Id: I1dfe9c8fc02b64013a5c45cea99bf8f61f7d1d5b
Robert Shih [Fri, 15 Jan 2016 02:21:41 +0000 (02:21 +0000)]
IGraphicBufferProducer: fix QUEUE_BUFFER info leak am:
d06421fd37 am:
413318311c am:
dc9ec35294 am:
9d959e2755 am:
edb7c81a1b am:
2a7a1247cb am:
40ba03fc68 am:
ea2b6c68e1 am:
6df23e81f7 am:
c748125025
am:
db5c5bb025
* commit '
db5c5bb0259fa024517d9a151726785facba4f02':
IGraphicBufferProducer: fix QUEUE_BUFFER info leak
Robert Shih [Fri, 15 Jan 2016 02:21:36 +0000 (02:21 +0000)]
IGraphicBufferConsumer: fix ATTACH_BUFFER info leak am:
dded8fdbb7 am:
7ee203b59d am:
dc252255af am:
202aaa8f97 am:
ec87aa5218 am:
c5cb7c489b am:
e8cceaf02f am:
aef60500d2
am:
362647d373
* commit '
362647d37327db2ed53301398a9de7c030af2d42':
IGraphicBufferConsumer: fix ATTACH_BUFFER info leak
Robert Shih [Fri, 15 Jan 2016 02:03:07 +0000 (02:03 +0000)]
IGraphicBufferProducer: fix QUEUE_BUFFER info leak am:
d06421fd37 am:
413318311c am:
dc9ec35294 am:
9d959e2755 am:
edb7c81a1b am:
2a7a1247cb am:
40ba03fc68 am:
ea2b6c68e1 am:
6df23e81f7
am:
c748125025
* commit '
c7481250259144c2f7795408ad971f4a9319d996':
IGraphicBufferProducer: fix QUEUE_BUFFER info leak
Robert Shih [Fri, 15 Jan 2016 02:00:24 +0000 (02:00 +0000)]
IGraphicBufferProducer: fix QUEUE_BUFFER info leak am:
d06421fd37 am:
413318311c am:
dc9ec35294 am:
9d959e2755 am:
edb7c81a1b am:
2a7a1247cb am:
40ba03fc68 am:
ea2b6c68e1
am:
6df23e81f7
* commit '
6df23e81f762ec7bdf3d575582ad51aaef5172cf':
IGraphicBufferProducer: fix QUEUE_BUFFER info leak
Robert Shih [Fri, 15 Jan 2016 01:58:27 +0000 (01:58 +0000)]
IGraphicBufferProducer: fix QUEUE_BUFFER info leak am:
d06421fd37 am:
413318311c am:
dc9ec35294 am:
9d959e2755 am:
edb7c81a1b am:
2a7a1247cb am:
40ba03fc68
am:
ea2b6c68e1
* commit '
ea2b6c68e14b918972b1390765fdf4f748b49ba2':
IGraphicBufferProducer: fix QUEUE_BUFFER info leak
Robert Shih [Fri, 15 Jan 2016 01:56:25 +0000 (01:56 +0000)]
IGraphicBufferProducer: fix QUEUE_BUFFER info leak am:
d06421fd37 am:
413318311c am:
dc9ec35294 am:
9d959e2755 am:
edb7c81a1b am:
2a7a1247cb
am:
40ba03fc68
* commit '
40ba03fc68e6c234bb8604784716cb2481ad1c67':
IGraphicBufferProducer: fix QUEUE_BUFFER info leak
Robert Shih [Fri, 15 Jan 2016 01:56:25 +0000 (01:56 +0000)]
IGraphicBufferConsumer: fix ATTACH_BUFFER info leak am:
dded8fdbb7 am:
7ee203b59d am:
dc252255af am:
202aaa8f97 am:
ec87aa5218 am:
c5cb7c489b am:
e8cceaf02f
am:
aef60500d2
* commit '
aef60500d2a505c3dbbea74f62053c0bb072d5a7':
IGraphicBufferConsumer: fix ATTACH_BUFFER info leak
Robert Shih [Fri, 15 Jan 2016 01:54:27 +0000 (01:54 +0000)]
IGraphicBufferConsumer: fix ATTACH_BUFFER info leak am:
dded8fdbb7 am:
7ee203b59d am:
dc252255af am:
202aaa8f97 am:
ec87aa5218 am:
c5cb7c489b
am:
e8cceaf02f
* commit '
e8cceaf02f7e15e1ef0c3446c4287ce58cc325ba':
IGraphicBufferConsumer: fix ATTACH_BUFFER info leak
Robert Shih [Fri, 15 Jan 2016 01:54:27 +0000 (01:54 +0000)]
IGraphicBufferProducer: fix QUEUE_BUFFER info leak am:
d06421fd37 am:
413318311c am:
dc9ec35294 am:
9d959e2755 am:
edb7c81a1b
am:
2a7a1247cb
* commit '
2a7a1247cb4829daaaa4e6a6ee3e670cd2f068bf':
IGraphicBufferProducer: fix QUEUE_BUFFER info leak
Robert Shih [Fri, 15 Jan 2016 01:52:25 +0000 (01:52 +0000)]
IGraphicBufferConsumer: fix ATTACH_BUFFER info leak am:
dded8fdbb7 am:
7ee203b59d am:
dc252255af am:
202aaa8f97 am:
ec87aa5218
am:
c5cb7c489b
* commit '
c5cb7c489bcc3a52abdd4d02fb353b0a7b8557eb':
IGraphicBufferConsumer: fix ATTACH_BUFFER info leak
Robert Shih [Fri, 15 Jan 2016 01:52:25 +0000 (01:52 +0000)]
IGraphicBufferProducer: fix QUEUE_BUFFER info leak am:
d06421fd37 am:
413318311c am:
dc9ec35294 am:
9d959e2755
am:
edb7c81a1b
* commit '
edb7c81a1b99d2456910b03db9e4ac250eac2fab':
IGraphicBufferProducer: fix QUEUE_BUFFER info leak
Robert Shih [Fri, 15 Jan 2016 01:50:22 +0000 (01:50 +0000)]
IGraphicBufferConsumer: fix ATTACH_BUFFER info leak am:
dded8fdbb7 am:
7ee203b59d am:
dc252255af am:
202aaa8f97
am:
ec87aa5218
* commit '
ec87aa52189d5d3bbf5df214ab099d5de9f5836c':
IGraphicBufferConsumer: fix ATTACH_BUFFER info leak
Robert Shih [Fri, 15 Jan 2016 01:50:22 +0000 (01:50 +0000)]
IGraphicBufferProducer: fix QUEUE_BUFFER info leak am:
d06421fd37 am:
413318311c am:
dc9ec35294
am:
9d959e2755
* commit '
9d959e275561bcace3aab1f9df009c6c880003fa':
IGraphicBufferProducer: fix QUEUE_BUFFER info leak
Robert Shih [Fri, 15 Jan 2016 01:48:17 +0000 (01:48 +0000)]
IGraphicBufferConsumer: fix ATTACH_BUFFER info leak am:
dded8fdbb7 am:
7ee203b59d am:
dc252255af
am:
202aaa8f97
* commit '
202aaa8f97083b68c0a736f4cd432f61c9b0989d':
IGraphicBufferConsumer: fix ATTACH_BUFFER info leak
Robert Shih [Fri, 15 Jan 2016 01:45:18 +0000 (01:45 +0000)]
IGraphicBufferConsumer: fix ATTACH_BUFFER info leak am:
dded8fdbb7 am:
7ee203b59d
am:
dc252255af
* commit '
dc252255af835bb3a69bc9a0d01da12419c0fc05':
IGraphicBufferConsumer: fix ATTACH_BUFFER info leak
Robert Shih [Fri, 15 Jan 2016 01:45:18 +0000 (01:45 +0000)]
IGraphicBufferProducer: fix QUEUE_BUFFER info leak am:
d06421fd37 am:
413318311c
am:
dc9ec35294
* commit '
dc9ec35294b8ec6b6c349b826edc9b44f4ddb96d':
IGraphicBufferProducer: fix QUEUE_BUFFER info leak
Robert Shih [Fri, 15 Jan 2016 01:43:05 +0000 (01:43 +0000)]
IGraphicBufferConsumer: fix ATTACH_BUFFER info leak am:
dded8fdbb7
am:
7ee203b59d
* commit '
7ee203b59d9a74d485ce2fdfd07e96b2d10ff23b':
IGraphicBufferConsumer: fix ATTACH_BUFFER info leak
Robert Shih [Fri, 15 Jan 2016 01:38:56 +0000 (01:38 +0000)]
IGraphicBufferProducer: fix QUEUE_BUFFER info leak am:
d06421fd37
am:
413318311c
* commit '
413318311c8cc356dd7e0837ce26e937a9f4c56a':
IGraphicBufferProducer: fix QUEUE_BUFFER info leak
Robert Shih [Fri, 15 Jan 2016 01:27:23 +0000 (01:27 +0000)]
IGraphicBufferProducer: fix QUEUE_BUFFER info leak
am:
d06421fd37
* commit '
d06421fd37fbb7fd07002e6738fac3a223cb1a62':
IGraphicBufferProducer: fix QUEUE_BUFFER info leak
Robert Shih [Fri, 15 Jan 2016 01:26:59 +0000 (01:26 +0000)]
IGraphicBufferConsumer: fix ATTACH_BUFFER info leak
am:
dded8fdbb7
* commit '
dded8fdbb700d6cc498debc69a780915bc34d755':
IGraphicBufferConsumer: fix ATTACH_BUFFER info leak
Etan Cohen [Thu, 14 Jan 2016 18:58:03 +0000 (18:58 +0000)]
NAN hardware feature support definition file.
am:
d19965d2d0
* commit '
d19965d2d02b3ec9cde5f56628b09a868f962174':
NAN hardware feature support definition file.
Polina Bondarenko [Wed, 13 Jan 2016 20:12:16 +0000 (21:12 +0100)]
Add HardwarePropertiesManager constants to native layer.
Bug:
22407109
Change-Id: Ic1b6d78168603b6c4e4fd37d8eb34a9f9f43ec6f
Prashant Malani [Wed, 13 Jan 2016 20:52:25 +0000 (12:52 -0800)]
resolve merge conflicts of
14af23d140 to master.
Change-Id: I1eee295f592bad672ad093dfbd9c0c2b555df0ed
Prashant Malani [Wed, 13 Jan 2016 18:53:32 +0000 (18:53 +0000)]
Revert "inputflinger: Add support for scaling and true value reporting" am:
2c09b78656 am:
cd7ddc7cac am:
918263dac8
am:
63da2d7082
* commit '
63da2d70828a817e2afd79d0a0f27a64723984c0':
Revert "inputflinger: Add support for scaling and true value reporting"
Prashant Malani [Wed, 13 Jan 2016 18:50:08 +0000 (18:50 +0000)]
Revert "inputflinger: Initial support for rotary encoders." am:
d983fd11d4 am:
b5458e3baf
am:
618b2dc4c8
* commit '
618b2dc4c898b13b786bd3b4a1d696e8744cc225':
Revert "inputflinger: Initial support for rotary encoders."
Prashant Malani [Wed, 13 Jan 2016 18:50:03 +0000 (18:50 +0000)]
Revert "inputflinger: Add support for scaling and true value reporting" am:
2c09b78656 am:
cd7ddc7cac
am:
918263dac8
* commit '
918263dac8f7572dd90eeaadda651e117f735653':
Revert "inputflinger: Add support for scaling and true value reporting"
Prashant Malani [Wed, 13 Jan 2016 18:46:52 +0000 (18:46 +0000)]
Revert "inputflinger: Initial support for rotary encoders." am:
d983fd11d4
am:
b5458e3baf
* commit '
b5458e3bafa3917e7cfda1e3200d112951a5a954':
Revert "inputflinger: Initial support for rotary encoders."
Prashant Malani [Wed, 13 Jan 2016 18:46:46 +0000 (18:46 +0000)]
Revert "inputflinger: Add support for scaling and true value reporting" am:
2c09b78656
am:
cd7ddc7cac
* commit '
cd7ddc7cac649f5630197d57bc098764c994aba6':
Revert "inputflinger: Add support for scaling and true value reporting"
Prashant Malani [Wed, 13 Jan 2016 18:44:11 +0000 (18:44 +0000)]
Revert "inputflinger: Initial support for rotary encoders."
am:
d983fd11d4
* commit '
d983fd11d4a00b03f92d09f32c08840e66d90777':
Revert "inputflinger: Initial support for rotary encoders."
Prashant Malani [Wed, 13 Jan 2016 18:44:02 +0000 (18:44 +0000)]
Revert "inputflinger: Add support for scaling and true value reporting"
am:
2c09b78656
* commit '
2c09b78656dd97727f94fada81845b133cf142f3':
Revert "inputflinger: Add support for scaling and true value reporting"
Dongwon Kang [Wed, 13 Jan 2016 18:21:15 +0000 (18:21 +0000)]
Merge "Add a way for SystemUI to receive media resource (e.g. A/V codec) usage"
Jeff Sharkey [Wed, 13 Jan 2016 16:47:08 +0000 (09:47 -0700)]
Still not safe to mutate DE on secondary users.
Bug:
25796509,
26535916
Change-Id: I694b4a1b5fe3e31578f431bcddf7d6c4070f7852
Prashant Malani [Wed, 13 Jan 2016 09:00:25 +0000 (01:00 -0800)]
Revert "inputflinger: Initial support for rotary encoders."
This reverts commit
ac72bbf4e46d6689070df09a25db2960a9036eb2.
Prashant Malani [Wed, 13 Jan 2016 09:00:08 +0000 (01:00 -0800)]
Revert "inputflinger: Add support for scaling and true value reporting"
This reverts commit
ee03865fe5fc6ffe9deda0e0870a18206027cfaf.
Prashant Malani [Wed, 13 Jan 2016 05:39:23 +0000 (05:39 +0000)]
inputflinger: Add support for scaling and true value reporting am:
ee03865fe5 am:
a777e8b70f am:
9363c7fa06
am:
60f161920b
* commit '
60f161920be227121df1a57be430b1b5cf94bd4f':
inputflinger: Add support for scaling and true value reporting
Samuel Tan [Wed, 13 Jan 2016 05:39:17 +0000 (05:39 +0000)]
Merge "Add PersistableBundle.aidl into binder includes" am:
0904094574
am:
a06aad9986
* commit '
a06aad9986c02d9d8ab028b748d3648a2215a11e':
Add PersistableBundle.aidl into binder includes
Prashant Malani [Wed, 13 Jan 2016 05:37:31 +0000 (05:37 +0000)]
inputflinger: Add support for scaling and true value reporting am:
ee03865fe5 am:
a777e8b70f
am:
9363c7fa06
* commit '
9363c7fa063c45dc5e0bf35616928d1e036e2419':
inputflinger: Add support for scaling and true value reporting
Prashant Malani [Wed, 13 Jan 2016 05:35:45 +0000 (05:35 +0000)]
inputflinger: Add support for scaling and true value reporting am:
ee03865fe5
am:
a777e8b70f
* commit '
a777e8b70fce35e97dd8812df8b0b5eca17db550':
inputflinger: Add support for scaling and true value reporting
Prashant Malani [Wed, 13 Jan 2016 05:33:57 +0000 (05:33 +0000)]
inputflinger: Add support for scaling and true value reporting
am:
ee03865fe5
* commit '
ee03865fe5fc6ffe9deda0e0870a18206027cfaf':
inputflinger: Add support for scaling and true value reporting
Ronghua Wu [Wed, 13 Jan 2016 00:40:04 +0000 (00:40 +0000)]
Merge "Revert "media: Add dolby hdr codecs to OMX_VIDEO_CODINGTYPE.""
Samuel Tan [Tue, 12 Jan 2016 23:14:46 +0000 (23:14 +0000)]
Merge "Add PersistableBundle.aidl into binder includes"
am:
0904094574
* commit '
09040945744f8a8634d7472836d6be3506a77d41':
Add PersistableBundle.aidl into binder includes
Samuel Tan [Tue, 12 Jan 2016 23:09:44 +0000 (23:09 +0000)]
Merge "Add PersistableBundle.aidl into binder includes"
Jeff Sharkey [Mon, 11 Jan 2016 20:07:09 +0000 (13:07 -0700)]
Let callers specify which storage to operate on.
Since CE and DE storage can have different availability lifecycles,
callers can't operate on both at the same time. Let them use flags
to specify which storage to work with.
Remove old unused methods, and name consistently in preparation for
eventual move to AIDL.
Bug:
26466827
Change-Id: Id5d7d03f5d8814864eea801f5a46496c085afdff
Jeff Tinker [Tue, 12 Jan 2016 17:42:11 +0000 (17:42 +0000)]
Merge "Support AES-CBC sample encryption in MediaDrm"
Dongwon Kang [Mon, 14 Dec 2015 12:59:19 +0000 (21:59 +0900)]
Add a way for SystemUI to receive media resource (e.g. A/V codec) usage
Bug:
26175834
Change-Id: I16320fa41dd852768a370af0a0740691d1ddacdf
Prashant Malani [Tue, 12 Jan 2016 01:08:18 +0000 (17:08 -0800)]
inputflinger: Add support for scaling and true value reporting
-1/+1 somewhat simplifies the values that can be generated by rotary
encoders, and rules out the possibility of batching and more nuanced
movement reporting.
So, we modify the device configuration to allow values other than -1 and
1 to be supported. In order to give the developer a sense of what these
values map to in terms of angular displacement, we also parse a
resolution configuration from the devices IDC file.
This will be specified as:
device.res = xxxx
of type float. If a value is not provided, a default res value of 0.0f
is used.
This patch also adds a per device scaling factor, which is used to
suitably modify the values reported (as well as the resolution) to tune
the input events generated and resulting UI according to the hardware.
This can be specified in the IDC file as:
device.scalingFactor = xxxx
of type float. If a scaling factor is not provided, a default of 1.0f
is used.
Bug:
22836852
Bug:
18707397
Change-Id: I13686f64de1b52d3f6c97b2587ae41e52d1db6e2
Robert Shih [Mon, 11 Jan 2016 23:02:12 +0000 (15:02 -0800)]
IGraphicBufferProducer: fix QUEUE_BUFFER info leak
Bug:
26338109
Change-Id: I8a979469bfe1e317ebdefa43685e19f9302baea8
Dan Stoza [Mon, 11 Jan 2016 23:41:04 +0000 (23:41 +0000)]
Merge "Revert "libgui: Remove custom BufferQueue allocators""
Dan Stoza [Mon, 11 Jan 2016 23:40:44 +0000 (23:40 +0000)]
Revert "libgui: Remove custom BufferQueue allocators"
This reverts commit
acd56150573d3a6d449c0de01f93c6f269d121e3.
Change-Id: I877f63a57fbddb4dcff71b3909b460ecc05981eb
Dan Stoza [Mon, 11 Jan 2016 20:34:03 +0000 (20:34 +0000)]
Merge "libui: Remove FramebufferNativeWindow"
Dan Stoza [Mon, 11 Jan 2016 20:27:19 +0000 (20:27 +0000)]
Merge "libgui: Remove custom BufferQueue allocators"
Dan Stoza [Mon, 11 Jan 2016 20:23:26 +0000 (20:23 +0000)]
Merge "libgui: Remove custom allocator from tests"
Robert Shih [Mon, 11 Jan 2016 19:42:48 +0000 (11:42 -0800)]
IGraphicBufferConsumer: fix ATTACH_BUFFER info leak
Bug:
26338113
Change-Id: I019c4df2c6adbc944122df96968ddd11a02ebe33
Ronghua Wu [Fri, 8 Jan 2016 18:38:57 +0000 (10:38 -0800)]
media: add OMX_VIDEO_CodingDolbyVision.
Bug:
25684127
Change-Id: I4eccb66d679a3dd4ac47556a0d206df2ebf52338
Dan Stoza [Mon, 11 Jan 2016 17:44:14 +0000 (17:44 +0000)]
Merge "libui: Make Rect constructor 32/64-bit friendly"
Dan Stoza [Fri, 8 Jan 2016 21:22:49 +0000 (13:22 -0800)]
libui: Make Rect constructor 32/64-bit friendly
Makes the width/height constructor for the Rect class more flexible
with the types of integers it will accept.
Change-Id: Id88b4e6da2f84d6826e19d1cabd93fe86ad48c8d
Ronghua Wu [Fri, 8 Jan 2016 18:25:07 +0000 (18:25 +0000)]
Revert "media: Add dolby hdr codecs to OMX_VIDEO_CODINGTYPE."
This reverts commit
1e7ebf33dca14859dc48802ffafbc761c69bb225.
Change-Id: I764c42818a3262b4316ddad2f72d527eb9a90e46
Dan Stoza [Fri, 8 Jan 2016 18:09:47 +0000 (10:09 -0800)]
libui: Remove FramebufferNativeWindow
We no longer support the framebuffer device, so FramebufferNativeWindow
is no longer relevant.
Change-Id: I97c427bb7c0b209bbf33e61900466bde7df43e85
Dan Stoza [Fri, 8 Jan 2016 17:36:21 +0000 (09:36 -0800)]
libgui: Remove custom BufferQueue allocators
Removes the ability to set a custom GraphicBuffer allocator for a
BufferQueue. Custom-allocated buffers may still be used through the
attachBuffer call.
Change-Id: I127bdfb496fc089a61c7e266c8bd2b906d41f32e
Michal Karpinski [Thu, 7 Jan 2016 20:45:02 +0000 (20:45 +0000)]
Improvements for SHA256_file_hash()
Bug:
26154009
Change-Id: I7cee0563edb7e8030716ae2925a940f3c158721e
Michal Karpinski [Fri, 11 Dec 2015 18:04:32 +0000 (18:04 +0000)]
dumpstate.cpp changes to accomodate remote bugreports
Added four new commands to dumpstate() - route, printenv, netstat
and lsmod.
Added -R flag for remote bugreports, which will send
android.intent.action.REMOTE_BUGREPORT_FINISHED broadcast with an extra
SHA256 hash counted by a new method SHA256_file_hash(path).
Bug:
26154009
Change-Id: Ibd7cb8f38dfc8f0fa3fda3e56dcd04b7d1fe68b9
Etan Cohen [Tue, 29 Sep 2015 20:48:43 +0000 (13:48 -0700)]
NAN hardware feature support definition file.
Bug:
26216681
Change-Id: Ie4623f1ed2813d6062311231a44800786104225f
Michal Karpinski [Thu, 7 Jan 2016 11:55:00 +0000 (11:55 +0000)]
Merge "Adding new bugreportremote service"
Dan Stoza [Wed, 6 Jan 2016 22:21:52 +0000 (14:21 -0800)]
libgui: Remove custom allocator from tests
The StreamSplitter test used a custom allocator to ensure that only one
GraphicBuffer was ever allocated during the test run. Now we can ensure
that by disabling allocation on the relevant BufferQueues after
allocating that one buffer, so the custom allocator is unnecessary.
Change-Id: I98289bda669c50a93ba9b70ceca1781203ad83b2
Samuel Tan [Mon, 21 Dec 2015 20:11:00 +0000 (12:11 -0800)]
Add PersistableBundle.aidl into binder includes
Add the PersistableBundle.aidl into the new /aidl/binder/
subdirectory (along with the necessary 'android' and 'os'
subdirectories) so that the aidl file will live alongside
its native implementation in libbinder. This change will
allow native-only Android checkouts (e.g. Brillo) to use
PersistableBundle.
The /aidl/ subdirectory should henceforth contain any
aidl files that live with native code.
BUG:
26292234
Change-Id: I07b49dad8afd679f33e41fa9044dffc02ec25e3e
Dan Stoza [Wed, 6 Jan 2016 18:19:28 +0000 (18:19 +0000)]
Merge "libgui: Fix attaching buffers without allocation"
Dan Stoza [Wed, 6 Jan 2016 17:20:07 +0000 (17:20 +0000)]
Merge "libgui: Add dequeue/attach timeout"
Dan Stoza [Tue, 5 Jan 2016 01:01:02 +0000 (17:01 -0800)]
libgui: Fix attaching buffers without allocation
This changes the way that BufferQueue selects slots in
waitForFreeSlotThenRelock. This method is called from both
dequeueBuffer and attachBuffer, but those two methods actually have
different preferences:
dequeueBuffer wants a slot with a buffer if possible (to avoid
unnecessary allocations), but will settle for a slot without a buffer
if no free buffers are available.
attachBuffer wants a slot without a buffer if possible (to avoid
clobbering an existing buffer), but will settle with clobbering a free
buffer if no empty slots are available.
These preferences are now respected, which has the side-effect of
fixing a bug where it was not possible to attach a buffer if allocation
is disabled (since the previous implementation assumed finding a slot
without a buffer meant that the caller intended to allocate a buffer,
which would accordingly be blocked since allocation is disabled).
Bug:
26387372
Change-Id: Iefd550fd01925d8c51d6f062d5708d1f6d517edd