OSDN Git Service

android-x86/frameworks-av.git
7 years agoMerge "audioflinger: Adjust priority of hal threads"
Mikhail Naganov [Fri, 10 Feb 2017 16:19:41 +0000 (16:19 +0000)]
Merge "audioflinger: Adjust priority of hal threads"

7 years agoMerge "audiopolicy: Two clients can not offload concurrently"
TreeHugger Robot [Fri, 10 Feb 2017 02:05:02 +0000 (02:05 +0000)]
Merge "audiopolicy: Two clients can not offload concurrently"

7 years agoMerge "Update MtpFfsHandle tests, add new tests for small and partial files" am:...
Jerry Zhang [Fri, 10 Feb 2017 00:58:04 +0000 (00:58 +0000)]
Merge "Update MtpFfsHandle tests, add new tests for small and partial files" am: ddc029afc7 am: 47c772f677 am: 61c034aa35
am: 79902b1700

Change-Id: I38f9c56c6a0a5b79c38b6ce6ace14ca60bb94237

7 years agoMerge "Update MtpFfsHandle tests, add new tests for small and partial files" am:...
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

7 years agoMerge "Update MtpFfsHandle tests, add new tests for small and partial files" am:...
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

7 years agoMerge "Update MtpFfsHandle tests, add new tests for small and partial files"
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

7 years agoaudioflinger: Adjust priority of hal threads
Mikhail Naganov [Tue, 7 Feb 2017 18:45:09 +0000 (10:45 -0800)]
audioflinger: Adjust priority of hal threads

HALs are prohibited from using framework binder, and there is
no equivalent scheduling policy service in hwbinder. Thus, in order
to match priorities of FastCapture / Mixer threads with their
counterparts in the HAL, it is needed to request the priority boost
from audioflinger on behalf of the HAL.

Test done to verify the priority was correctly set.

Bug: 34131400
Change-Id: If8b6b031c0fcba771fae901a5b8e7da89b3a1570
Test: check priority match between audioflinger's and hal's threads

7 years agoMerge "Update MtpFfsHandle tests, add new tests for small and partial files"
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"

7 years agoMerge "AAudio: add setBufferCapacity()"
Phil Burk [Thu, 9 Feb 2017 23:24:51 +0000 (23:24 +0000)]
Merge "AAudio: add setBufferCapacity()"

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

7 years agoaudiopolicy: Two clients can not offload concurrently
Kevin Rocard [Mon, 6 Feb 2017 23:59:29 +0000 (15:59 -0800)]
audiopolicy: Two clients can not offload concurrently

If two application are playing a compatible offload stream at the same
time.
Eg: two games playing MP3. At least one not taking the audio
focus.

The audio policy was offloading both stream resulting in audio glitches
and one stream being dropped.

Concurrent offload streams is intended to be a transitioning state when
an application wants back to back playbacks.

It should not be allowed for two different applications to stream at the
same time.

Test: Play mp3 while mp3 is already offloaded.
Bug: 34012147

Change-Id: I98a8913d6faf5092a1e43a0bdd0f1ce1482221a9
Signed-off-by: Kevin Rocard <krocard@google.com>
7 years agoMerge "Camera: Check for invalid camera during API version calls"
TreeHugger Robot [Thu, 9 Feb 2017 11:06:25 +0000 (11:06 +0000)]
Merge "Camera: Check for invalid camera during API version calls"

7 years agoMerge "Fix potential null dereference in SoundTriggerHwService"
TreeHugger Robot [Thu, 9 Feb 2017 02:40:46 +0000 (02:40 +0000)]
Merge "Fix potential null dereference in SoundTriggerHwService"

7 years agoMerge "Fix static analyzer warnings" am: 9064b2d12a am: 9924503dfe am: 41194d937c
Caroline Tice [Wed, 8 Feb 2017 23:45:12 +0000 (23:45 +0000)]
Merge "Fix static analyzer warnings" am: 9064b2d12a am: 9924503dfe am: 41194d937c
am: 4b0f2f5150

Change-Id: Ic5ff05b44bcfe9edefff1044c78691d3fd6c9f98

7 years agoMerge "Fix static analyzer warnings" am: 9064b2d12a am: 9924503dfe
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

7 years agoAAudio: add setBufferCapacity()
Phil Burk [Wed, 8 Feb 2017 19:41:55 +0000 (11:41 -0800)]
AAudio: add setBufferCapacity()

This is needed so that an app can request a larger buffer.
Also fix a bug related to passing configuration data to the service.

Test: test_aaudio.cpp
Change-Id: Idd3066c84f6bac76a5d545b12081bc311025a6c3
Signed-off-by: Phil Burk <philburk@google.com>
7 years agoMerge "Fix static analyzer warnings" am: 9064b2d12a
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

