OSDN Git Service

android-x86/frameworks-av.git
7 years agoMerge "Fix divide by zero" am: 659cb35e19
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

7 years agoMerge "Fix divide by zero"
Marco Nelissen [Wed, 8 Feb 2017 22:23:06 +0000 (22:23 +0000)]
Merge "Fix divide by zero"
am: 659cb35e19

Change-Id: If8c165000be0c80a4471eda58d2b15619bfe3022

7 years agoMerge "Fix divide by zero"
Marco Nelissen [Wed, 8 Feb 2017 22:16:58 +0000 (22:16 +0000)]
Merge "Fix divide by zero"

7 years agoFix 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

7 years agoMerge "Fix uninitialized pointer dereference when loading default radio module."...
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

7 years agoMerge "Fix uninitialized pointer dereference when loading default radio module."
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

7 years agoMerge "Fix uninitialized pointer dereference when loading default radio module."
Tomasz Wasilczyk [Wed, 8 Feb 2017 20:42:23 +0000 (20:42 +0000)]
Merge "Fix uninitialized pointer dereference when loading default radio module."

7 years agoFix uninitialized pointer dereference when loading default radio module.
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

7 years agoMerge "Fix potential overflows" am: a0c1eb865f
Marco Nelissen [Tue, 7 Feb 2017 21:56:14 +0000 (21:56 +0000)]
Merge "Fix potential overflows" am: a0c1eb865f
am: ef3542347c

Change-Id: I020bcf499ca455da44ff8eabcd867b44895eeb43

7 years agoMerge "Fix potential overflows"
Marco Nelissen [Tue, 7 Feb 2017 21:53:44 +0000 (21:53 +0000)]
Merge "Fix potential overflows"
am: a0c1eb865f

Change-Id: I4915dcf9cebb84ad5f9ba28c0fae0a7ba85291ac

7 years agoMerge "Fix potential overflows"
Marco Nelissen [Tue, 7 Feb 2017 21:50:23 +0000 (21:50 +0000)]
Merge "Fix potential overflows"

7 years agoFix 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

7 years agoMerge changes I89610b96,I9986cd8c am: e4dbaeffd7
Jerry Zhang [Mon, 6 Feb 2017 22:40:03 +0000 (22:40 +0000)]
Merge changes I89610b96,I9986cd8c am: e4dbaeffd7
am: 8c1b7cc246

Change-Id: I3d1de5e568314b5febfe62ca74e721d06af2ff54

7 years agoRetry allocations in case of ENODEV am: b4f5426604
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

7 years agoFix GetPartialObject on FFS am: 4418030f45
Jerry Zhang [Mon, 6 Feb 2017 22:39:51 +0000 (22:39 +0000)]
Fix GetPartialObject on FFS am: 4418030f45
am: 8eff270486

Change-Id: I668a51373a59d48642863be2bbbb76ca6bc4ef00

7 years agoMerge changes I89610b96,I9986cd8c
Jerry Zhang [Mon, 6 Feb 2017 22:37:57 +0000 (22:37 +0000)]
Merge changes I89610b96,I9986cd8c
am: e4dbaeffd7

Change-Id: Ic545c034d8fe32f0c669645c00d7c577d4a09f0e

7 years agoRetry allocations in case of ENODEV
Jerry Zhang [Mon, 6 Feb 2017 22:37:56 +0000 (22:37 +0000)]
Retry allocations in case of ENODEV
am: b4f5426604

Change-Id: Ibc95d5ead472dbeaac7880eab06f9c5ec5d5864e

7 years agoFix GetPartialObject on FFS
Jerry Zhang [Mon, 6 Feb 2017 22:37:51 +0000 (22:37 +0000)]
Fix GetPartialObject on FFS
am: 4418030f45

Change-Id: I2aa1ae1d1bbd49f80ffeec1dbbdfc301a3b32562

7 years agoMerge changes I89610b96,I9986cd8c
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

