OSDN Git Service
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 22:02:33 +0000 (22:02 +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
am:
fdd9851 -s ours
* commit '
fdd9851ba326132c11d177bf5152b0c66cd87764':
DO NOT MERGE BQ: fix some uninitialized variables
Pablo Ceballos [Fri, 18 Mar 2016 22:02:32 +0000 (22:02 +0000)]
BQ: fix some uninitialized variables am:
93c617f am:
f16b857
am:
1ed2469
* commit '
1ed24698aa431aa4c3198fa3b8e830f1c29812a6':
BQ: fix some uninitialized variables
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:14:45 +0000 (01:14 +0000)]
DO NOT MERGE Add SN logging am:
24cd2b9627 am:
ec7538a254 -s ours am:
aaeceb2379 -s ours am:
828f6f1489
am:
ccc5d9a0f7 -s ours
* commit '
ccc5d9a0f7c2d7e59c9374775ff0d12378d402c6':
DO NOT MERGE Add SN logging
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:54:18 +0000 (00:54 +0000)]
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:28:10 +0000 (00:28 +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
am:
31b8553cee -s ours
* commit '
31b8553ceece9a4e3130510b484163e10c4fc588':
DO NOT MERGE BQ: Add permission check to BufferQueueConsumer::dump
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:11:58 +0000 (00:11 +0000)]
Merge "BQ: Add permission check to BufferQueueConsumer::dump" into lmp-dev am:
793be16dd3 am:
7e83de0114
am:
f419ec1bfb
* commit '
f419ec1bfb969f1add4c90b5b188041968f5f227':
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:16:19 +0000 (19:16 +0000)]
Sanity check IMemory access versus underlying mmap am:
94b0d4e3ab am:
ef6908e2b3 am:
97f49e50de am:
84f488f354
am:
ebdad60d6b
* commit '
ebdad60d6b0560493e50092c30888d3a7b5cc8c9':
Sanity check IMemory access versus underlying mmap
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: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)]
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: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: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
Lajos Molnar [Fri, 13 Nov 2015 00:00:19 +0000 (00:00 +0000)]
Merge "OMX: clarify EOS signaling for tunneled decoders" into mnc-dev
Nick Kralevich [Fri, 23 Oct 2015 04:36:16 +0000 (04:36 +0000)]
DO NOT MERGE: fix build try #2 am:
778b6f4902 am:
034bc1799c -s ours am:
dbc9a47831 -s ours am:
a2685ebb1e
am:
1d94a1d036 -s ours
* commit '
1d94a1d036cb4bc8d9b178f56fa3bbddc81b7f10':
DO NOT MERGE: fix build try #2
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:24 +0000 (04:15 +0000)]
resolve merge conflicts of
834ac204ce to klp-modular-dev. am:
7f1ea80d65 am:
fa632f6ad7 am:
9ec978732f
am:
1b28b05d2e
* commit '
1b28b05d2edf11f49717b53cd49a9161892f0388':
DO NOT MERGE: fix build breakage
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
Flanker [Thu, 22 Oct 2015 22:28:01 +0000 (22:28 +0000)]
add number constraint for samples per MotionEvent am:
5d17838ade am:
72c8ca4a01 am:
9964d83869 am:
90dc6dc825
am:
9830f11dc6
* commit '
9830f11dc6b6aa4001c79147966fdb9eaa71c2f2':
add number constraint for samples per MotionEvent
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:54:09 +0000 (16:54 +0000)]
am
18165848: am
e2c4f4fb: am
c1e6fbb5: Initialize local variables to avoid data leak am:
7534e4e63a -s ours
am:
7b4863f606
* commit '
7b4863f606bdb48b188b0235447dfaba6c8c3cf0':
Initialize local variables to avoid data leak
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 23:27:31 +0000 (23:27 +0000)]
am
c4bd7211: resolved conflicts for
7534e4e6 to lmp-mr1-ub-dev
* commit '
c4bd7211373cf5b745c7d4f849f43f7a2d2b1141':
resolved conflicts for
7534e4e6 to lmp-mr1-ub-dev
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:59 +0000 (22:20 +0000)]
am
e889592e: am
73887c08: am
b414255f: Initialize local variables to avoid data leak
* commit '
e889592e33891c9b88ff6ba655426118f8ef12ee':
Initialize local variables to avoid data leak
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
Prashant Malani [Fri, 21 Aug 2015 00:19:05 +0000 (17:19 -0700)]
Add body sensors app op for custom sensors
If the custom sensor requires the BODY SENSOR permission, we should add
the body sensors app op for the custom sensor
Bug:
23396558
Change-Id: I132917d1bca12c76c8a9fb146e00951cba3e6d7a
Glenn Kasten [Fri, 28 Aug 2015 03:09:39 +0000 (20:09 -0700)]
Add XML for pro audio feature
Bug:
23604253
Change-Id: I480cf0a46c286badc6fd95a3b42e6cb1ed056b1b
Mark Salyzyn [Thu, 30 Jul 2015 21:57:09 +0000 (14:57 -0700)]
dumpstate: add logcat -b all -S
(cherry pick from commit
e3c4df96083231b519dad919fd0ed6624100b368)
- For those that are proud to call themselves logspam police
- Every time someone declares that something is too chatty, or that
they lost their logs because they were declared too chatty and
their associated logs were aggresively pruned we generally
ask them to report the logger statistics to pinpoint what software
product that is the elephant in the room.
- Every time we want to spawn a new 'stop being so spammy' bug spawned
off a bugreport collected for another purpose, we *wish* we had the
logger statistics to help add gravitas to the claim that some piece
of software is the top, or near the top, polluter.
Bug:
22351810
Change-Id: Ifae33cd21d0ae2917a3b4381502d723725b1701c
Lajos Molnar [Fri, 7 Aug 2015 17:07:07 +0000 (10:07 -0700)]
OMX: clarify EOS signaling for tunneled decoders
Bug:
22859209
Change-Id: Ie28da1b80e4a8dd5ae2806e300ed37287c9c57a8
Michael Wright [Thu, 6 Aug 2015 14:17:31 +0000 (15:17 +0100)]
DO NOT MERGE Add new media navigation keys.
Bug:
22059484
Change-Id: I587eb7622555194f18f403da583e3b70656a530e
Naveen Leekha [Mon, 3 Aug 2015 14:45:11 +0000 (14:45 +0000)]
Merge "Fix parsing of extension string" into mnc-dev
Michael Lentine [Tue, 28 Jul 2015 23:30:10 +0000 (16:30 -0700)]
Fix parsing of extension string
Previously the parsing found the next space and then added the the difference
between the current position and space to the set of tokens. This improperly
generated empty strings if there were consecutive spaces or if spaces existed at
the beginning or end of strings. To fix this, the parse is modified to use
simple stringstream parsing.
Bug:
22709246
Change-Id: I9e32c07bbf984eadccdadf1dc34437fa0c46088b
Dan Stoza [Wed, 29 Jul 2015 23:15:50 +0000 (16:15 -0700)]
SF: Allow present if sideband stream changed
Allows the sideband layer to be passed all the way to HWC instead of
getting blocked by the updated PTS tracking code.
Bug:
22291067
Change-Id: Ic2f20a7528e276fff054e86ca35789c26873b348
Narayan Kamath [Wed, 29 Jul 2015 09:41:23 +0000 (09:41 +0000)]
Merge "Revert "Bug fix in SensorManager."" into mnc-dev
Narayan Kamath [Wed, 29 Jul 2015 09:36:05 +0000 (09:36 +0000)]
Revert "Bug fix in SensorManager."
This reverts commit
869eb2089ec8a6286b944bfcff57e4cbe0c7e207.
Change-Id: I4fb865e3b18bbb011fa4e4b4732336930c3a45ae
Aravind Akella [Wed, 29 Jul 2015 00:21:09 +0000 (00:21 +0000)]
Merge "Bug fix in SensorManager." into mnc-dev
Aravind Akella [Fri, 24 Jul 2015 18:08:41 +0000 (11:08 -0700)]
Bug fix in SensorManager.
If SensorService hasn't started when SensorManager instance is requested, keep retrying for a
longer duration.
Bug:
22529981
Change-Id: I4ba6b760608e34d79273aeb39568f0fa72fbaf9d
Jim Miller [Fri, 24 Jul 2015 02:41:02 +0000 (02:41 +0000)]
Merge "Add FEATURE_FINGERPRINT to PackageManager's feature list" into mnc-dev
Jim Miller [Thu, 23 Jul 2015 02:56:05 +0000 (19:56 -0700)]
Add FEATURE_FINGERPRINT to PackageManager's feature list
Fixes bug
22674557
Change-Id: I2ced132c1cb4f4b5166f9af288dd3e697fdcf92b
Chenjie Luo [Wed, 22 Jul 2015 06:26:27 +0000 (06:26 +0000)]
Merge "Check for the presence of accel and magnetometer sensors before adding AOSP fusion sensors." into mnc-dev
Aravind Akella [Tue, 21 Jul 2015 00:29:33 +0000 (17:29 -0700)]
Check for the presence of accel and magnetometer sensors before adding AOSP fusion sensors.
Bug:
22502485
Change-Id: I3d9018649302b98004e4e216b2173e8411a08501
Lajos Molnar [Tue, 21 Jul 2015 00:22:18 +0000 (00:22 +0000)]
Merge "omx: fix structure sizes to be the same on 32 and 64-bit builds" into mnc-dev
Lajos Molnar [Mon, 20 Jul 2015 22:29:24 +0000 (15:29 -0700)]
omx: fix structure sizes to be the same on 32 and 64-bit builds
Bug:
22512621
Change-Id: I2100b8aad0a1cf110936f4a765718ba97f3d8ce7
Jeff Sharkey [Mon, 20 Jul 2015 23:26:19 +0000 (16:26 -0700)]
Only restorecon_data once for all users.
restorecon_data already iterates across all found users internally,
so we don't need to call it for each UID moved. In fact, this was a
bug that caused data for the owner to be relabeled when moving apps
back to internal storage.
Bug:
21813384
Change-Id: I5ba76d4f30d129365864c8a25b665f344b99a6b4
OSDN Git Service