7 years agoMerge "Fix static analyzer warnings"
Caroline Tice [Wed, 8 Feb 2017 23:31:55 +0000 (23:31 +0000)]
Merge "Fix static analyzer warnings"
am: 9064b2d12a

Change-Id: I3e5ef8860968de0433cc3128ff69434ff0a3e8b1

7 years agoMerge "Fix static analyzer warnings"
Treehugger Robot [Wed, 8 Feb 2017 23:28:35 +0000 (23:28 +0000)]
Merge "Fix static analyzer warnings"

7 years agoMerge "Fix divide by zero" am: 659cb35e19 am: 021add2def am: 6fe7d5973c
Marco Nelissen [Wed, 8 Feb 2017 22:44:00 +0000 (22:44 +0000)]
Merge "Fix divide by zero" am: 659cb35e19 am: 021add2def am: 6fe7d5973c
am: 77a5123b2a

Change-Id: Id75e62379acbce548ee099abb3134e6c964a9939

7 years agoMerge "Fix divide by zero" am: 659cb35e19 am: 021add2def
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

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 "Link against libhidltransport."
Martijn Coenen [Wed, 8 Feb 2017 22:17:16 +0000 (22:17 +0000)]
Merge "Link against libhidltransport."

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 agoMerge "media: Protect access to writer after free in stagefright recorder."
Hangyu Kuang [Wed, 8 Feb 2017 22:14:24 +0000 (22:14 +0000)]
Merge "media: Protect access to writer after free in stagefright recorder."

7 years agoLink against libhidltransport.
Martijn Coenen [Wed, 8 Feb 2017 22:05:46 +0000 (23:05 +0100)]
Link against libhidltransport.

To work around an issue where future dlopen()
of libraries depending on libhidltransport works
correctly.

Bug: 35041785
Test: secure video playback works again
Change-Id: I6e01dae16761044e5c89dad593aeca946c96b7bd

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 "Add missing includes"
Mathias Agopian [Wed, 8 Feb 2017 21:26:40 +0000 (21:26 +0000)]
Merge "Add missing includes"

7 years agoMerge "Fix uninitialized pointer dereference when loading default radio module."...
Tomasz Wasilczyk [Wed, 8 Feb 2017 20:54:59 +0000 (20:54 +0000)]
Merge "Fix uninitialized pointer dereference when loading default radio module." am: 94388e4b63 am: e5bad5f89a am: 2ab6368f1c
am: 4bc99bcd45

Change-Id: Id7bf3aec2086611700f2a8705aee7ca1c4e4c997

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

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 agomedia: Protect access to writer after free in stagefright recorder.
Hangyu Kuang [Wed, 8 Feb 2017 00:30:05 +0000 (16:30 -0800)]
media: Protect access to writer after free in stagefright recorder.

Test: MediaRecorder Test.
Bug: 34123593
Change-Id: I030aaeae9b0ee570207c5b0bc73602ae1aa7c115

7 years agoMerge "CameraService: don't skip device dump when there is no client"
TreeHugger Robot [Wed, 8 Feb 2017 19:34:30 +0000 (19:34 +0000)]
Merge "CameraService: don't skip device dump when there is no client"

7 years agoFix static analyzer warnings
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

7 years agoMerge "connect APIs to mediaextractor getMetrics()"
Ray Essick [Wed, 8 Feb 2017 18:58:17 +0000 (18:58 +0000)]
Merge "connect APIs to mediaextractor getMetrics()"

7 years agoCameraService: don't skip device dump when there is no client
Zhijun He [Wed, 8 Feb 2017 17:57:23 +0000 (09:57 -0800)]
CameraService: don't skip device dump when there is no client

We shouldn't skip the device metadata dump when the camera is not
in use.

Test: adb shell dumpsys media.camera works
Bug: 35125905
Change-Id: I26e2a612efa55b3289adb160c90d3fbc95bb4085

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 agoCamera: Check for invalid camera during API version calls
Emilian Peev [Tue, 7 Feb 2017 16:14:32 +0000 (16:14 +0000)]
Camera: Check for invalid camera during API version calls

CTS test case 'testCameraManagerInvalidDevice' will try
to query the static characteristics of invalid devices.
The supported camera API will also get checked as
part of the current call flow. A camera device access
exception will be thrown which is not expected. The
correct exception should be "IllegalArgumentException".

BUG: 35095452
Test: run cts -m Camera -t
android.hardware.camera2.cts.CameraManagerTest#testCameraManagerInvalidDevice
-d -o --abi armeabi-v7a --disable-reboot
Change-Id:I055deea116d5f3a69ed1a47b00d820be88a87232