7 years agoRetry allocations in case of ENODEV
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

7 years agoFix GetPartialObject on FFS
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

7 years agoMerge "Turn off overflow protection for various math functions" into nyc-dev am:...
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

7 years agoTurn off overflow protection for various math functions am: 42b1ea8a93 am: 0785ced61b...
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

7 years agoMerge "Turn off overflow protection for various math functions" into nyc-dev am:...
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

7 years agoTurn off overflow protection for various math functions am: 42b1ea8a93 am: 0785ced61b
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

7 years agoMerge "Turn off overflow protection for various math functions" into nyc-dev am:...
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

7 years agoTurn off overflow protection for various math functions am: 42b1ea8a93
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

7 years agoMerge "Turn off overflow protection for various math functions" into nyc-dev
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

7 years agoTurn off overflow protection for various math functions
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

7 years agoMerge "Turn off overflow protection for various math functions" into nyc-dev
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

7 years agoMerge "CameraBase: Don't return an sp<> by reference" into klp-dev am: fdf64bab96...
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

7 years agoCameraBase: Don't return an sp<> by reference am: 4b49489c12 am: 8c32699ceb am: 8806c...
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

7 years agoMerge "CameraBase: Don't return an sp<> by reference" into klp-dev am: fdf64bab96...
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

7 years agoCameraBase: Don't return an sp<> by reference am: 4b49489c12 am: 8c32699ceb am: 8806c...
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

7 years agoMerge "CameraBase: Don't return an sp<> by reference" into klp-dev am: fdf64bab96...
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

7 years agoCameraBase: Don't return an sp<> by reference am: 4b49489c12 am: 8c32699ceb am: 8806c...
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

7 years agoMerge "CameraBase: Don't return an sp<> by reference" into klp-dev am: fdf64bab96...
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

7 years agoCameraBase: Don't return an sp<> by reference am: 4b49489c12 am: 8c32699ceb am: 8806c...
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

7 years agoMerge "CameraBase: Don't return an sp<> by reference" into klp-dev am: fdf64bab96...
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

7 years agoCameraBase: Don't return an sp<> by reference am: 4b49489c12 am: 8c32699ceb am: 8806c...
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

7 years agoMerge "CameraBase: Don't return an sp<> by reference" into klp-dev am: fdf64bab96...
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

7 years agoCameraBase: Don't return an sp<> by reference am: 4b49489c12 am: 8c32699ceb am: 8806c...
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

7 years agoMerge "CameraBase: Don't return an sp<> by reference" into klp-dev am: fdf64bab96...
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

7 years agoCameraBase: Don't return an sp<> by reference am: 4b49489c12 am: 8c32699ceb am: 8806c...
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

7 years agoMerge "CameraBase: Don't return an sp<> by reference" into klp-dev am: fdf64bab96...
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

7 years agoCameraBase: Don't return an sp<> by reference am: 4b49489c12 am: 8c32699ceb am: 8806c...
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

7 years agoMerge "CameraBase: Don't return an sp<> by reference" into klp-dev am: fdf64bab96...
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

7 years agoCameraBase: Don't return an sp<> by reference am: 4b49489c12 am: 8c32699ceb am: 8806c...
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

7 years agoMerge "CameraBase: Don't return an sp<> by reference" into nyc-dev am: 41d3046edb...
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

7 years agoMerge "CameraBase: Don't return an sp<> by reference" into klp-dev am: fdf64bab96...
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

7 years agoCameraBase: Don't return an sp<> by reference am: f86177dd93 am: e1bdaa8fb1 am: 6cb19...
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

7 years agoCameraBase: Don't return an sp<> by reference am: 4b49489c12 am: 8c32699ceb am: 8806c...
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

7 years agoMerge "CameraBase: Don't return an sp<> by reference" into klp-dev am: fdf64bab96...
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

