OSDN Git Service
Jerry Zhang [Fri, 10 Feb 2017 00:01:00 +0000 (00:01 +0000)]
Merge "Update MtpFfsHandle tests, add new tests for small and partial files" am:
ddc029afc7 am:
47c772f677
am:
61c034aa35
Change-Id: I4069f3cbc89e3fefdbcec1ae06f83980dadb3d85
Jerry Zhang [Thu, 9 Feb 2017 23:55:50 +0000 (23:55 +0000)]
Merge "Update MtpFfsHandle tests, add new tests for small and partial files" am:
ddc029afc7
am:
47c772f677
Change-Id: I23b2b2ec7a2ef8c39612938c2d74d6855c4036f5
Jerry Zhang [Thu, 9 Feb 2017 23:53:50 +0000 (23:53 +0000)]
Merge "Update MtpFfsHandle tests, add new tests for small and partial files"
am:
ddc029afc7
Change-Id: I3fae81a74fa92d7a2ce63e938446c9abd26c27f7
Jerry Zhang [Thu, 9 Feb 2017 23:47:57 +0000 (23:47 +0000)]
Merge "Update MtpFfsHandle tests, add new tests for small and partial files"
Jerry Zhang [Mon, 6 Feb 2017 23:12:17 +0000 (15:12 -0800)]
Update MtpFfsHandle tests, add new tests for small and partial files
Test: Build and run 32 and 64 bit tests
Bug:
34822471
Change-Id: I812e4f27464e385c219c42bf7a76fa702f295f41
Caroline Tice [Wed, 8 Feb 2017 23:36:24 +0000 (23:36 +0000)]
Merge "Fix static analyzer warnings" am:
9064b2d12a am:
9924503dfe
am:
41194d937c
Change-Id: I86f7ca87a54797027949c6d30afe8862f019f34e
Caroline Tice [Wed, 8 Feb 2017 23:33:53 +0000 (23:33 +0000)]
Merge "Fix static analyzer warnings" am:
9064b2d12a
am:
9924503dfe
Change-Id: I50023e13c9beff766405cd3bdccfb71da7c766c9
Caroline Tice [Wed, 8 Feb 2017 23:31:55 +0000 (23:31 +0000)]
Merge "Fix static analyzer warnings"
am:
9064b2d12a
Change-Id: I3e5ef8860968de0433cc3128ff69434ff0a3e8b1
Treehugger Robot [Wed, 8 Feb 2017 23:28:35 +0000 (23:28 +0000)]
Merge "Fix static analyzer warnings"
Marco Nelissen [Wed, 8 Feb 2017 22:26:35 +0000 (22:26 +0000)]
Merge "Fix divide by zero" am:
659cb35e19 am:
021add2def
am:
6fe7d5973c
Change-Id: I05b15bf43fb31d9de3560ca1ccfe0c93f29fcf8f
Marco Nelissen [Wed, 8 Feb 2017 22:24:35 +0000 (22:24 +0000)]
Merge "Fix divide by zero" am:
659cb35e19
am:
021add2def
Change-Id: Id633e8581b39e62615489981427380a80361d741
Marco Nelissen [Wed, 8 Feb 2017 22:23:06 +0000 (22:23 +0000)]
Merge "Fix divide by zero"
am:
659cb35e19
Change-Id: If8c165000be0c80a4471eda58d2b15619bfe3022
Marco Nelissen [Wed, 8 Feb 2017 22:16:58 +0000 (22:16 +0000)]
Merge "Fix divide by zero"
Marco Nelissen [Wed, 8 Feb 2017 22:03:35 +0000 (14:03 -0800)]
Fix divide by zero
Bug:
35136163
Change-Id: If074a1c4d595489f4ff4ffc0b8c381d1bc658447
Tomasz Wasilczyk [Wed, 8 Feb 2017 20:50:58 +0000 (20:50 +0000)]
Merge "Fix uninitialized pointer dereference when loading default radio module." am:
94388e4b63 am:
e5bad5f89a
am:
2ab6368f1c
Change-Id: I660ebdec3573621c7f51050d5483b5f8bafc092f
Tomasz Wasilczyk [Wed, 8 Feb 2017 20:49:29 +0000 (20:49 +0000)]
Merge "Fix uninitialized pointer dereference when loading default radio module." am:
94388e4b63
am:
e5bad5f89a
Change-Id: I68b567b13be1d2293cf13e61d92fa676d97b8381
Tomasz Wasilczyk [Wed, 8 Feb 2017 20:47:59 +0000 (20:47 +0000)]
Merge "Fix uninitialized pointer dereference when loading default radio module."
am:
94388e4b63
Change-Id: Ie0aa3e5af265e1f5e5ef536ac2fb0d0087c2788f
Tomasz Wasilczyk [Wed, 8 Feb 2017 20:42:23 +0000 (20:42 +0000)]
Merge "Fix uninitialized pointer dereference when loading default radio module."
Caroline Tice [Wed, 8 Feb 2017 19:33:04 +0000 (11:33 -0800)]
Fix static analyzer warnings
It was unhappy about uninitialized values potentially being passed into
calls. The warnings were:
frameworks/av/media/libstagefright/DataSource.cpp:254:22: warning:
Function call argument is an uninitialized value
frameworks/av/media/libstagefright/MPEG4Extractor.cpp:4528:17: warning:
Function call argument is an uninitialized value
(The latter was complaining about both `size` and `offset`)
Bug: None
Test: Still builds; static analyzer is now less unhappy.
Change-Id: If8befe493267a5de20e46787b50d854c49d208a3
Tomasz Wasilczyk [Wed, 8 Feb 2017 17:18:08 +0000 (09:18 -0800)]
Fix uninitialized pointer dereference when loading default radio module.
Test: manual
Change-Id: I6ea492536cabc2574dfc9113ca599865d578fbfe
Marco Nelissen [Tue, 7 Feb 2017 21:58:47 +0000 (21:58 +0000)]
Merge "Fix potential overflows" am:
a0c1eb865f am:
ef3542347c
am:
2774f292b7
Change-Id: I1c46b0367639fa29830c74ce92f14c295d178b2c
Marco Nelissen [Tue, 7 Feb 2017 21:56:14 +0000 (21:56 +0000)]
Merge "Fix potential overflows" am:
a0c1eb865f
am:
ef3542347c
Change-Id: I020bcf499ca455da44ff8eabcd867b44895eeb43
Marco Nelissen [Tue, 7 Feb 2017 21:53:44 +0000 (21:53 +0000)]
Merge "Fix potential overflows"
am:
a0c1eb865f
Change-Id: I4915dcf9cebb84ad5f9ba28c0fae0a7ba85291ac
Marco Nelissen [Tue, 7 Feb 2017 21:50:23 +0000 (21:50 +0000)]
Merge "Fix potential overflows"
Marco Nelissen [Tue, 7 Feb 2017 18:14:45 +0000 (10:14 -0800)]
Fix potential overflows
Bug:
33402896
Test: played file that triggered overflow
Change-Id: Ibf51bbbd4749377d3e77cf6e53fc66ae33b8ee7c
Jerry Zhang [Mon, 6 Feb 2017 22:42:06 +0000 (22:42 +0000)]
Merge changes I89610b96,I9986cd8c am:
e4dbaeffd7 am:
8c1b7cc246
am:
668b14005e
Change-Id: I76deb61e2d7affe3f7e6708a435920d89789c323
Jerry Zhang [Mon, 6 Feb 2017 22:41:59 +0000 (22:41 +0000)]
Retry allocations in case of ENODEV am:
b4f5426604 am:
75bb252863
am:
5d5a91c008
Change-Id: I822915dd40e9c999a3412ee74e5272ff04e0c7d4
Jerry Zhang [Mon, 6 Feb 2017 22:41:52 +0000 (22:41 +0000)]
Fix GetPartialObject on FFS am:
4418030f45 am:
8eff270486
am:
e209fd29f7
Change-Id: Iceb76f12ca62c5c800c7f9b9df65fa60c308463a
Jerry Zhang [Mon, 6 Feb 2017 22:40:03 +0000 (22:40 +0000)]
Merge changes I89610b96,I9986cd8c am:
e4dbaeffd7
am:
8c1b7cc246
Change-Id: I3d1de5e568314b5febfe62ca74e721d06af2ff54
Jerry Zhang [Mon, 6 Feb 2017 22:39:56 +0000 (22:39 +0000)]
Retry allocations in case of ENODEV am:
b4f5426604
am:
75bb252863
Change-Id: Iddc4a3124f6638aaa9e153359634259c483530cc
Jerry Zhang [Mon, 6 Feb 2017 22:39:51 +0000 (22:39 +0000)]
Fix GetPartialObject on FFS am:
4418030f45
am:
8eff270486
Change-Id: I668a51373a59d48642863be2bbbb76ca6bc4ef00
Jerry Zhang [Mon, 6 Feb 2017 22:37:57 +0000 (22:37 +0000)]
Merge changes I89610b96,I9986cd8c
am:
e4dbaeffd7
Change-Id: Ic545c034d8fe32f0c669645c00d7c577d4a09f0e
Jerry Zhang [Mon, 6 Feb 2017 22:37:56 +0000 (22:37 +0000)]
Retry allocations in case of ENODEV
am:
b4f5426604
Change-Id: Ibc95d5ead472dbeaac7880eab06f9c5ec5d5864e
Jerry Zhang [Mon, 6 Feb 2017 22:37:51 +0000 (22:37 +0000)]
Fix GetPartialObject on FFS
am:
4418030f45
Change-Id: I2aa1ae1d1bbd49f80ffeec1dbbdfc301a3b32562
Treehugger Robot [Mon, 6 Feb 2017 22:33:22 +0000 (22:33 +0000)]
Merge changes I89610b96,I9986cd8c
* changes:
Retry allocations in case of ENODEV
Fix GetPartialObject on FFS
Jerry Zhang [Fri, 3 Feb 2017 02:14:33 +0000 (18:14 -0800)]
Retry allocations in case of ENODEV
Unlike the read() and write() calls, the ioctl() call
does not wait for endpoints to be enabled, which is
problematic if ioctls() are the first calls on the
usb connection, since they may be called before the
endpoints are set up. We'll have to retry if this
causes them to fail.
Bug:
34822471
Test: Change configs to mtp and ptp
Change-Id: I89610b9614c33f0b22535cc68cd0c9b502cb55c9
Jerry Zhang [Sat, 4 Feb 2017 00:31:31 +0000 (16:31 -0800)]
Fix GetPartialObject on FFS
Linux apps use GetPartialObject to access
MTP files directly. Fix file offset handling
as well as lengths shorter than packet size.
Bug:
34822471
Test: Attach photos in Gmail, open directly from device
Change-Id: I9986cd8c70ed261f07e8f96a72e53b87341dd93f
Android Build Merger (Role) [Fri, 3 Feb 2017 23:56:24 +0000 (23:56 +0000)]
Merge "Merge "Turn off overflow protection for various math functions" into nyc-dev am:
d51a9b554e am:
d4de6c34b7 am:
f791b1f376 am:
60721afe7b am:
90084e82ba" into nyc-mr2-dev-plus-aosp
Android Build Merger (Role) [Fri, 3 Feb 2017 23:56:22 +0000 (23:56 +0000)]
Merge "Merge "Turn off overflow protection for various math functions" into nyc-dev am:
d51a9b554e am:
d4de6c34b7 am:
f791b1f376 am:
60721afe7b am:
7b497b1edd" into nyc-mr2-dev-plus-aosp
Marco Nelissen [Fri, 3 Feb 2017 23:56:15 +0000 (23:56 +0000)]
Merge "Turn off overflow protection for various math functions" into nyc-dev am:
d51a9b554e am:
d4de6c34b7 am:
f791b1f376 am:
60721afe7b
am:
90084e82ba
Change-Id: Ic58d2e4d7a0270a5b550cf5b914b83378c58fdc2
Marco Nelissen [Fri, 3 Feb 2017 23:56:13 +0000 (23:56 +0000)]
Merge "Turn off overflow protection for various math functions" into nyc-dev am:
d51a9b554e am:
d4de6c34b7 am:
f791b1f376 am:
60721afe7b
am:
7b497b1edd
Change-Id: I29d5691860a88d1b81e2a6a4f453c0f4504efeee
Android Build Merger (Role) [Fri, 3 Feb 2017 23:56:09 +0000 (23:56 +0000)]
Merge "Turn off overflow protection for various math functions am:
42b1ea8a93 am:
0785ced61b am:
6f0b9ca8a5 am:
ef2510a3de am:
98e036257a" into nyc-mr2-dev-plus-aosp
Marco Nelissen [Fri, 3 Feb 2017 23:56:01 +0000 (23:56 +0000)]
Turn off overflow protection for various math functions am:
42b1ea8a93 am:
0785ced61b am:
6f0b9ca8a5 am:
ef2510a3de
am:
98e036257a
Change-Id: I81bfcecd9f4fba024583d70538db954e9a775911
Marco Nelissen [Fri, 3 Feb 2017 23:55:59 +0000 (23:55 +0000)]
Turn off overflow protection for various math functions am:
42b1ea8a93 am:
0785ced61b am:
6f0b9ca8a5 am:
ef2510a3de
am:
fc46c290ea
Change-Id: I89868880925b5878f68b2ba1724e255c88c91921
Marco Nelissen [Fri, 3 Feb 2017 23:53:41 +0000 (23:53 +0000)]
Merge "Turn off overflow protection for various math functions" into nyc-dev am:
d51a9b554e am:
d4de6c34b7 am:
f791b1f376
am:
60721afe7b
Change-Id: I9d55b474b6159fa7d30e89fb520cfae8ed9ec9f4
Marco Nelissen [Fri, 3 Feb 2017 23:53:40 +0000 (23:53 +0000)]
Merge "Turn off overflow protection for various math functions" into nyc-dev am:
d51a9b554e am:
d4de6c34b7 am:
f791b1f376
am:
60721afe7b
Change-Id: Ibb1f0f9f12b67034e29c708ff10f3a8cfaf84439
Marco Nelissen [Fri, 3 Feb 2017 23:53:28 +0000 (23:53 +0000)]
Turn off overflow protection for various math functions am:
42b1ea8a93 am:
0785ced61b am:
6f0b9ca8a5
am:
ef2510a3de
Change-Id: If480835fb3eea21f0a20f1abf22e4976afaa70fa
Marco Nelissen [Fri, 3 Feb 2017 23:53:28 +0000 (23:53 +0000)]
Turn off overflow protection for various math functions am:
42b1ea8a93 am:
0785ced61b am:
6f0b9ca8a5
am:
ef2510a3de
Change-Id: I0ba16f325eda7debba151d29b00867bb365c1c0b
Marco Nelissen [Fri, 3 Feb 2017 23:51:11 +0000 (23:51 +0000)]
Merge "Turn off overflow protection for various math functions" into nyc-dev am:
d51a9b554e am:
d4de6c34b7
am:
f791b1f376
Change-Id: Ifd117aa2fa34f851f3e021ed401e0421f34d9563
Marco Nelissen [Fri, 3 Feb 2017 23:50:58 +0000 (23:50 +0000)]
Turn off overflow protection for various math functions am:
42b1ea8a93 am:
0785ced61b
am:
6f0b9ca8a5
Change-Id: I8abfc1795cc6ac393a191ce7f58d6ed9125aeb1c
Marco Nelissen [Fri, 3 Feb 2017 23:48:44 +0000 (23:48 +0000)]
Merge "Turn off overflow protection for various math functions" into nyc-dev am:
d51a9b554e
am:
d4de6c34b7
Change-Id: Ifbe7c37dcb64b44ee06b1babdcae4647dd80c5fa
Marco Nelissen [Fri, 3 Feb 2017 23:48:29 +0000 (23:48 +0000)]
Turn off overflow protection for various math functions am:
42b1ea8a93
am:
0785ced61b
Change-Id: Ifc899ae6cf0b677852c807c796bc031a9b29661b
Marco Nelissen [Fri, 3 Feb 2017 23:46:02 +0000 (23:46 +0000)]
Merge "Turn off overflow protection for various math functions" into nyc-dev
am:
d51a9b554e
Change-Id: I9af2d58895177388fa0e39f33f5809c2b545f535
Marco Nelissen [Fri, 3 Feb 2017 23:46:00 +0000 (23:46 +0000)]
Turn off overflow protection for various math functions
am:
42b1ea8a93
Change-Id: Iecbbea2590a1d0acac1f9091851a2434b50523af
Marco Nelissen [Fri, 3 Feb 2017 23:40:14 +0000 (23:40 +0000)]
Merge "Turn off overflow protection for various math functions" into nyc-dev
Eino-Ville Talvala [Fri, 3 Feb 2017 01:13:18 +0000 (01:13 +0000)]
Merge "CameraBase: Don't return an sp<> by reference" into klp-dev am:
fdf64bab96 am:
4fca12e56f am:
f0009384d8 am:
7a14d95270 am:
888f5bab6d am:
a6b1816e16 am:
06f46cabd0 am:
31670090bf am:
e1b8152064 am:
dd062f9882 am:
d373dd0154 am:
a6e6e7c5da am:
b5485e3455 am:
5d45e50507
am:
ef7329ab65
Change-Id: Iccfd5507ce8da0299061693dd645efed33f334c0
Eino-Ville Talvala [Fri, 3 Feb 2017 01:13:10 +0000 (01:13 +0000)]
CameraBase: Don't return an sp<> by reference am:
4b49489c12 am:
8c32699ceb am:
8806c2a11d am:
99c4dd2fe8 am:
dd82ab2377 am:
1dd068cd45 am:
edf9d2f4d1 am:
6ddd08e3a9 am:
0dcc9bb368 am:
b739918940 -s ours am:
92d2d4ca3c am:
09b77fbb92 am:
39d454cdd9 am:
e0c5f559a6
am:
7ef2218590
Change-Id: Ib88841bc19c1f4e24a4f9b98d5d0dd4b14cbcbde
Eino-Ville Talvala [Fri, 3 Feb 2017 01:09:17 +0000 (01:09 +0000)]
Merge "CameraBase: Don't return an sp<> by reference" into klp-dev am:
fdf64bab96 am:
4fca12e56f am:
f0009384d8 am:
7a14d95270 am:
888f5bab6d am:
a6b1816e16 am:
06f46cabd0 am:
31670090bf am:
e1b8152064 am:
dd062f9882 am:
d373dd0154 am:
a6e6e7c5da am:
b5485e3455 am:
5d45e50507
am:
b64e4a6f77
Change-Id: I7d93a7ea5f32a7184356e1ccfe446b0872686b32
Eino-Ville Talvala [Fri, 3 Feb 2017 01:09:09 +0000 (01:09 +0000)]
CameraBase: Don't return an sp<> by reference am:
4b49489c12 am:
8c32699ceb am:
8806c2a11d am:
99c4dd2fe8 am:
dd82ab2377 am:
1dd068cd45 am:
edf9d2f4d1 am:
6ddd08e3a9 am:
0dcc9bb368 am:
b739918940 -s ours am:
92d2d4ca3c am:
09b77fbb92 am:
39d454cdd9 am:
e0c5f559a6
am:
04a720c1cc
Change-Id: I683f56ed5e9eea0e394974c8b70ee32face6679e
Eino-Ville Talvala [Fri, 3 Feb 2017 01:08:45 +0000 (01:08 +0000)]
Merge "CameraBase: Don't return an sp<> by reference" into klp-dev am:
fdf64bab96 am:
4fca12e56f am:
f0009384d8 am:
7a14d95270 am:
888f5bab6d am:
a6b1816e16 am:
06f46cabd0 am:
31670090bf am:
e1b8152064 am:
dd062f9882 am:
d373dd0154 am:
a6e6e7c5da am:
b5485e3455
am:
5d45e50507
Change-Id: I522903d6cf69ae2014c4d4c2e37129af5b8f305a
Eino-Ville Talvala [Fri, 3 Feb 2017 01:08:38 +0000 (01:08 +0000)]
CameraBase: Don't return an sp<> by reference am:
4b49489c12 am:
8c32699ceb am:
8806c2a11d am:
99c4dd2fe8 am:
dd82ab2377 am:
1dd068cd45 am:
edf9d2f4d1 am:
6ddd08e3a9 am:
0dcc9bb368 am:
b739918940 -s ours am:
92d2d4ca3c am:
09b77fbb92 am:
39d454cdd9
am:
e0c5f559a6
Change-Id: I20a9d7f69f6c225769913c5ce2c18cd41857dc8f
Eino-Ville Talvala [Fri, 3 Feb 2017 01:06:17 +0000 (01:06 +0000)]
Merge "CameraBase: Don't return an sp<> by reference" into klp-dev am:
fdf64bab96 am:
4fca12e56f am:
f0009384d8 am:
7a14d95270 am:
888f5bab6d am:
a6b1816e16 am:
06f46cabd0 am:
31670090bf am:
e1b8152064 am:
dd062f9882 am:
d373dd0154 am:
a6e6e7c5da am:
b5485e3455
am:
5d45e50507
Change-Id: I93532c8365409adfa22403ab36ee9894b87c7117
Eino-Ville Talvala [Fri, 3 Feb 2017 01:06:09 +0000 (01:06 +0000)]
CameraBase: Don't return an sp<> by reference am:
4b49489c12 am:
8c32699ceb am:
8806c2a11d am:
99c4dd2fe8 am:
dd82ab2377 am:
1dd068cd45 am:
edf9d2f4d1 am:
6ddd08e3a9 am:
0dcc9bb368 am:
b739918940 -s ours am:
92d2d4ca3c am:
09b77fbb92 am:
39d454cdd9
am:
e0c5f559a6
Change-Id: Ib04cdc298cc022c643cd130374fd080c7742fba5
Eino-Ville Talvala [Fri, 3 Feb 2017 01:03:47 +0000 (01:03 +0000)]
Merge "CameraBase: Don't return an sp<> by reference" into klp-dev am:
fdf64bab96 am:
4fca12e56f am:
f0009384d8 am:
7a14d95270 am:
888f5bab6d am:
a6b1816e16 am:
06f46cabd0 am:
31670090bf am:
e1b8152064 am:
dd062f9882 am:
d373dd0154 am:
a6e6e7c5da
am:
b5485e3455
Change-Id: Id0993358986ee29f23dabd19584d8fd0ea378f1e
Eino-Ville Talvala [Fri, 3 Feb 2017 01:03:38 +0000 (01:03 +0000)]
CameraBase: Don't return an sp<> by reference am:
4b49489c12 am:
8c32699ceb am:
8806c2a11d am:
99c4dd2fe8 am:
dd82ab2377 am:
1dd068cd45 am:
edf9d2f4d1 am:
6ddd08e3a9 am:
0dcc9bb368 am:
b739918940 -s ours am:
92d2d4ca3c am:
09b77fbb92
am:
39d454cdd9
Change-Id: I831d36ec3f527eb5f7514235448fc8c9e3dc1d40
Eino-Ville Talvala [Fri, 3 Feb 2017 00:58:44 +0000 (00:58 +0000)]
Merge "CameraBase: Don't return an sp<> by reference" into klp-dev am:
fdf64bab96 am:
4fca12e56f am:
f0009384d8 am:
7a14d95270 am:
888f5bab6d am:
a6b1816e16 am:
06f46cabd0 am:
31670090bf am:
e1b8152064 am:
dd062f9882 am:
d373dd0154
am:
a6e6e7c5da
Change-Id: I1f95aa6f6b4ba80277aa9b00c72ba3f52bbb2dac
Eino-Ville Talvala [Fri, 3 Feb 2017 00:58:37 +0000 (00:58 +0000)]
CameraBase: Don't return an sp<> by reference am:
4b49489c12 am:
8c32699ceb am:
8806c2a11d am:
99c4dd2fe8 am:
dd82ab2377 am:
1dd068cd45 am:
edf9d2f4d1 am:
6ddd08e3a9 am:
0dcc9bb368 am:
b739918940 -s ours am:
92d2d4ca3c
am:
09b77fbb92
Change-Id: Ib16456215de96aa3677649489b13fff3017e7bfd
Eino-Ville Talvala [Fri, 3 Feb 2017 00:55:46 +0000 (00:55 +0000)]
Merge "CameraBase: Don't return an sp<> by reference" into klp-dev am:
fdf64bab96 am:
4fca12e56f am:
f0009384d8 am:
7a14d95270 am:
888f5bab6d am:
a6b1816e16 am:
06f46cabd0 am:
31670090bf am:
e1b8152064 am:
dd062f9882
am:
d373dd0154
Change-Id: I32d94d35ac07c96eb81a8b47e67b53b81fadaf6d
Eino-Ville Talvala [Fri, 3 Feb 2017 00:55:39 +0000 (00:55 +0000)]
CameraBase: Don't return an sp<> by reference am:
4b49489c12 am:
8c32699ceb am:
8806c2a11d am:
99c4dd2fe8 am:
dd82ab2377 am:
1dd068cd45 am:
edf9d2f4d1 am:
6ddd08e3a9 am:
0dcc9bb368 am:
b739918940 -s ours
am:
92d2d4ca3c
Change-Id: I38ca71a6716426a24d468ff5eddf6aeea0ba0931
Eino-Ville Talvala [Fri, 3 Feb 2017 00:53:14 +0000 (00:53 +0000)]
Merge "CameraBase: Don't return an sp<> by reference" into klp-dev am:
fdf64bab96 am:
4fca12e56f am:
f0009384d8 am:
7a14d95270 am:
888f5bab6d am:
a6b1816e16 am:
06f46cabd0 am:
31670090bf am:
e1b8152064
am:
dd062f9882
Change-Id: Ie56eca7f1f5a678c9065a4f3de6a869df2900d39
Eino-Ville Talvala [Fri, 3 Feb 2017 00:53:07 +0000 (00:53 +0000)]
CameraBase: Don't return an sp<> by reference am:
4b49489c12 am:
8c32699ceb am:
8806c2a11d am:
99c4dd2fe8 am:
dd82ab2377 am:
1dd068cd45 am:
edf9d2f4d1 am:
6ddd08e3a9 am:
0dcc9bb368
am:
b739918940 -s ours
Change-Id: I292f09d3408865d8eb1595a2cd0fd4d5d9cac7cd
Eino-Ville Talvala [Fri, 3 Feb 2017 00:08:41 +0000 (00:08 +0000)]
Merge "CameraBase: Don't return an sp<> by reference" into klp-dev am:
fdf64bab96 am:
4fca12e56f am:
f0009384d8 am:
7a14d95270 am:
888f5bab6d am:
a6b1816e16 am:
06f46cabd0 am:
31670090bf
am:
e1b8152064
Change-Id: Iaf13b317fe79e26a84050913a4bfe9bbcbe07a8b
Eino-Ville Talvala [Fri, 3 Feb 2017 00:08:33 +0000 (00:08 +0000)]
CameraBase: Don't return an sp<> by reference am:
4b49489c12 am:
8c32699ceb am:
8806c2a11d am:
99c4dd2fe8 am:
dd82ab2377 am:
1dd068cd45 am:
edf9d2f4d1 am:
6ddd08e3a9
am:
0dcc9bb368
Change-Id: I05eeb35f91513b4b9b9d0d696a1ed9b110eb2aef
Eino-Ville Talvala [Fri, 3 Feb 2017 00:06:38 +0000 (00:06 +0000)]
Merge "CameraBase: Don't return an sp<> by reference" into nyc-dev am:
41d3046edb am:
edac7f768a am:
3a706894c4 am:
b0cc8a72df
am:
9b84b3b8f2
Change-Id: I2566e7932d0f1b2653c795d3a25d5f2a0b8cd6d4
Eino-Ville Talvala [Fri, 3 Feb 2017 00:06:38 +0000 (00:06 +0000)]
Merge "CameraBase: Don't return an sp<> by reference" into klp-dev am:
fdf64bab96 am:
4fca12e56f am:
f0009384d8 am:
7a14d95270 am:
888f5bab6d am:
a6b1816e16 am:
06f46cabd0
am:
31670090bf
Change-Id: I623d276cad5ce38f1ce3cd98d38f74683b2d5924
Eino-Ville Talvala [Fri, 3 Feb 2017 00:06:32 +0000 (00:06 +0000)]
CameraBase: Don't return an sp<> by reference am:
4b49489c12 am:
8c32699ceb am:
8806c2a11d am:
99c4dd2fe8 am:
dd82ab2377 am:
1dd068cd45 am:
edf9d2f4d1
am:
6ddd08e3a9
Change-Id: Id948f785f4f68a043747c9df5f15ebf253985ad1
Eino-Ville Talvala [Fri, 3 Feb 2017 00:06:32 +0000 (00:06 +0000)]
CameraBase: Don't return an sp<> by reference am:
f86177dd93 am:
e1bdaa8fb1 am:
6cb1912505 am:
4f95157295
am:
74476ff539
Change-Id: Ida8d8ef1408d657f59bef204f8c803be2d7da92a
Eino-Ville Talvala [Fri, 3 Feb 2017 00:04:08 +0000 (00:04 +0000)]
Merge "CameraBase: Don't return an sp<> by reference" into klp-dev am:
fdf64bab96 am:
4fca12e56f am:
f0009384d8 am:
7a14d95270 am:
888f5bab6d am:
a6b1816e16
am:
06f46cabd0
Change-Id: I3f3c8855b33b89d055aa901e830b2a2419891884
Eino-Ville Talvala [Fri, 3 Feb 2017 00:04:02 +0000 (00:04 +0000)]
CameraBase: Don't return an sp<> by reference am:
4b49489c12 am:
8c32699ceb am:
8806c2a11d am:
99c4dd2fe8 am:
dd82ab2377 am:
1dd068cd45
am:
edf9d2f4d1
Change-Id: Iae1d54c6444695074f722fce21e958ed687ef9c7
Eino-Ville Talvala [Fri, 3 Feb 2017 00:00:06 +0000 (00:00 +0000)]
Merge "CameraBase: Don't return an sp<> by reference" into klp-dev am:
fdf64bab96 am:
4fca12e56f am:
f0009384d8 am:
7a14d95270 am:
888f5bab6d
am:
a6b1816e16
Change-Id: I4a4a4f1d70012375d5772e97dd23301231734f6b
Eino-Ville Talvala [Fri, 3 Feb 2017 00:00:02 +0000 (00:00 +0000)]
CameraBase: Don't return an sp<> by reference am:
4b49489c12 am:
8c32699ceb am:
8806c2a11d am:
99c4dd2fe8 am:
dd82ab2377
am:
1dd068cd45
Change-Id: Ie5afd6dc9b89c0dc22a2cef6e0ca6a9921921538
Eino-Ville Talvala [Thu, 2 Feb 2017 23:59:37 +0000 (23:59 +0000)]
Merge "CameraBase: Don't return an sp<> by reference" into nyc-dev am:
41d3046edb am:
edac7f768a am:
3a706894c4 am:
b0cc8a72df
am:
d180388258
Change-Id: I7beb1a00ee52698118738df74455290d04013c8a
Eino-Ville Talvala [Thu, 2 Feb 2017 23:59:36 +0000 (23:59 +0000)]
Merge "CameraBase: Don't return an sp<> by reference" into nyc-dev am:
41d3046edb am:
edac7f768a am:
3a706894c4
am:
b0cc8a72df
Change-Id: I84062950a597ff3e692502037ec31b3b558f16df
Eino-Ville Talvala [Thu, 2 Feb 2017 23:59:31 +0000 (23:59 +0000)]
CameraBase: Don't return an sp<> by reference am:
f86177dd93 am:
e1bdaa8fb1 am:
6cb1912505
am:
4f95157295
Change-Id: I25e6c61da37ba8efa681777ea7e11af7caf3f324
Eino-Ville Talvala [Thu, 2 Feb 2017 23:59:31 +0000 (23:59 +0000)]
CameraBase: Don't return an sp<> by reference am:
f86177dd93 am:
e1bdaa8fb1 am:
6cb1912505 am:
4f95157295
am:
7376ce23ad
Change-Id: I7aba21e50dc865a3ee98e85782e0232bfd9aa380
Eino-Ville Talvala [Thu, 2 Feb 2017 23:57:06 +0000 (23:57 +0000)]
Merge "CameraBase: Don't return an sp<> by reference" into nyc-dev am:
41d3046edb am:
edac7f768a am:
3a706894c4
am:
b0cc8a72df
Change-Id: I6cf5df3d21575ea49c9bec7fbc2e7f9eb996de13
Eino-Ville Talvala [Thu, 2 Feb 2017 23:57:05 +0000 (23:57 +0000)]
Merge "CameraBase: Don't return an sp<> by reference" into klp-dev am:
fdf64bab96 am:
4fca12e56f am:
f0009384d8 am:
7a14d95270
am:
888f5bab6d
Change-Id: I6e99058d1122fad6a723662ad98d9e33c060e34c
Eino-Ville Talvala [Thu, 2 Feb 2017 23:57:02 +0000 (23:57 +0000)]
CameraBase: Don't return an sp<> by reference am:
f86177dd93 am:
e1bdaa8fb1 am:
6cb1912505
am:
4f95157295
Change-Id: I31c70615f0b81da32ebbd2262b262a9024e114dc
Eino-Ville Talvala [Thu, 2 Feb 2017 23:57:01 +0000 (23:57 +0000)]
CameraBase: Don't return an sp<> by reference am:
4b49489c12 am:
8c32699ceb am:
8806c2a11d am:
99c4dd2fe8
am:
dd82ab2377
Change-Id: I068a2fbc0e5bf20adb92ac4e95817899a3d53298
Eino-Ville Talvala [Thu, 2 Feb 2017 23:54:35 +0000 (23:54 +0000)]
Merge "CameraBase: Don't return an sp<> by reference" into klp-dev am:
fdf64bab96 am:
4fca12e56f am:
f0009384d8
am:
7a14d95270
Change-Id: I42cf5ca9442728273ff2d90095b6d1520c75762a
Eino-Ville Talvala [Thu, 2 Feb 2017 23:54:31 +0000 (23:54 +0000)]
CameraBase: Don't return an sp<> by reference am:
4b49489c12 am:
8c32699ceb am:
8806c2a11d
am:
99c4dd2fe8
Change-Id: I7fd189d89b4a0ddb91a7f21485d97dabee9b784e
Eino-Ville Talvala [Thu, 2 Feb 2017 23:53:12 +0000 (23:53 +0000)]
Merge "CameraBase: Don't return an sp<> by reference" into nyc-dev am:
41d3046edb am:
edac7f768a
am:
3a706894c4
Change-Id: I39e5e01ac024e56a9d17811024c2ab33accec574
Eino-Ville Talvala [Thu, 2 Feb 2017 23:53:02 +0000 (23:53 +0000)]
CameraBase: Don't return an sp<> by reference am:
f86177dd93 am:
e1bdaa8fb1
am:
6cb1912505
Change-Id: If68d75e176ef8c2fafe2288307a0b0e724c3f826
Eino-Ville Talvala [Thu, 2 Feb 2017 23:52:04 +0000 (23:52 +0000)]
Merge "CameraBase: Don't return an sp<> by reference" into klp-dev am:
fdf64bab96 am:
4fca12e56f
am:
f0009384d8
Change-Id: I8efab658bd67af7eb85ac8cd6dc7d6d9fa61ef21
Eino-Ville Talvala [Thu, 2 Feb 2017 23:52:01 +0000 (23:52 +0000)]
CameraBase: Don't return an sp<> by reference am:
4b49489c12 am:
8c32699ceb
am:
8806c2a11d
Change-Id: I61be9ab0dbd9acde84811cd437304267b9544099
Eino-Ville Talvala [Thu, 2 Feb 2017 23:49:06 +0000 (23:49 +0000)]
Merge "CameraBase: Don't return an sp<> by reference" into nyc-dev am:
41d3046edb
am:
edac7f768a
Change-Id: If8f28651d98edfe3b193b88f96f9fc09741c0b88
Eino-Ville Talvala [Thu, 2 Feb 2017 23:49:04 +0000 (23:49 +0000)]
Merge "CameraBase: Don't return an sp<> by reference" into klp-dev am:
fdf64bab96
am:
4fca12e56f
Change-Id: I082c1ec76a3b05de211d169ee07a7a1f544081dc
Eino-Ville Talvala [Thu, 2 Feb 2017 23:49:01 +0000 (23:49 +0000)]
CameraBase: Don't return an sp<> by reference am:
f86177dd93
am:
e1bdaa8fb1
Change-Id: I1c48315fdff2a24d31d62d6aaa550f7d3a02bdde
Eino-Ville Talvala [Thu, 2 Feb 2017 23:49:01 +0000 (23:49 +0000)]
CameraBase: Don't return an sp<> by reference am:
4b49489c12
am:
8c32699ceb
Change-Id: I6fac31b3eaa435a665643343c2a6d8a6959be107
Eino-Ville Talvala [Thu, 2 Feb 2017 23:47:02 +0000 (23:47 +0000)]
Merge "CameraBase: Don't return an sp<> by reference" into nyc-dev
am:
41d3046edb
Change-Id: If4699ffa9cd7942e4b7c1eb90278ca20ac1cc191
OSDN Git Service