7 years agoMerge "Fix some bugs in the Treble connection."
TreeHugger Robot [Wed, 8 Feb 2017 08:35:18 +0000 (08:35 +0000)]
Merge "Fix some bugs in the Treble connection."

7 years agoMerge "Update conversion functions for QueueBufferOutput."
TreeHugger Robot [Wed, 8 Feb 2017 05:33:20 +0000 (05:33 +0000)]
Merge "Update conversion functions for QueueBufferOutput."

7 years agoFix some bugs in the Treble connection.
Pawin Vongmasa [Tue, 7 Feb 2017 10:22:34 +0000 (02:22 -0800)]
Fix some bugs in the Treble connection.

Test: Do the following inside adb shell:
setenforce 0
setprop debug.treble_omx 1
pkill mediacodec
pkill mediaserver

Bug: 31399200
Change-Id: I8d0ebcca477738add8b41b58ae85539061cfad7b

7 years agoFix potential null dereference in SoundTriggerHwService
Chris Thornton [Tue, 7 Feb 2017 02:31:42 +0000 (18:31 -0800)]
Fix potential null dereference in SoundTriggerHwService

Identified by static analysis as a potential problem.

Test: mmma frameworks/av/services/soundtrigger
Change-Id: If24519faeec260c3d357b369d53d0f68689bdf8a

7 years agoAdd missing includes
Mathias Agopian [Wed, 8 Feb 2017 01:12:36 +0000 (17:12 -0800)]
Add missing includes

Test: compiled
Bug: not applicable
Change-Id: Ie4007970f83e5d08b2d35e78a49d93d696809d7b

7 years agoMerge "Fix potential overflows" am: a0c1eb865f am: ef3542347c am: 2774f292b7
Marco Nelissen [Tue, 7 Feb 2017 22:01:41 +0000 (22:01 +0000)]
Merge "Fix potential overflows" am: a0c1eb865f am: ef3542347c am: 2774f292b7
am: 3bcc22b176

Change-Id: I78bd28ee6abb4befea5c46c8d4be8799b88b227b

7 years agoMerge "Fix potential overflows" am: a0c1eb865f am: ef3542347c
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

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 "NuPlayerRenderer: Handle AMessage post error in openAudioSink"
Wei Jia [Tue, 7 Feb 2017 18:43:33 +0000 (18:43 +0000)]
Merge "NuPlayerRenderer: Handle AMessage post error in openAudioSink"

7 years agoMerge "nuplayer: handle error from MediaCodec in Decoder handleAnOutputBuffer"
Wei Jia [Tue, 7 Feb 2017 18:43:03 +0000 (18:43 +0000)]
Merge "nuplayer: handle error from MediaCodec in Decoder handleAnOutputBuffer"

7 years agoconnect APIs to mediaextractor getMetrics()
Ray Essick [Tue, 7 Feb 2017 18:03:18 +0000 (10:03 -0800)]
connect APIs to mediaextractor getMetrics()

plumbing so that user level android.media.MediaExtractor.getMetrics()
will get down to where we keep the metrics and then haul them back
to the application.  Includes the right hooks so that per-container-type
metrics will also be managed.

Bug: 35094936
Test: monitor dumpsys output, augmented CTS examination

7 years agoMerge "Camera service: Update client eviction priorities"
TreeHugger Robot [Tue, 7 Feb 2017 10:13:06 +0000 (10:13 +0000)]
Merge "Camera service: Update client eviction priorities"

7 years agoUpdate conversion functions for QueueBufferOutput.
Pawin Vongmasa [Tue, 7 Feb 2017 03:06:39 +0000 (19:06 -0800)]
Update conversion functions for QueueBufferOutput.

QueueBufferOutput was modified in ag/1806678.

Test: Compiles

Bug: 31399200
Bug: 34481539
Change-Id: Ibb0fb904047d9c00cb29f9f8b34dcf02fa0a0e5e

7 years agoMerge changes I89610b96,I9986cd8c am: e4dbaeffd7 am: 8c1b7cc246 am: 668b14005e
Jerry Zhang [Mon, 6 Feb 2017 22:44:51 +0000 (22:44 +0000)]
Merge changes I89610b96,I9986cd8c am: e4dbaeffd7 am: 8c1b7cc246 am: 668b14005e
am: b89c2bb45f

Change-Id: I11b5ff7f5b32aaa9a6eabadd62e88c277cde0144

7 years agoRetry allocations in case of ENODEV am: b4f5426604 am: 75bb252863 am: 5d5a91c008
Jerry Zhang [Mon, 6 Feb 2017 22:44:46 +0000 (22:44 +0000)]
Retry allocations in case of ENODEV am: b4f5426604 am: 75bb252863 am: 5d5a91c008
am: 8e3503051a

