OSDN Git Service
Arve Hjnnevg [Tue, 9 Aug 2016 21:04:24 +0000 (21:04 +0000)]
DO NOT MERGE ServiceManager: Restore basic uid check am:
eb304f0a36 -s ours am:
a82f82293a
am:
1c220583e4
Change-Id: Ie1ab626a476ecada3ed5171489dc3fec0cf5a1f5
Arve Hjnnevg [Tue, 9 Aug 2016 21:01:23 +0000 (21:01 +0000)]
DO NOT MERGE ServiceManager: Restore basic uid check am:
eb304f0a36 -s ours
am:
a82f82293a
Change-Id: Ib91d630f70f4fa434915ac15938c7dca94fe3de5
Arve Hjnnevg [Tue, 9 Aug 2016 20:55:23 +0000 (20:55 +0000)]
DO NOT MERGE ServiceManager: Restore basic uid check
am:
eb304f0a36 -s ours
Change-Id: I6bae641d0ec80aaba79b716ef8bcd46279aca0ed
Arve Hjnnevg [Tue, 9 Aug 2016 20:49:54 +0000 (20:49 +0000)]
DO NOT MERGE ServiceManager: Restore basic uid check am:
247ae46340
am:
171ab27931
Change-Id: I3cfc70e8fb1dd393a92ace283d36ee2b35585ea4
Arve Hjnnevg [Tue, 9 Aug 2016 20:46:49 +0000 (20:46 +0000)]
DO NOT MERGE ServiceManager: Restore basic uid check
am:
247ae46340
Change-Id: I67af781d5876b13daca82cb7e947397c94cd62e7
Arve Hjønnevåg [Mon, 1 Aug 2016 23:05:17 +0000 (16:05 -0700)]
DO NOT MERGE ServiceManager: Restore basic uid check
Prevent apps from registering services without relying on selinux checks.
Bug:
29431260
Change-Id: I38c6e8bc7f7cba1cbd3568e8fed1ae7ac2054a9b
Arve Hjønnevåg [Mon, 1 Aug 2016 23:05:17 +0000 (16:05 -0700)]
DO NOT MERGE ServiceManager: Restore basic uid check
Prevent apps from registering services without relying on selinux checks.
Bug:
29431260
Change-Id: I38c6e8bc7f7cba1cbd3568e8fed1ae7ac2054a9b
Pablo Ceballos [Mon, 13 Jun 2016 18:04:17 +0000 (18:04 +0000)]
Add FrameStats default constructor am:
9a8c42a72b am:
8cd7d257de
am:
67105cc24d
Change-Id: Icf85c944e561763b0a9c353f84d614a992168c20
Pablo Ceballos [Mon, 13 Jun 2016 18:00:25 +0000 (18:00 +0000)]
Add FrameStats default constructor am:
9a8c42a72b
am:
8cd7d257de
Change-Id: Ic0df6b15e28ac2acda566fa7f30c9460d36f2a00
Pablo Ceballos [Mon, 13 Jun 2016 17:56:06 +0000 (17:56 +0000)]
Add FrameStats default constructor
am:
9a8c42a72b
Change-Id: Ib78d68c71438391711ea3b91102408d5ad0b966b
Pablo Ceballos [Thu, 26 May 2016 22:35:55 +0000 (15:35 -0700)]
Add FrameStats default constructor
Bug
28592402
Change-Id: I857e46c9ab3ffae0d96923d665d13a4128a6cafa
Marco Nelissen [Mon, 9 May 2016 21:11:03 +0000 (21:11 +0000)]
Correctly handle dup() failure in Parcel::readNativeHandle am:
1de7966c72 am:
275c9f60f9 am:
853702ce3d am:
775f2e6dbf am:
82afbe2258
am:
c2c470c700
* commit '
c2c470c700a4e0fbbcd5b99da144f02cee7b9b3e':
Correctly handle dup() failure in Parcel::readNativeHandle
Change-Id: I68084d5f6bfd4b209c738b94a0f31fe9db113d9f
Marco Nelissen [Mon, 9 May 2016 21:05:18 +0000 (21:05 +0000)]
Correctly handle dup() failure in Parcel::readNativeHandle am:
1de7966c72 am:
275c9f60f9 am:
853702ce3d am:
775f2e6dbf
am:
82afbe2258
* commit '
82afbe2258c5c5e18ea6e9496d590cff177e67d4':
Correctly handle dup() failure in Parcel::readNativeHandle
Change-Id: I2c52991c2e6b1c5ef2eebbc4649b36c30dd9120d
Marco Nelissen [Mon, 9 May 2016 20:59:50 +0000 (20:59 +0000)]
Correctly handle dup() failure in Parcel::readNativeHandle am:
1de7966c72 am:
275c9f60f9 am:
853702ce3d
am:
775f2e6dbf
* commit '
775f2e6dbf757d1b1853337c19bf15f15a127e31':
Correctly handle dup() failure in Parcel::readNativeHandle
Change-Id: Ibfc37203a33c603df365ed9cbb85632d34acafbd
Marco Nelissen [Mon, 9 May 2016 20:54:25 +0000 (20:54 +0000)]
Correctly handle dup() failure in Parcel::readNativeHandle am:
1de7966c72 am:
275c9f60f9
am:
853702ce3d
* commit '
853702ce3d1ba5e45ce58f332ed1d40008a44375':
Correctly handle dup() failure in Parcel::readNativeHandle
Change-Id: I2b8f6070ecc873d67be5a4c72ca870606af93a3d
Marco Nelissen [Mon, 9 May 2016 20:48:32 +0000 (20:48 +0000)]
Correctly handle dup() failure in Parcel::readNativeHandle am:
1de7966c72
am:
275c9f60f9
* commit '
275c9f60f94780bd686eca9750ec41cc1fafa333':
Correctly handle dup() failure in Parcel::readNativeHandle
Change-Id: I6516dea7eac82d06e1ffd1d269dbb6415fece948
Marco Nelissen [Mon, 9 May 2016 20:43:16 +0000 (20:43 +0000)]
Correctly handle dup() failure in Parcel::readNativeHandle
am:
1de7966c72
* commit '
1de7966c72981aebc3c7f9978ab129678ac89258':
Correctly handle dup() failure in Parcel::readNativeHandle
Change-Id: Ie043622a17b241c489429273d369e9a478b7ebcc
Marco Nelissen [Tue, 26 Apr 2016 15:44:09 +0000 (08:44 -0700)]
Correctly handle dup() failure in Parcel::readNativeHandle
bail out if dup() fails, instead of creating an invalid native_handle_t
Bug:
28395952
Change-Id: Ia1a6198c0f45165b9c6a55a803e5f64d8afa0572
Dianne Hackborn [Wed, 23 Mar 2016 22:22:54 +0000 (22:22 +0000)]
Fix issue #
27252896: Security Vulnerability -- weak binder am:
41e7b17 am:
74d2c4b -s ours am:
162fecd
am:
5ad8d44
* commit '
5ad8d443776e74a56e0e461ae6d333cf52e4f591':
Fix issue #
27252896: Security Vulnerability -- weak binder
Dianne Hackborn [Wed, 23 Mar 2016 22:17:30 +0000 (22:17 +0000)]
Fix issue #
27252896: Security Vulnerability -- weak binder am:
41e7b17 am:
74d2c4b -s ours
am:
162fecd
* commit '
162fecdc2c98844faaa6cb43a4fbe854f511b077':
Fix issue #
27252896: Security Vulnerability -- weak binder
Dianne Hackborn [Wed, 23 Mar 2016 22:15:19 +0000 (22:15 +0000)]
Fix issue #
27252896: Security Vulnerability -- weak binder am:
41e7b17
am:
74d2c4b -s ours
* commit '
74d2c4b4c97dbbcf43a9f8870007593d61beb547':
Fix issue #
27252896: Security Vulnerability -- weak binder
Dianne Hackborn [Wed, 23 Mar 2016 22:10:22 +0000 (22:10 +0000)]
Fix issue #
27252896: Security Vulnerability -- weak binder am:
12bafe2
am:
b4f0f33
* commit '
b4f0f339c714be74cf0ae17e4c88620130b02121':
Fix issue #
27252896: Security Vulnerability -- weak binder
Dianne Hackborn [Wed, 23 Mar 2016 22:07:32 +0000 (22:07 +0000)]
Fix issue #
27252896: Security Vulnerability -- weak binder
am:
41e7b17
* commit '
41e7b1780f106d2eb4304b1f9cf060ce44177cae':
Fix issue #
27252896: Security Vulnerability -- weak binder
Dianne Hackborn [Wed, 23 Mar 2016 22:05:06 +0000 (22:05 +0000)]
Fix issue #
27252896: Security Vulnerability -- weak binder
am:
12bafe2
* commit '
12bafe205c236da50f34ed85adf62a5631525ab6':
Fix issue #
27252896: Security Vulnerability -- weak binder
Dianne Hackborn [Mon, 21 Mar 2016 17:36:54 +0000 (10:36 -0700)]
Fix issue #
27252896: Security Vulnerability -- weak binder
Sending transaction to freed BBinder through weak handle
can cause use of a (mostly) freed object. We need to try to
safely promote to a strong reference first.
Change-Id: Ic9c6940fa824980472e94ed2dfeca52a6b0fd342
(manually cherry picked and resolved conflicts from commit
c11146106f94e07016e8e26e4f8628f9a0c73199)
Dianne Hackborn [Mon, 21 Mar 2016 17:36:54 +0000 (10:36 -0700)]
Fix issue #
27252896: Security Vulnerability -- weak binder
Sending transaction to freed BBinder through weak handle
can cause use of a (mostly) freed object. We need to try to
safely promote to a strong reference first.
Change-Id: Ic9c6940fa824980472e94ed2dfeca52a6b0fd342
(cherry picked from commit
c11146106f94e07016e8e26e4f8628f9a0c73199)
Pablo Ceballos [Fri, 18 Mar 2016 20:33:21 +0000 (20:33 +0000)]
Merge "DO NOT MERGE BQ: fix some uninitialized variables" into klp-dev am:
b4eac74 am:
dc5d0f4 -s ours am:
12a01ba -s ours
am:
6fdc372
* commit '
6fdc37205c32dcbd23718d68e45806c76f1536f8':
DO NOT MERGE BQ: fix some uninitialized variables
Pablo Ceballos [Fri, 18 Mar 2016 20:33:20 +0000 (20:33 +0000)]
BQ: fix some uninitialized variables am:
93c617f
am:
f16b857
* commit '
f16b85752d7344814663c658175cce1a933e976b':
BQ: fix some uninitialized variables
Pablo Ceballos [Fri, 18 Mar 2016 20:28:44 +0000 (20:28 +0000)]
Merge "DO NOT MERGE BQ: fix some uninitialized variables" into klp-dev am:
b4eac74 am:
dc5d0f4 -s ours
am:
12a01ba -s ours
* commit '
12a01ba5f4f3f8ba122dfbf689e976019f353b3d':
DO NOT MERGE BQ: fix some uninitialized variables
Pablo Ceballos [Fri, 18 Mar 2016 20:28:43 +0000 (20:28 +0000)]
BQ: fix some uninitialized variables
am:
93c617f
* commit '
93c617fd2a5e7910e0ba5c0ed6da152d30920679':
BQ: fix some uninitialized variables
Pablo Ceballos [Fri, 18 Mar 2016 18:03:50 +0000 (18:03 +0000)]
Merge "DO NOT MERGE BQ: fix some uninitialized variables" into klp-dev am:
b4eac74
am:
dc5d0f4 -s ours
* commit '
dc5d0f46de1f8a800b3af340ca57278989df151a':
DO NOT MERGE BQ: fix some uninitialized variables
Pablo Ceballos [Fri, 18 Mar 2016 18:01:32 +0000 (18:01 +0000)]
Merge "DO NOT MERGE BQ: fix some uninitialized variables" into klp-dev
am:
b4eac74
* commit '
b4eac742c9e3f0238d5d03b237b2038df885ed2c':
DO NOT MERGE BQ: fix some uninitialized variables
Pablo Ceballos [Fri, 18 Mar 2016 17:52:55 +0000 (17:52 +0000)]
Merge "DO NOT MERGE BQ: fix some uninitialized variables" into klp-dev
Pablo Ceballos [Wed, 16 Mar 2016 01:10:49 +0000 (18:10 -0700)]
DO NOT MERGE BQ: fix some uninitialized variables
Bug
27555981
Bug
27556038
Change-Id: I436b6fec589677d7e36c0e980f6e59808415dc0e
Pablo Ceballos [Wed, 16 Mar 2016 01:10:49 +0000 (18:10 -0700)]
BQ: fix some uninitialized variables
Bug
27555981
Bug
27556038
Change-Id: I436b6fec589677d7e36c0e980f6e59808415dc0e
Pablo Ceballos [Tue, 23 Feb 2016 01:08:33 +0000 (01:08 +0000)]
DO NOT MERGE Add SN logging am:
24cd2b9627 am:
ec7538a254 -s ours am:
aaeceb2379 -s ours
am:
828f6f1489
* commit '
828f6f1489f546da0ebccd929dd3b819f9d45efd':
DO NOT MERGE Add SN logging
Pablo Ceballos [Tue, 23 Feb 2016 00:54:18 +0000 (00:54 +0000)]
DO NOT MERGE Add SN logging am:
24cd2b9627 am:
ec7538a254 -s ours
am:
aaeceb2379 -s ours
* commit '
aaeceb2379957791f7a78b441c23c55535a7ba43':
DO NOT MERGE Add SN logging
Pablo Ceballos [Tue, 23 Feb 2016 00:47:33 +0000 (00:47 +0000)]
Pablo Ceballos [Tue, 23 Feb 2016 00:40:58 +0000 (00:40 +0000)]
DO NOT MERGE Add SN logging am:
24cd2b9627
am:
ec7538a254 -s ours
* commit '
ec7538a254f283afc7b046aa8ca2fe908d4e3b0c':
DO NOT MERGE Add SN logging
Pablo Ceballos [Tue, 23 Feb 2016 00:34:17 +0000 (00:34 +0000)]
DO NOT MERGE Add SN logging
am:
24cd2b9627
* commit '
24cd2b96279ac29b936ba09ed708b1bcb922d04c':
DO NOT MERGE Add SN logging
Pablo Ceballos [Tue, 23 Feb 2016 00:34:17 +0000 (00:34 +0000)]
Pablo Ceballos [Sat, 20 Feb 2016 19:30:43 +0000 (11:30 -0800)]
DO NOT MERGE Add SN logging
Bug
27046057
Change-Id: I942876c09fdbe841c19807e463f5426287e07803
Pablo Ceballos [Sat, 20 Feb 2016 19:26:13 +0000 (11:26 -0800)]
Add SN logging
Bug
27046057
Change-Id: Iede7c92e59e60795df1ec7768ebafd6b090f1c27
Pablo Ceballos [Sat, 20 Feb 2016 00:22:58 +0000 (00:22 +0000)]
Merge "DO NOT MERGE BQ: Add permission check to BufferQueueConsumer::dump" into klp-dev am:
c232606413 am:
1d0e811e5a -s ours am:
8b6dea4fa8 -s ours
am:
84cd1a325d
* commit '
84cd1a325d4e1ff1bdec09137b13a7c925b267f8':
DO NOT MERGE BQ: Add permission check to BufferQueueConsumer::dump
Pablo Ceballos [Sat, 20 Feb 2016 00:11:58 +0000 (00:11 +0000)]
Merge "DO NOT MERGE BQ: Add permission check to BufferQueueConsumer::dump" into klp-dev am:
c232606413 am:
1d0e811e5a -s ours
am:
8b6dea4fa8 -s ours
* commit '
8b6dea4fa88e967c221821e03f88b8f42585869e':
DO NOT MERGE BQ: Add permission check to BufferQueueConsumer::dump
Pablo Ceballos [Sat, 20 Feb 2016 00:06:10 +0000 (00:06 +0000)]
Merge "BQ: Add permission check to BufferQueueConsumer::dump" into lmp-dev am:
793be16dd3
am:
7e83de0114
* commit '
7e83de0114538b006b4299fd608983ecd61b6422':
BQ: Add permission check to BufferQueueConsumer::dump
Pablo Ceballos [Sat, 20 Feb 2016 00:00:50 +0000 (00:00 +0000)]
Merge "DO NOT MERGE BQ: Add permission check to BufferQueueConsumer::dump" into klp-dev am:
c232606413
am:
1d0e811e5a -s ours
* commit '
1d0e811e5ac853669fe96370e499428049a5b7ee':
DO NOT MERGE BQ: Add permission check to BufferQueueConsumer::dump
Pablo Ceballos [Fri, 19 Feb 2016 23:54:34 +0000 (23:54 +0000)]
Merge "DO NOT MERGE BQ: Add permission check to BufferQueueConsumer::dump" into klp-dev
am:
c232606413
* commit '
c2326064136adb834d12c3fed47af5d66cd42c15':
DO NOT MERGE BQ: Add permission check to BufferQueueConsumer::dump
Pablo Ceballos [Fri, 19 Feb 2016 23:54:33 +0000 (23:54 +0000)]
Merge "BQ: Add permission check to BufferQueueConsumer::dump" into lmp-dev
am:
793be16dd3
* commit '
793be16dd31661e0e95915caa6fc99afc4acc3f6':
BQ: Add permission check to BufferQueueConsumer::dump
Pablo Ceballos [Fri, 19 Feb 2016 23:39:53 +0000 (23:39 +0000)]
Merge "BQ: Add permission check to BufferQueueConsumer::dump" into lmp-dev
Pablo Ceballos [Fri, 19 Feb 2016 23:39:36 +0000 (23:39 +0000)]
Merge "DO NOT MERGE BQ: Add permission check to BufferQueueConsumer::dump" into klp-dev
Christopher Tate [Wed, 17 Feb 2016 19:10:12 +0000 (19:10 +0000)]
Sanity check IMemory access versus underlying mmap am:
94b0d4e3ab am:
ef6908e2b3 am:
97f49e50de
am:
84f488f354
* commit '
84f488f354c33a7ece30cb569c85cd91f0259066':
Sanity check IMemory access versus underlying mmap
Christopher Tate [Wed, 17 Feb 2016 18:57:42 +0000 (18:57 +0000)]
Sanity check IMemory access versus underlying mmap am:
94b0d4e3ab am:
ef6908e2b3
am:
97f49e50de
* commit '
97f49e50ded651f1ddcf8a9981a7d97fe2816ad7':
Sanity check IMemory access versus underlying mmap
Christopher Tate [Wed, 17 Feb 2016 18:44:11 +0000 (18:44 +0000)]
Sanity check IMemory access versus underlying mmap am:
94b0d4e3ab
am:
ef6908e2b3
* commit '
ef6908e2b3e6ee6514620acc338b458ade7c3640':
Sanity check IMemory access versus underlying mmap
Christopher Tate [Wed, 17 Feb 2016 18:37:52 +0000 (18:37 +0000)]
Sanity check IMemory access versus underlying mmap
am:
94b0d4e3ab
* commit '
94b0d4e3ab023cfa03a7a4e85f3e09d3743da715':
Sanity check IMemory access versus underlying mmap
Christopher Tate [Sat, 6 Feb 2016 03:02:56 +0000 (19:02 -0800)]
Sanity check IMemory access versus underlying mmap
Bug
26877992
Change-Id: Ibbf4b1061e4675e4e96bc944a865b53eaf6984fe
Pablo Ceballos [Fri, 12 Feb 2016 02:01:49 +0000 (18:01 -0800)]
BQ: Add permission check to BufferQueueConsumer::dump
Bug
27046057
Change-Id: Id7bd8cf95045b497943ea39dde49e877aa6f5c4e
Pablo Ceballos [Fri, 12 Feb 2016 03:15:35 +0000 (19:15 -0800)]
DO NOT MERGE BQ: Add permission check to BufferQueueConsumer::dump
Bug
27046057
Change-Id: I387178708f460596433f75bb059854a26cc22e78
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: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
Robert Shih [Mon, 11 Jan 2016 23:02:12 +0000 (15:02 -0800)]
IGraphicBufferProducer: fix QUEUE_BUFFER info leak
Bug:
26338109
Change-Id: I8a979469bfe1e317ebdefa43685e19f9302baea8
Robert Shih [Mon, 11 Jan 2016 19:42:48 +0000 (11:42 -0800)]
IGraphicBufferConsumer: fix ATTACH_BUFFER info leak
Bug:
26338113
Change-Id: I019c4df2c6adbc944122df96968ddd11a02ebe33
Nick Kralevich [Fri, 23 Oct 2015 04:32:47 +0000 (04:32 +0000)]
DO NOT MERGE: fix build try #2 am:
778b6f4902 am:
034bc1799c -s ours am:
dbc9a47831 -s ours
am:
a2685ebb1e
* commit '
a2685ebb1ec5ed523fb4800d2593f2ae0c10ed22':
DO NOT MERGE: fix build try #2
Nick Kralevich [Fri, 23 Oct 2015 04:26:03 +0000 (04:26 +0000)]
DO NOT MERGE: fix build try #2 am:
778b6f4902 am:
034bc1799c -s ours
am:
dbc9a47831 -s ours
* commit '
dbc9a478311e8728c8148a80abb103fca697891d':
DO NOT MERGE: fix build try #2
Nick Kralevich [Fri, 23 Oct 2015 04:19:51 +0000 (04:19 +0000)]
DO NOT MERGE: fix build try #2 am:
778b6f4902
am:
034bc1799c -s ours
* commit '
034bc1799cbbc4184aa507eba181573c0a3b9b35':
DO NOT MERGE: fix build try #2
Nick Kralevich [Fri, 23 Oct 2015 04:15:21 +0000 (04:15 +0000)]
DO NOT MERGE: fix build try #2
am:
778b6f4902
* commit '
778b6f4902ad824d5fc62071caaa837bb47deee5':
DO NOT MERGE: fix build try #2
Nick Kralevich [Fri, 23 Oct 2015 02:02:42 +0000 (02:02 +0000)]
resolve merge conflicts of
834ac204ce to klp-modular-dev. am:
7f1ea80d65 am:
fa632f6ad7
am:
9ec978732f
* commit '
9ec978732f8dd82e7adef3e37097eaca3fbd65f0':
DO NOT MERGE: fix build breakage
Nick Kralevich [Fri, 23 Oct 2015 01:52:34 +0000 (01:52 +0000)]
resolve merge conflicts of
834ac204ce to klp-modular-dev. am:
7f1ea80d65
am:
fa632f6ad7
* commit '
fa632f6ad7be6b1f488dd3d1b825a82456db5097':
DO NOT MERGE: fix build breakage
Nick Kralevich [Fri, 23 Oct 2015 01:44:26 +0000 (01:44 +0000)]
resolve merge conflicts of
834ac204ce to klp-modular-dev.
am:
7f1ea80d65
* commit '
7f1ea80d65996ab687ff56a884da915535cdc176':
DO NOT MERGE: fix build breakage
Nick Kralevich [Fri, 23 Oct 2015 00:26:19 +0000 (17:26 -0700)]
resolve merge conflicts of
834ac204ce to klp-modular-dev.
Bug:
23905002
Change-Id: Ic7262861af91a8fff27692c0f68761cb3ab12aa3
Nick Kralevich [Thu, 22 Oct 2015 21:48:50 +0000 (14:48 -0700)]
DO NOT MERGE: fix build try #2
On klp-dev, UINT16_MAX isn't available unless __STDINT_LIMITS
is defined, which it's not for this code. This isn't relevant
for later branches due to bionic commit
e2a292d278b94fec3d078b1f1b27c1f89942c276
Don't use UINT16_MAX when we can just hardcode 65535.
Bug:
23905002
Change-Id: Ia1fd0f749cb7a4d19866075abc28ed6960424e54
Nick Kralevich [Thu, 22 Oct 2015 14:09:23 +0000 (07:09 -0700)]
DO NOT MERGE: fix build breakage
fix klp-dev only build breakage.
frameworks/native/libs/input/Input.cpp: In member function 'android::status_t android::MotionEvent::readFromParcel(android::Parcel*)':
frameworks/native/libs/input/Input.cpp:494:47: error: 'UINT16_MAX' was not declared in this scope
Bug:
23905002
Change-Id: I4b6b864ca64d39a8873d045a61e0ddaea2ab9109
Flanker [Thu, 22 Oct 2015 02:15:13 +0000 (02:15 +0000)]
add number constraint for samples per MotionEvent am:
5d17838ade am:
72c8ca4a01 am:
9964d83869
am:
90dc6dc825
* commit '
90dc6dc825ebd1f0f4c9474fad887cd7eac8e9bd':
add number constraint for samples per MotionEvent
Flanker [Thu, 22 Oct 2015 02:10:12 +0000 (02:10 +0000)]
add number constraint for samples per MotionEvent am:
5d17838ade am:
72c8ca4a01
am:
9964d83869
* commit '
9964d83869565cf4dda432129cfe50f6ede19338':
add number constraint for samples per MotionEvent
Flanker [Thu, 22 Oct 2015 02:04:55 +0000 (02:04 +0000)]
add number constraint for samples per MotionEvent am:
5d17838ade
am:
72c8ca4a01
* commit '
72c8ca4a0191827fd3265c0820b685a6cf420be1':
add number constraint for samples per MotionEvent
Flanker [Thu, 22 Oct 2015 02:02:46 +0000 (02:02 +0000)]
add number constraint for samples per MotionEvent
am:
5d17838ade
* commit '
5d17838adef13062717322e79d4db0b9bb6b2395':
add number constraint for samples per MotionEvent
Flanker [Mon, 7 Sep 2015 07:28:58 +0000 (15:28 +0800)]
add number constraint for samples per MotionEvent
Bug:
23905002
Signed-off-by: Adam Lesinski <adamlesinski@google.com>
(cherry picked from commit
552a8a5d8df32f659b8d11311a244cdc6d3b7733)
Change-Id: I9b7ea859889b7697bee4165a2746602212120543
Naveen Leekha [Tue, 20 Oct 2015 16:42:34 +0000 (16:42 +0000)]
am
18165848: am
e2c4f4fb: am
c1e6fbb5: Initialize local variables to avoid data leak
am:
7534e4e63a -s ours
* commit '
7534e4e63afedeb826a8d8a4b0cf3f9d40d243ea':
Initialize local variables to avoid data leak
Naveen Leekha [Thu, 24 Sep 2015 22:55:21 +0000 (15:55 -0700)]
resolved conflicts for
7534e4e6 to lmp-mr1-ub-dev
Change-Id: I543df164076b44578b14d41031800bb62b81586d
Naveen Leekha [Thu, 24 Sep 2015 22:20:05 +0000 (22:20 +0000)]
am
18165848: am
e2c4f4fb: am
c1e6fbb5: Initialize local variables to avoid data leak
* commit '
18165848e86feab8656bfdac3173bccf45a9a6df':
Initialize local variables to avoid data leak
Naveen Leekha [Thu, 24 Sep 2015 22:13:06 +0000 (22:13 +0000)]
am
73887c08: am
b414255f: Initialize local variables to avoid data leak
* commit '
73887c0864c9a928db6f66bd48c5aea4d31d9a8b':
Initialize local variables to avoid data leak
Naveen Leekha [Thu, 24 Sep 2015 22:04:48 +0000 (22:04 +0000)]
am
e2c4f4fb: am
c1e6fbb5: Initialize local variables to avoid data leak
* commit '
e2c4f4fb8b34e36a4f2760f3812c942604cabfb6':
Initialize local variables to avoid data leak
Naveen Leekha [Thu, 24 Sep 2015 22:00:33 +0000 (22:00 +0000)]
am
b414255f: Initialize local variables to avoid data leak
* commit '
b414255f53b560a06e642251535b019327ba0d7b':
Initialize local variables to avoid data leak
Naveen Leekha [Thu, 24 Sep 2015 22:00:13 +0000 (22:00 +0000)]
am
c1e6fbb5: Initialize local variables to avoid data leak
* commit '
c1e6fbb52c3f85cc7610d1d07d12be38f70b4ed4':
Initialize local variables to avoid data leak
Naveen Leekha [Wed, 23 Sep 2015 01:04:44 +0000 (18:04 -0700)]
Initialize local variables to avoid data leak
The uninitialized local variables pick up
whatever the memory content was there on stack.
This data gets sent to the remote process in
case of a failed transaction, which is a security
issue. Fixed.
(Partial manual merge of master change
12ba0f57d028a9c8f4eb3afddc326b70677d1e0c. Rest
to automerge from klp-dev)
For b/
23696300
Change-Id: I704c9fab327b3545c58e8a9a96ac542eb7469c2a
Naveen Leekha [Wed, 23 Sep 2015 00:58:21 +0000 (17:58 -0700)]
Initialize local variables to avoid data leak
The uninitialized local variables pick up
whatever the memory content was there on stack.
This data gets sent to the remote process in
case of a failed transaction, which is a security
issue. Fixed.
(Manual merge of master change
12ba0f57d028a9c8f4eb3afddc326b70677d1e0c )
For b/
23696300
Change-Id: I665212d10da56f0803b5bb772d14c77e632ba2ab
Christopher Tate [Thu, 2 Jul 2015 02:57:06 +0000 (02:57 +0000)]
am
35851e2a: am
38ff2b44: am
c1d8af50: am
3a9b9aec: am
dc3d6af9: am
bb686c25: Disregard alleged binder entities beyond parcel bounds
* commit '
35851e2abbfe8f1d9c4cc7dc13a6e6e155b61664':
Disregard alleged binder entities beyond parcel bounds
Christopher Tate [Thu, 2 Jul 2015 02:45:16 +0000 (02:45 +0000)]
am
38ff2b44: am
c1d8af50: am
3a9b9aec: am
dc3d6af9: am
bb686c25: Disregard alleged binder entities beyond parcel bounds
* commit '
38ff2b44ad7a64768cd1bb8793ec6c45e8d1e68e':
Disregard alleged binder entities beyond parcel bounds
Christopher Tate [Thu, 2 Jul 2015 02:33:03 +0000 (02:33 +0000)]
am
c1d8af50: am
3a9b9aec: am
dc3d6af9: am
bb686c25: Disregard alleged binder entities beyond parcel bounds
* commit '
c1d8af50c314164c0e6760d364b47d16b8d423ee':
Disregard alleged binder entities beyond parcel bounds
Christopher Tate [Thu, 2 Jul 2015 02:18:21 +0000 (02:18 +0000)]
am
110654ae: am
8e44d0a1: am
0804ed8e: am
1b8a2f82: Disregard alleged binder entities beyond parcel bounds
* commit '
110654ae44e45b1afd5badd24ada96cb9018bed1':
Disregard alleged binder entities beyond parcel bounds
Christopher Tate [Thu, 2 Jul 2015 02:07:24 +0000 (02:07 +0000)]
am
3a9b9aec: am
dc3d6af9: am
bb686c25: Disregard alleged binder entities beyond parcel bounds
* commit '
3a9b9aec7a0c04b74a278be5773fcfdaa2a04f4e':
Disregard alleged binder entities beyond parcel bounds
Christopher Tate [Thu, 2 Jul 2015 02:06:40 +0000 (02:06 +0000)]
am
8e44d0a1: am
0804ed8e: am
1b8a2f82: Disregard alleged binder entities beyond parcel bounds
* commit '
8e44d0a173d1f0ec4075778791c88dc392f3981e':
Disregard alleged binder entities beyond parcel bounds
Christopher Tate [Thu, 2 Jul 2015 01:55:53 +0000 (01:55 +0000)]
am
0804ed8e: am
1b8a2f82: Disregard alleged binder entities beyond parcel bounds
* commit '
0804ed8e604f2c4304fa7be3a84f429f770221bf':
Disregard alleged binder entities beyond parcel bounds
Christopher Tate [Thu, 2 Jul 2015 01:55:43 +0000 (01:55 +0000)]
am
708b42e0: am
eba7afcc: am
2f340be3: Disregard alleged binder entities beyond parcel bounds
* commit '
708b42e0ee5ad97b8426a6245f73131ddfc59a33':
Disregard alleged binder entities beyond parcel bounds
Christopher Tate [Thu, 2 Jul 2015 01:42:09 +0000 (01:42 +0000)]
am
dc3d6af9: am
bb686c25: Disregard alleged binder entities beyond parcel bounds
* commit '
dc3d6af97d521678981c773ad9f4e1da088d7870':
Disregard alleged binder entities beyond parcel bounds
Christopher Tate [Thu, 2 Jul 2015 01:41:09 +0000 (01:41 +0000)]
am
eba7afcc: am
2f340be3: Disregard alleged binder entities beyond parcel bounds
* commit '
eba7afcc14f55e7fd32db9254f2b186108e1c776':
Disregard alleged binder entities beyond parcel bounds
OSDN Git Service