7 years agoCameraBase: Don't return an sp<> by reference am: 4b49489c12 am: 8c32699ceb am: 8806c...
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

7 years agoMerge "CameraBase: Don't return an sp<> by reference" into nyc-dev am: 41d3046edb...
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

7 years agoCameraBase: Don't return an sp<> by reference am: f86177dd93 am: e1bdaa8fb1
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

7 years agoMerge "CameraBase: Don't return an sp<> by reference" into klp-dev am: fdf64bab96...
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

7 years agoCameraBase: Don't return an sp<> by reference am: 4b49489c12 am: 8c32699ceb
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

7 years agoMerge "CameraBase: Don't return an sp<> by reference" into nyc-dev am: 41d3046edb
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

7 years agoMerge "CameraBase: Don't return an sp<> by reference" into klp-dev am: fdf64bab96
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

7 years agoCameraBase: Don't return an sp<> by reference am: f86177dd93
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

7 years agoCameraBase: Don't return an sp<> by reference am: 4b49489c12
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

7 years agoMerge "CameraBase: Don't return an sp<> by reference" into nyc-dev
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

7 years agoMerge "CameraBase: Don't return an sp<> by reference" into klp-dev
Eino-Ville Talvala [Thu, 2 Feb 2017 23:47:02 +0000 (23:47 +0000)]
Merge "CameraBase: Don't return an sp<> by reference" into klp-dev
am: fdf64bab96

Change-Id: Ied7016c8cfaaa0d7ed714f753b8827cf0179cb1a

7 years agoCameraBase: Don't return an sp<> by reference
Eino-Ville Talvala [Thu, 2 Feb 2017 23:47:01 +0000 (23:47 +0000)]
CameraBase: Don't return an sp<> by reference
am: f86177dd93

Change-Id: I899d9c4b668171f6e68fdcfac9c7b973831a6a25

7 years agoCameraBase: Don't return an sp<> by reference
Eino-Ville Talvala [Thu, 2 Feb 2017 23:47:01 +0000 (23:47 +0000)]
CameraBase: Don't return an sp<> by reference
am: 4b49489c12

Change-Id: I4befb08a206d22e71a6ab2bfd44fb90ddbd62915

7 years agoMerge "CameraBase: Don't return an sp<> by reference" into nyc-dev
Eino-Ville Talvala [Thu, 2 Feb 2017 23:42:07 +0000 (23:42 +0000)]
Merge "CameraBase: Don't return an sp<> by reference" into nyc-dev

7 years agoMerge "CameraBase: Don't return an sp<> by reference" into klp-dev
Eino-Ville Talvala [Thu, 2 Feb 2017 23:42:07 +0000 (23:42 +0000)]
Merge "CameraBase: Don't return an sp<> by reference" into klp-dev

7 years agoMerge "Make Mtp FFS allocations per session rather than per file" am: 3f6419d0e5
Jerry Zhang [Thu, 2 Feb 2017 23:14:09 +0000 (23:14 +0000)]
Merge "Make Mtp FFS allocations per session rather than per file" am: 3f6419d0e5
am: 57b71e605e

Change-Id: I32fbf049eb8c2e169d09618dfbbca09ca7b5bb13

7 years agoMerge "Make Mtp FFS allocations per session rather than per file"
Jerry Zhang [Thu, 2 Feb 2017 23:11:40 +0000 (23:11 +0000)]
Merge "Make Mtp FFS allocations per session rather than per file"
am: 3f6419d0e5

Change-Id: I8a4b7b7134b1426f3c2e1f854618362eea9602c0

7 years agoMerge "Make Mtp FFS allocations per session rather than per file"
Treehugger Robot [Thu, 2 Feb 2017 23:04:38 +0000 (23:04 +0000)]
Merge "Make Mtp FFS allocations per session rather than per file"

7 years agoTurn off overflow protection for various math functions
Marco Nelissen [Wed, 1 Feb 2017 23:35:35 +0000 (15:35 -0800)]
Turn off overflow protection for various math functions