Change-Id: Iccb1df80bee19bf032858285f10f6ea5468ddf38

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

Change-Id: Idf4aa73819dff14dbd0c2caf5edc473662faad5b

7 years agoMerge changes I89610b96,I9986cd8c am: e4dbaeffd7 am: 8c1b7cc246
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

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

7 years agoFix GetPartialObject on FFS am: 4418030f45 am: 8eff270486
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

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 "audiohal: Make sure audio data transfer related commands go via FMQ"
Mikhail Naganov [Mon, 6 Feb 2017 16:33:54 +0000 (16:33 +0000)]
Merge "audiohal: Make sure audio data transfer related commands go via FMQ"

7 years agoCamera service: Update client eviction priorities
Emilian Peev [Wed, 1 Feb 2017 12:33:43 +0000 (12:33 +0000)]
Camera service: Update client eviction priorities

Use both oom score and process state for client eviction.
The score will have higher priority over the process state.
This should resolve the state ambiguity when PiP clients
try to connect to exclusive camera resources while
foreground clients are running.

BUG: 34701266
Test: Manual testing, complete CTS Camera package
Change-Id: Ic775b011a20e50f9c0c1c0a4bc1cf7ca75410740

7 years agoMerge "Merge "Turn off overflow protection for various math functions" into nyc-dev...
Marco Nelissen [Fri, 3 Feb 2017 23:59:33 +0000 (23:59 +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
am: a0d2eb6a71

Change-Id: I85fcdd037e1624d6849fb994c46a66efb95a6a2d

7 years agoMerge "Turn off overflow protection for various math functions" into nyc-dev am:...
Marco Nelissen [Fri, 3 Feb 2017 23:59:31 +0000 (23:59 +0000)]
Merge "Turn off overflow protection for various math functions" into nyc-dev am: d51a9b554e am: d4de6c34b7 am: f791b1f376 am: 60721afe7b am: 90084e82ba
am: f05d4e101a

Change-Id: If9979449a1f611da5d2c65db892a8134f48db601

7 years agoMerge "Merge "Turn off overflow protection for various math functions" into nyc-dev...
Marco Nelissen [Fri, 3 Feb 2017 23:59:07 +0000 (23:59 +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
am: 1a51093067

Change-Id: Iffb4f81bbd35026837ac31a7cb7281d180360060

7 years agoMerge "Turn off overflow protection for various math functions" into nyc-dev am:...
Marco Nelissen [Fri, 3 Feb 2017 23:59:06 +0000 (23:59 +0000)]
Merge "Turn off overflow protection for various math functions" into nyc-dev am: d51a9b554e am: d4de6c34b7 am: f791b1f376 am: 60721afe7b am: 7b497b1edd
am: d820f34f03

Change-Id: Id958b36d6c9513dcc4cd19d9339eb24308a525c2

7 years agoMerge "Turn off overflow protection for various math functions am: 42b1ea8a93 am...
Marco Nelissen [Fri, 3 Feb 2017 23:58:47 +0000 (23:58 +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
am: 7ba88ffa4c

Change-Id: I8ffa6bd2b786cfd85ecfd1ede56e2ef18ca88b5c

7 years agoTurn off overflow protection for various math functions am: 42b1ea8a93 am: 0785ced61b...
Marco Nelissen [Fri, 3 Feb 2017 23:58:46 +0000 (23:58 +0000)]
Turn off overflow protection for various math functions am: 42b1ea8a93 am: 0785ced61b am: 6f0b9ca8a5 am: ef2510a3de am: 98e036257a
am: ba27467c03

Change-Id: I4bc8987b615cca420a86bddb2e8e3ca249e3ffab

7 years agoTurn off overflow protection for various math functions am: 42b1ea8a93 am: 0785ced61b...
Marco Nelissen [Fri, 3 Feb 2017 23:58:31 +0000 (23:58 +0000)]
Turn off overflow protection for various math functions am: 42b1ea8a93 am: 0785ced61b am: 6f0b9ca8a5 am: ef2510a3de am: fc46c290ea
am: 759ded4dca

Change-Id: Ic308abc85c26b5dc77716e8536843ba6be65355a

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

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

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

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

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

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

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

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

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: If480835fb3eea21f0a20f1abf22e4976afaa70fa

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 agoAdd getdents64 to seccomp policy
Marco Nelissen [Fri, 3 Feb 2017 20:37:34 +0000 (12:37 -0800)]
Add getdents64 to seccomp policy

Bug: 34819438
Test: recorded video
Change-Id: Ia764bb0c20a95d822f350e546d61e4948f60a5ac