These functions also exist as arm assembly files, where the overflows
just wrap around, and this makes their plain C equivalents behave
the same.

Bug: 32577290
Bug: 33071964
Test: ran PoC for bug 32577290 using plain C source code
Change-Id: I73c2609589e7a89d36f6c44391548312259daf14
(cherry picked from commit cbf5e6915c42c691a6ccb9a5d249e450f9e67467)

7 years agoRevert "Turn off overflow protection for various math functions" am: 2dd1d5e02e am...
Marco Nelissen [Thu, 2 Feb 2017 21:56:22 +0000 (21:56 +0000)]
Revert "Turn off overflow protection for various math functions" am: 2dd1d5e02e am: aa5498018f am: ce9cab33b7 am: 4c1ad41c8b am: bd91a6540d am: 08ccbcc16f am: 9070697124 am: 9986938f08 am: 245b572340 am: d0bc460432 am: 4f34250af7 am: 96f48e1601 am: 1c4083fcbf
am: 878b27dfbb

Change-Id: Ibb5282c8046643b625d5776f6f3efb9b2ad2127d

7 years agoRevert "Turn off overflow protection for various math functions" am: 2dd1d5e02e am...
Marco Nelissen [Thu, 2 Feb 2017 21:54:22 +0000 (21:54 +0000)]
Revert "Turn off overflow protection for various math functions" am: 2dd1d5e02e am: aa5498018f am: ce9cab33b7 am: 4c1ad41c8b am: bd91a6540d am: 08ccbcc16f am: 9070697124 am: 9986938f08 am: 245b572340 am: d0bc460432 am: 4f34250af7 am: 96f48e1601
am: 1c4083fcbf

Change-Id: I192e8cc1e7e39fa8491ba0677e0a4108ff7931da

7 years agoRevert "Turn off overflow protection for various math functions" am: 2dd1d5e02e am...
Marco Nelissen [Thu, 2 Feb 2017 21:51:23 +0000 (21:51 +0000)]
Revert "Turn off overflow protection for various math functions" am: 2dd1d5e02e am: aa5498018f am: ce9cab33b7 am: 4c1ad41c8b am: bd91a6540d am: 08ccbcc16f am: 9070697124 am: 9986938f08 am: 245b572340 am: d0bc460432 am: 4f34250af7
am: 96f48e1601

Change-Id: I153ab76b64a6ac5c3e7dbcb0ce24b3cfd32069e1

7 years agoRevert "Turn off overflow protection for various math functions" am: 2dd1d5e02e am...
Marco Nelissen [Thu, 2 Feb 2017 21:48:52 +0000 (21:48 +0000)]
Revert "Turn off overflow protection for various math functions" am: 2dd1d5e02e am: aa5498018f am: ce9cab33b7 am: 4c1ad41c8b am: bd91a6540d am: 08ccbcc16f am: 9070697124 am: 9986938f08 am: 245b572340 am: d0bc460432
am: 4f34250af7

Change-Id: Ia17f05fa79c3205def123170a3cd815e34ed211c

7 years agoRevert "Turn off overflow protection for various math functions" am: 2dd1d5e02e am...
Marco Nelissen [Thu, 2 Feb 2017 21:46:21 +0000 (21:46 +0000)]
Revert "Turn off overflow protection for various math functions" am: 2dd1d5e02e am: aa5498018f am: ce9cab33b7 am: 4c1ad41c8b am: bd91a6540d am: 08ccbcc16f am: 9070697124 am: 9986938f08 am: 245b572340
am: d0bc460432

Change-Id: I28693f257be18393f0d5711f33ca0eb9260cd361

7 years agoRevert "Turn off overflow protection for various math functions" am: 2dd1d5e02e am...
Marco Nelissen [Thu, 2 Feb 2017 21:44:21 +0000 (21:44 +0000)]
Revert "Turn off overflow protection for various math functions" am: 2dd1d5e02e am: aa5498018f am: ce9cab33b7 am: 4c1ad41c8b am: bd91a6540d am: 08ccbcc16f am: 9070697124 am: 9986938f08
am: 245b572340

Change-Id: I4a6bc9c420277062d46d57e734c77f67ae861ac4

7 years agoRevert "Turn off overflow protection for various math functions" am: 2dd1d5e02e am...
Marco Nelissen [Thu, 2 Feb 2017 21:41:52 +0000 (21:41 +0000)]
Revert "Turn off overflow protection for various math functions" am: 2dd1d5e02e am: aa5498018f am: ce9cab33b7 am: 4c1ad41c8b am: bd91a6540d am: 08ccbcc16f am: 9070697124
am: 9986938f08

Change-Id: I9d46125d775350691fd30b79fc3672212ab463d3

7 years agoRevert "Turn off overflow protection for various math functions" am: 2dd1d5e02e am...
Marco Nelissen [Thu, 2 Feb 2017 21:38:51 +0000 (21:38 +0000)]
Revert "Turn off overflow protection for various math functions" am: 2dd1d5e02e am: aa5498018f am: ce9cab33b7 am: 4c1ad41c8b am: bd91a6540d am: 08ccbcc16f
am: 9070697124

Change-Id: Icc7f1e5688d39f1ed4d4ea3bafa1474ec55090aa

7 years agoRevert "Turn off overflow protection for various math functions" am: 2dd1d5e02e am...
Marco Nelissen [Thu, 2 Feb 2017 21:36:23 +0000 (21:36 +0000)]
Revert "Turn off overflow protection for various math functions" am: 2dd1d5e02e am: aa5498018f am: ce9cab33b7 am: 4c1ad41c8b am: bd91a6540d
am: 08ccbcc16f

Change-Id: I7e920284bf69cc450d36f813e7e001ae30f656ee

7 years agoRevert "Turn off overflow protection for various math functions" am: 2dd1d5e02e am...
Marco Nelissen [Thu, 2 Feb 2017 21:33:50 +0000 (21:33 +0000)]
Revert "Turn off overflow protection for various math functions" am: 2dd1d5e02e am: aa5498018f am: ce9cab33b7 am: 4c1ad41c8b
am: bd91a6540d

Change-Id: Idafa3a702149b0dff4c8e6460a7ccfe342da1160

7 years agoRevert "Turn off overflow protection for various math functions" am: 2dd1d5e02e am...
Marco Nelissen [Thu, 2 Feb 2017 21:31:21 +0000 (21:31 +0000)]
Revert "Turn off overflow protection for various math functions" am: 2dd1d5e02e am: aa5498018f am: ce9cab33b7
am: 4c1ad41c8b

Change-Id: I7a754e278cdc719a0bf6543f8a2accbc43301f86

7 years agoRevert "Turn off overflow protection for various math functions" am: 2dd1d5e02e am...
Marco Nelissen [Thu, 2 Feb 2017 21:28:50 +0000 (21:28 +0000)]
Revert "Turn off overflow protection for various math functions" am: 2dd1d5e02e am: aa5498018f
am: ce9cab33b7

Change-Id: Id9318840db48994196c72eb5f14e132e23776bda

7 years agoRevert "Turn off overflow protection for various math functions" am: 2dd1d5e02e
Marco Nelissen [Thu, 2 Feb 2017 21:26:19 +0000 (21:26 +0000)]
Revert "Turn off overflow protection for various math functions" am: 2dd1d5e02e
am: aa5498018f

Change-Id: Ica9690b213037f6bd4c13bf14a4d66b77b7def41

7 years agoRevert "Turn off overflow protection for various math functions"
Marco Nelissen [Thu, 2 Feb 2017 21:24:19 +0000 (21:24 +0000)]
Revert "Turn off overflow protection for various math functions"
am: 2dd1d5e02e

Change-Id: I37734de98f269e6886be0578b4ff9db31229c8de

7 years agoRevert "Turn off overflow protection for various math functions"
Marco Nelissen [Thu, 2 Feb 2017 20:53:17 +0000 (20:53 +0000)]
Revert "Turn off overflow protection for various math functions"

This reverts commit cbf5e6915c42c691a6ccb9a5d249e450f9e67467.

Change-Id: I0a81c26d22fee36485b21c285dcc91fbd518e1dd

7 years agoMake Mtp FFS allocations per session rather than per file
Jerry Zhang [Fri, 27 Jan 2017 18:29:59 +0000 (10:29 -0800)]
Make Mtp FFS allocations per session rather than per file

Workloads that send a large number of small files could
repeatedly allocate and free the buffer, causing fragmentation
and eventually running out of allocable memory. Instead
have the allocation be once per MTP session, and retry
with smaller buffers if it fails initially.

Bug: 34741015
Bug: 34822471
Test: Transfer files via MTP
Change-Id: I775376076d3a0c26765b211100830ea0c08450ef

7 years agoCameraBase: Don't return an sp<> by reference
Eino-Ville Talvala [Wed, 1 Feb 2017 23:27:41 +0000 (15:27 -0800)]
CameraBase: Don't return an sp<> by reference

If the server dies, the binder death callback clears out
the global camera service sp<>, and any current references to it
will become quite unhappy.

Test: Camera CTS passes
Bug: 31992879
Change-Id: I2966bed35d0319e3f26e3d4b1b8dc08006a22348

7 years agoTurn off overflow protection for various math functions am: cbf5e6915c am: 72b1fdbf49...
Marco Nelissen [Thu, 2 Feb 2017 20:02:57 +0000 (20:02 +0000)]
Turn off overflow protection for various math functions am: cbf5e6915c am: 72b1fdbf49 am: a25eb35608 am: 3d58f94eec am: 1edbc699b5 am: c0118375e5 am: ba78beef56 am: b0ceb402c1 am: e7a758e220 am: 350db71bea am: d1cc28471a am: 1212f6e406 am: 415dfd3b95
am: 1c03bbb111

Change-Id: Id3ca9d3593ad612e6980af485879ae8ebe51f2ae

7 years agoTurn off overflow protection for various math functions am: cbf5e6915c am: 72b1fdbf49...
Marco Nelissen [Thu, 2 Feb 2017 20:00:27 +0000 (20:00 +0000)]
Turn off overflow protection for various math functions am: cbf5e6915c am: 72b1fdbf49 am: a25eb35608 am: 3d58f94eec am: 1edbc699b5 am: c0118375e5 am: ba78beef56 am: b0ceb402c1 am: e7a758e220 am: 350db71bea am: d1cc28471a am: 1212f6e406
am: 415dfd3b95

Change-Id: I3303b8c60a94a6f31159012c13d2d6eed186981e

7 years agoTurn off overflow protection for various math functions am: cbf5e6915c am: 72b1fdbf49...
Marco Nelissen [Thu, 2 Feb 2017 19:58:24 +0000 (19:58 +0000)]
Turn off overflow protection for various math functions am: cbf5e6915c am: 72b1fdbf49 am: a25eb35608 am: 3d58f94eec am: 1edbc699b5 am: c0118375e5 am: ba78beef56 am: b0ceb402c1 am: e7a758e220 am: 350db71bea am: d1cc28471a
am: 1212f6e406

Change-Id: I40f438d567d3972689705f1594bf17120b067284

7 years agoTurn off overflow protection for various math functions am: cbf5e6915c am: 72b1fdbf49...
Marco Nelissen [Thu, 2 Feb 2017 19:55:53 +0000 (19:55 +0000)]
Turn off overflow protection for various math functions am: cbf5e6915c am: 72b1fdbf49 am: a25eb35608 am: 3d58f94eec am: 1edbc699b5 am: c0118375e5 am: ba78beef56 am: b0ceb402c1 am: e7a758e220 am: 350db71bea
am: d1cc28471a

Change-Id: Ice433e3bccd5b520941078f4369fec4b7d26e308

7 years agoTurn off overflow protection for various math functions am: cbf5e6915c am: 72b1fdbf49...
Marco Nelissen [Thu, 2 Feb 2017 19:53:54 +0000 (19:53 +0000)]
Turn off overflow protection for various math functions am: cbf5e6915c am: 72b1fdbf49 am: a25eb35608 am: 3d58f94eec am: 1edbc699b5 am: c0118375e5 am: ba78beef56 am: b0ceb402c1 am: e7a758e220
am: 350db71bea

Change-Id: I8d1260360f806a605831ac070d20da52696e3608

7 years agoTurn off overflow protection for various math functions am: cbf5e6915c am: 72b1fdbf49...
Marco Nelissen [Thu, 2 Feb 2017 19:50:55 +0000 (19:50 +0000)]
Turn off overflow protection for various math functions am: cbf5e6915c am: 72b1fdbf49 am: a25eb35608 am: 3d58f94eec am: 1edbc699b5 am: c0118375e5 am: ba78beef56 am: b0ceb402c1
am: e7a758e220

Change-Id: I2e348f157daa783988fe0690f9df3d922eff34b9

7 years agoTurn off overflow protection for various math functions am: cbf5e6915c am: 72b1fdbf49...
Marco Nelissen [Thu, 2 Feb 2017 19:49:37 +0000 (19:49 +0000)]
Turn off overflow protection for various math functions am: cbf5e6915c am: 72b1fdbf49 am: a25eb35608 am: 3d58f94eec am: 1edbc699b5 am: c0118375e5 am: ba78beef56
am: b0ceb402c1

Change-Id: I3ac829f893058cec956296aeb6d2aab12a6ad758

7 years agoTurn off overflow protection for various math functions am: cbf5e6915c am: 72b1fdbf49...
Marco Nelissen [Thu, 2 Feb 2017 19:46:32 +0000 (19:46 +0000)]
Turn off overflow protection for various math functions am: cbf5e6915c am: 72b1fdbf49 am: a25eb35608 am: 3d58f94eec am: 1edbc699b5 am: c0118375e5
am: ba78beef56

Change-Id: I9c609d9a4032aca4806f3bf660722e98c7b7bd1b

7 years agoTurn off overflow protection for various math functions am: cbf5e6915c am: 72b1fdbf49...
Marco Nelissen [Thu, 2 Feb 2017 19:44:23 +0000 (19:44 +0000)]
Turn off overflow protection for various math functions am: cbf5e6915c am: 72b1fdbf49 am: a25eb35608 am: 3d58f94eec am: 1edbc699b5
am: c0118375e5

Change-Id: Ie92b4cba6575ce1c01f96ac19d4b6cd79392a19c

7 years agoTurn off overflow protection for various math functions am: cbf5e6915c am: 72b1fdbf49...
Marco Nelissen [Thu, 2 Feb 2017 19:41:52 +0000 (19:41 +0000)]
Turn off overflow protection for various math functions am: cbf5e6915c am: 72b1fdbf49 am: a25eb35608 am: 3d58f94eec
am: 1edbc699b5

Change-Id: Ibcef66b9fa5eeffd3f77e3d6da5fea1556f36113

7 years agoCameraBase: Don't return an sp<> by reference
Eino-Ville Talvala [Wed, 1 Feb 2017 23:27:41 +0000 (15:27 -0800)]
CameraBase: Don't return an sp<> by reference

If the server dies, the binder death callback clears out
the global camera service sp<>, and any current references to it
will become quite unhappy.

Test: Camera CTS passes
Bug: 31992879
Change-Id: I2966bed35d0319e3f26e3d4b1b8dc08006a22348