OSDN Git Service

android-x86/device-generic-goldfish.git
7 years agoSet default values for supported camera parameters
Bjoern Johansson [Thu, 25 Aug 2016 21:15:48 +0000 (14:15 -0700)]
Set default values for supported camera parameters

CTS requires that values which we indicate support for also have a
default value. In this cause anti-banding and effects had entries
indicating what values were supported but no value was set when querying
for the current value. This change sets reasonable defaults for these
values.

BUG: 30700822
Test: ran camera CTS tests
Change-Id: I855b9bf84a1545c169412d8ea56e3ebb3bdcf136
(cherry picked from commit 765503a76856609705e7222a165a5739055e9d24)

7 years agoSet a preferred video preview size for camera
Bjoern Johansson [Thu, 25 Aug 2016 19:49:57 +0000 (12:49 -0700)]
Set a preferred video preview size for camera

CTS requires that a preferred video preview size is set if video
previews are supported.

BUG: 30700822
Test: ran camera CTS tests
Change-Id: I52cc96c6745330e4609f925ca8087167523880db
(cherry picked from commit a3a7b67621d89e651ff08596586815296bc3b548)

7 years agoRestart camera preview on preview size change
Bjoern Johansson [Thu, 25 Aug 2016 19:24:56 +0000 (12:24 -0700)]
Restart camera preview on preview size change

Whenever the camera preview or video size changes the preview must be
restarted to ensure that the camera supplies correctly sized frames to
the camera client. In some instances the client will not validate buffer
sizes and will write into a buffer that's either too small or too large,
potentially causing data corruption or crashes.

BUG: 30700822
Test: ran camera CTS tests
Change-Id: Ie2e7726c05be1f39463654f1b8af6216d4b4cd9d
(cherry picked from commit 68d799a4c615be7a428d23fa7fa3137ae87340b9)

7 years agoAdd thumbnails to camera pictures
Bjoern Johansson [Mon, 22 Aug 2016 23:57:10 +0000 (16:57 -0700)]
Add thumbnails to camera pictures

This adds EXIF thumbnails to pictures taken by the camera. The
thumbnails will be of the size specified in the camera parameters and
JPEG compressed.

Test: ran camera CTS tests
Change-Id: Icddc435726dde748791be2f1dd2dd68fdcbc8f7e
(cherry picked from commit 833a0978d5abc730eca1975af20a4ebd9a754d7d)

7 years agoFix build for EXIF processing on 64-bit platforms
Bjoern Johansson [Fri, 19 Aug 2016 23:06:37 +0000 (16:06 -0700)]
Fix build for EXIF processing on 64-bit platforms

64-bit builds do not have time64_t since time_t itself is 64-bit, make
sure the EXIF code that processes GPS timestamps uses a 64-bit version
of time_t that exists on the current platform.

Test: ran camera CTS tests
Change-Id: Ia32ad546c57e685ec9dfdf47c65aa10fe5b5a120
(cherry picked from commit 5f9bf798dfb618fc204dfa422e89e75bbd5a7abd)

7 years agoAttach EXIF data to images from camera
Bjoern Johansson [Wed, 17 Aug 2016 22:24:44 +0000 (15:24 -0700)]
Attach EXIF data to images from camera

Create a default set of EXIF tags for any JPEG picture taken by the
emulator camera. In addition some camera parameters, such as GPS data
and focal length, will be converted to EXIF tags and placed in the
picture if they are available. This fixes the testJpegExif test in
android.hardware.cts.CameraTest and will serve as the base for fixing
other EXIF tests.

BUG: 30700822
Test: ran camera CTS tests
Change-Id: I42a4abb0190c3eb61c32b11d52a467965a9621ae
(cherry picked from commit 33ce097dedaf750d276ca5a8b7932de566e01399)

7 years agoCTS: Camera: set supported effects
bohu [Mon, 15 Aug 2016 15:16:42 +0000 (08:16 -0700)]
CTS: Camera: set supported effects

To pass the following test with emulated camera

android.hardware.camera2.cts.CaptureRequestTest#testEffectModes

Bug: 30862244
Test: ran camera CTS tests
Change-Id: Iaccdab91f03aebced72ad3d5e9e823f1e7ad2acb
(cherry picked from commit 74c4369bc503f87f2517a08acc1d3c42d5466128)

7 years agoCTS camera: Set camrecorder framerate to 24
bohu [Tue, 16 Aug 2016 00:30:36 +0000 (17:30 -0700)]
CTS camera: Set camrecorder framerate to 24

As requred by CTS, 24 is the minimum.
This fixes the following two cases:
android.hardware.camera2.cts.RecordingTest#testBasicRecording
android.hardware.camera2.cts.RecordingTest#testRecordingFromPersistentSurface

Bug: 30034008
Test: ran camera CTS tests
Change-Id: Iadd340c30eab5f449834958f83561201810e86ad
(cherry picked from commit 075f1aa4544d2f3512c8612bd607107772228d38)

7 years agoEmulator: wait for qemu-props to finish
bohu [Wed, 10 Aug 2016 15:34:13 +0000 (08:34 -0700)]
Emulator: wait for qemu-props to finish

Emulator camera module checks the qemu.sf.fake_camera property
to decide how to setup emulated cameras. If qemu-props has not
set it up yet, there will be no emulated cameras and any later
usage of emulated camera will fail.

Bug: 30768229
Test: ran camera CTS tests
Change-Id: Idb2bebd5ca3737aa416fc3094ecf15c1132ed989
(cherry picked from commit 144ee8937774ba95e9b80882b37f9f5310d498cd)

7 years agoEmulator: Set supported antibanding values for emulated camera
bohu [Tue, 9 Aug 2016 19:26:38 +0000 (12:26 -0700)]
Emulator: Set supported antibanding values for emulated camera

Bug: 30699754
Test: ran camera CTS tests
Change-Id: Iae95ee59d15d05cc39bbcdf3e96767c42d24fa81
(cherry picked from commit 5cb2b74b7c6e67955f2ccd90f7a254d8cc0076f0)

7 years agoVerify preview size parameters in emulated camera
Bjoern Johansson [Fri, 5 Aug 2016 22:24:52 +0000 (15:24 -0700)]
Verify preview size parameters in emulated camera

The camera preview size cannot have a negative width or height. Return
an error code if the caller attempts to set a negative value.

BUG: 30700822

Test: ran camera CTS tests
Change-Id: I90a0afc8ee5dce006b93cbce002029f80c4042e0
(cherry picked from commit db6633937b79829da23a9f22d91cd1be98001f3d)

7 years agoVerify focus mode and distances in emulated camera
Bjoern Johansson [Fri, 5 Aug 2016 19:18:29 +0000 (12:18 -0700)]
Verify focus mode and distances in emulated camera

The emulated camera did not have any focus distances set by default
which is required. It also did not validate that focus mode parameters
when setting camera parameters. This fix sets default focus distances at
infinity and allows all focus modes that are currently supported by the
platform.

BUG: 30700822
Test: ran camera CTS tests
Change-Id: Ic3455447a13dcf35cef8054262d68b51e1b03ede
(cherry picked from commit 02427837f62f62df0d1bd567090fd580e36563af)

7 years agoReject face detection commands in emulated camera
Bjoern Johansson [Fri, 5 Aug 2016 19:04:11 +0000 (12:04 -0700)]
Reject face detection commands in emulated camera

The emulated camera does not support hardware face detection. It
indicates this by returning zero for the number of supported faces for
face detection. However when sending commands to the camera to start or
stop face detection it would indicate success. This is not valid
behavior and with this change those commands will now indicate failure.

BUG: 30700822

Test: ran camera CTS tests
Change-Id: I27982b8c850a85cc7f415397eee07c8096a82795
(cherry picked from commit cfd4e6c764c64369247796d3adb7379964a050c0)

7 years agoUpdate media_codecs_performance.xml
Joshua Lang [Tue, 27 Sep 2016 21:53:44 +0000 (14:53 -0700)]
Update media_codecs_performance.xml

Update performance numbers to pass CTS tests.

Bug:31648354
Test: ran camera CTS tests
Change-Id: I019642d165f0df08eca75ce006706e95407dd0ee
(cherry picked from commit e6a5deace6ff39a47975408c6beccfe819e4ff23)

7 years agoPort Emulator camera and location CTS fixes from mnc-emu-dev
Jim Kaye [Fri, 23 Sep 2016 23:48:51 +0000 (16:48 -0700)]
Port Emulator camera and location CTS fixes from mnc-emu-dev

Fix Emulator CTS test for video performance
   https://googleplex-android-review.git.corp.google.com/933627
   If2ec61f2fbd3e8dd314b93b4d81c32f76847f990

Fix Emulator CTS tests for Camera, Location, Sensors, Telephony
   https://googleplex-android-review.git.corp.google.com/915391
   Icc42989d094856f13bd3655e528ebdaa8890c2b5

Fixes these CTS tests in NYC:
    android.app.cts.SystemFeaturesTest#testLocationFeatures
    android.app.cts.SystemFeaturesTest#testSensorFeatures

BUG: http://b/31751499

Test: ran camera CTS tests
Change-Id: Ic108b393e481930c2fe1a3d62d621765f96d2126
(cherry picked from commit 5c9383aeec4f92a6286ed3508e26abfcebf5b87a)

7 years agoemulator: set max-video-encoder-input-buffers value in media_codecs.xml
bohu [Tue, 12 Jul 2016 18:59:22 +0000 (11:59 -0700)]
emulator: set max-video-encoder-input-buffers value in media_codecs.xml

Without this value, mediacodec cannot create persistent input surface
error message:
MediaCodec: Failed to get encoder input buffer count!

Bug: 30088791
Test: ran camera CTS tests
Change-Id: I0306a676de564642684335b0a1c6cff5ca41011a
(cherry picked from commit 0e5dd1ded31423da7a0696761753d156aeab4cb0)

7 years agoAdd video codec config xml to goldfish devices
Joshua Lang [Thu, 6 Oct 2016 00:46:37 +0000 (17:46 -0700)]
Add video codec config xml to goldfish devices

Copied from libstagefright/data
Increased H264 encoder bitrate range as required for CTS test.

Bug:31648354
Test: ran camera CTS tests
Change-Id: I4c1630a723ef96c69466759d3dee072554233693
(cherry picked from commit fd02c63870dec2ccb7f787483be660743b9e65c3)

7 years agoMerge "Add /dev/goldfish_sync to ueventd.ranchu.rc"
Weilun Du [Tue, 10 Jan 2017 19:32:23 +0000 (19:32 +0000)]
Merge "Add /dev/goldfish_sync to ueventd.ranchu.rc"

7 years agoMerge "Allow emulator goldfish-setup to take wake locks" am: d1dad67cd7 am: 9f751f6ea...
Lingfeng Yang [Fri, 6 Jan 2017 20:18:42 +0000 (20:18 +0000)]
Merge "Allow emulator goldfish-setup to take wake locks" am: d1dad67cd7 am: 9f751f6eab am: af75232eed
am: a573a30dfe

Change-Id: I177e5b44fd6c8018afb51bbdc452ac012a75d0ab

7 years agoMerge "Allow emulator goldfish-setup to take wake locks" am: d1dad67cd7 am: 9f751f6eab
Lingfeng Yang [Fri, 6 Jan 2017 20:11:11 +0000 (20:11 +0000)]
Merge "Allow emulator goldfish-setup to take wake locks" am: d1dad67cd7 am: 9f751f6eab
am: af75232eed

Change-Id: Ia09e3f510f1ed64659d54dce2ccdae47836811e3

7 years agoMerge "Allow emulator goldfish-setup to take wake locks" am: d1dad67cd7
Lingfeng Yang [Fri, 6 Jan 2017 20:07:11 +0000 (20:07 +0000)]
Merge "Allow emulator goldfish-setup to take wake locks" am: d1dad67cd7
am: 9f751f6eab

Change-Id: I9dfe23339ba1e57709395b07e81b85e3d47b4fc9

7 years agoMerge "Allow emulator goldfish-setup to take wake locks"
Lingfeng Yang [Fri, 6 Jan 2017 20:03:41 +0000 (20:03 +0000)]
Merge "Allow emulator goldfish-setup to take wake locks"
am: d1dad67cd7

Change-Id: I221a66b609a887d06fe65a5719e3bf69dcfa9193

7 years agoMerge "Allow emulator goldfish-setup to take wake locks"
Treehugger Robot [Fri, 6 Jan 2017 19:57:52 +0000 (19:57 +0000)]
Merge "Allow emulator goldfish-setup to take wake locks"

7 years agoAllow emulator goldfish-setup to take wake locks
Lingfeng Yang [Fri, 6 Jan 2017 18:12:35 +0000 (10:12 -0800)]
Allow emulator goldfish-setup to take wake locks

Change-Id: Ic8938ebbdced308b523620cf3ab4d0ac1214106f

7 years agoUpdate init.goldfish.sh
Lingfeng Yang [Thu, 5 Jan 2017 19:47:23 +0000 (11:47 -0800)]
Update init.goldfish.sh

This allows internet to work on emulator

Change-Id: I903f3b6fb709ad936145537f1e6615f7afcc8058

7 years agoAdd /dev/goldfish_sync to ueventd.ranchu.rc
Lingfeng Yang [Mon, 18 Jul 2016 19:52:34 +0000 (12:52 -0700)]
Add /dev/goldfish_sync to ueventd.ranchu.rc

Change-Id: I7855f2f8b535310e59a5f2ffa0f00ee78e475d66
(cherry picked from commit 550585135a1a82283a0484f48a16a78c990508bc)
(cherry picked from commit f721e3e84ea4ad9c53cadd5b9811d57c9164de3c)

7 years agoUse bytesWritten instead of getOffset on SkDynamicMemoryWStream.
Ben Wagner [Thu, 15 Dec 2016 23:06:03 +0000 (18:06 -0500)]
Use bytesWritten instead of getOffset on SkDynamicMemoryWStream.

These two methods do the same thing and bytesWritten makes more sense
and is also a proper SkWStream override. As a result, getOffset is being
removed. This updates the calling code.

Test: refactoring CL. Existing unit tests still pass.
Change-Id: I2e2b60c1c86d07c5ab7ec6518d689e8bf700e5d2

7 years agoRemove old opengl code and update references am: 7db3441edb -s ours am: 4deb9fb1c0...
Yahan Zhou [Wed, 30 Nov 2016 01:59:15 +0000 (01:59 +0000)]
Remove old opengl code and update references am: 7db3441edb  -s ours am: 4deb9fb1c0  -s ours
am: a46b52a4d1  -s ours

Change-Id: Iee8934cb461a44654488e68ad7084c3e4437317e

7 years agoRemove old opengl code and update references am: 7db3441edb -s ours
Yahan Zhou [Wed, 30 Nov 2016 01:53:45 +0000 (01:53 +0000)]
Remove old opengl code and update references am: 7db3441edb  -s ours
am: 4deb9fb1c0  -s ours

Change-Id: Iec9299bda3581583dffaa4b54592b6548f766463

7 years agoRemove old opengl code and update references
Yahan Zhou [Wed, 30 Nov 2016 01:48:16 +0000 (01:48 +0000)]
Remove old opengl code and update references
am: 7db3441edb  -s ours

Change-Id: Ia2a0d1894b496ac15923e5793a60d351263fed63

7 years agoRemove old opengl code and update references
Yahan Zhou [Mon, 18 Jul 2016 21:44:07 +0000 (14:44 -0700)]
Remove old opengl code and update references

The opengl code is moved to goldfish-opengl.

BUG:32183368

Test: make

Merged-In: Ib8348464c2218c51fc8133396e6eacd5b86ec297
Change-Id: Iabfdcbbc974b78e907dfcdaf5dfdd27e103c7424
(cherry picked from commit d0e256aaacda3cf51066419be4b4a815c61994ba)

7 years agoRemove old opengl code and update references am: 7d37b2d066
Yahan Zhou [Mon, 24 Oct 2016 19:36:26 +0000 (19:36 +0000)]
Remove old opengl code and update references am: 7d37b2d066
am: e3c3917ea7

Change-Id: I5a88b8957c26640b7d749a40ffe5193a1f5d4784

7 years agoRemove old opengl code and update references
Yahan Zhou [Mon, 24 Oct 2016 19:32:57 +0000 (19:32 +0000)]
Remove old opengl code and update references
am: 7d37b2d066

Change-Id: I645939717766c985197bdb7b3333e0a26b93e6db

7 years agoRemove old opengl code and update references
Yahan Zhou [Tue, 12 Jul 2016 21:55:28 +0000 (14:55 -0700)]
Remove old opengl code and update references

The opengl code is moved to goldfish-opengl.

Test: make
Test: fix breakage

Change-Id: Ib8348464c2218c51fc8133396e6eacd5b86ec297

7 years agoMerge "Remove old opengl code and update references" into nyc-mr1-dev am: df5624ac36...
Bo Hu [Sat, 22 Oct 2016 01:57:00 +0000 (01:57 +0000)]
Merge "Remove old opengl code and update references" into nyc-mr1-dev am: df5624ac36 am: 3941aa6201
am: 4050f0d35f  -s ours

Change-Id: Ief3baafea7435250f602f0f61057dbcffb6602d1

7 years agoRemove old opengl code and update references am: c32dbea669 am: 4c91e07bd2 -s ours
Yahan Zhou [Sat, 22 Oct 2016 01:56:57 +0000 (01:56 +0000)]
Remove old opengl code and update references am: c32dbea669 am: 4c91e07bd2  -s ours
am: 60c787bfb8  -s ours

Change-Id: I35a9a3e301c40552e0f72ef308ae70cade5cd061

7 years agoMerge "Remove old opengl code and update references" into nyc-mr1-dev am: df5624ac36
Bo Hu [Sat, 22 Oct 2016 01:54:34 +0000 (01:54 +0000)]
Merge "Remove old opengl code and update references" into nyc-mr1-dev am: df5624ac36
am: 3941aa6201

Change-Id: I0d3db9e2d2c54be6767dec1c2f1555555e402b53

7 years agoRemove old opengl code and update references am: c32dbea669
Yahan Zhou [Sat, 22 Oct 2016 01:54:31 +0000 (01:54 +0000)]
Remove old opengl code and update references am: c32dbea669
am: 4c91e07bd2  -s ours

Change-Id: I736394bbeb45a6d68e3d2ae787de9b0ae23303cb

7 years agoMerge "Remove old opengl code and update references" into nyc-mr1-dev
Bo Hu [Sat, 22 Oct 2016 01:20:38 +0000 (01:20 +0000)]
Merge "Remove old opengl code and update references" into nyc-mr1-dev
am: df5624ac36

Change-Id: If546db92964adda9bc712139bb792f0ba3c1622f

7 years agoRemove old opengl code and update references
Yahan Zhou [Sat, 22 Oct 2016 01:20:29 +0000 (01:20 +0000)]
Remove old opengl code and update references
am: c32dbea669

Change-Id: I7f565caf1f0160aebdc5c65db9998c2b97367eb5

7 years agoMerge "Remove old opengl code and update references" into nyc-mr1-dev
Bo Hu [Sat, 22 Oct 2016 00:04:51 +0000 (00:04 +0000)]
Merge "Remove old opengl code and update references" into nyc-mr1-dev

7 years agoDO NOT MERGE ANYWHERE Add /dev/goldfish_sync to ueventd.ranchu.rc am: aea8e4a192...
Lingfeng Yang [Fri, 21 Oct 2016 00:38:55 +0000 (00:38 +0000)]
DO NOT MERGE ANYWHERE Add /dev/goldfish_sync to ueventd.ranchu.rc am: aea8e4a192  -s ours am: cd5cb7aba5  -s ours
am: 552acc97a9  -s ours

Change-Id: I565ae7856bffe11066e58b2c57d4c19bd54f5ca5

7 years agoDO NOT MERGE ANYWHERE Add /dev/goldfish_sync to ueventd.ranchu.rc am: aea8e4a192...
Lingfeng Yang [Fri, 21 Oct 2016 00:31:00 +0000 (00:31 +0000)]
DO NOT MERGE ANYWHERE Add /dev/goldfish_sync to ueventd.ranchu.rc am: aea8e4a192  -s ours
am: cd5cb7aba5  -s ours

Change-Id: I1808d8f5d3e0a15da19fb4ee7d9ebb3a0f32a68c

7 years agoDO NOT MERGE ANYWHERE Add /dev/goldfish_sync to ueventd.ranchu.rc
Lingfeng Yang [Fri, 21 Oct 2016 00:23:04 +0000 (00:23 +0000)]
DO NOT MERGE ANYWHERE Add /dev/goldfish_sync to ueventd.ranchu.rc
am: aea8e4a192  -s ours

Change-Id: Icadcc53a6552daa3df7c40bcf57a2589f86967d2

7 years agoDO NOT MERGE ANYWHERE Add /dev/goldfish_sync to ueventd.ranchu.rc
Lingfeng Yang [Mon, 18 Jul 2016 19:52:34 +0000 (12:52 -0700)]
DO NOT MERGE ANYWHERE Add /dev/goldfish_sync to ueventd.ranchu.rc

Change-Id: I7855f2f8b535310e59a5f2ffa0f00ee78e475d66
(cherry picked from commit 550585135a1a82283a0484f48a16a78c990508bc)

7 years agoRemove old opengl code and update references
Yahan Zhou [Mon, 18 Jul 2016 21:44:07 +0000 (14:44 -0700)]
Remove old opengl code and update references

The opengl code is moved to goldfish-opengl.

BUG:32183368
Merged-In: Ib8348464c2218c51fc8133396e6eacd5b86ec297
Change-Id: Iabfdcbbc974b78e907dfcdaf5dfdd27e103c7424
(cherry picked from commit d0e256aaacda3cf51066419be4b4a815c61994ba)

7 years agoMerge "init.goldfish.rc: Allow running 3.10+ kernels on Goldfish" am: a652a0995f...
David Turner [Mon, 17 Oct 2016 16:27:58 +0000 (16:27 +0000)]
Merge "init.goldfish.rc: Allow running 3.10+ kernels on Goldfish" am: a652a0995f am: 939d3d5f35
am: 28e667ab96

Change-Id: Ic304cfd6e440180b75ab51c889a390a3c54f7c5a

7 years agoMerge "init.goldfish.rc: Allow running 3.10+ kernels on Goldfish" am: a652a0995f
David Turner [Mon, 17 Oct 2016 16:20:58 +0000 (16:20 +0000)]
Merge "init.goldfish.rc: Allow running 3.10+ kernels on Goldfish" am: a652a0995f
am: 939d3d5f35

Change-Id: Ia87559be7ab96a674e139052e39cd11ae1401745

7 years agoMerge "init.goldfish.rc: Allow running 3.10+ kernels on Goldfish"
David Turner [Mon, 17 Oct 2016 16:13:57 +0000 (16:13 +0000)]
Merge "init.goldfish.rc: Allow running 3.10+ kernels on Goldfish"
am: a652a0995f

Change-Id: Ica4aeba1d8867d4aae834c16eb319958ade0db92

7 years agoMerge "init.goldfish.rc: Allow running 3.10+ kernels on Goldfish"
David Turner [Mon, 17 Oct 2016 16:05:15 +0000 (16:05 +0000)]
Merge "init.goldfish.rc: Allow running 3.10+ kernels on Goldfish"

8 years agoinit.goldfish.rc: Allow running 3.10+ kernels on Goldfish
Miodrag Dinic [Mon, 12 Sep 2016 08:57:33 +0000 (10:57 +0200)]
init.goldfish.rc: Allow running 3.10+ kernels on Goldfish

Since qemud service is removed and all devices use pipe device
directly, add symlinks to the pipe device file to accommodate
device naming scheme changes between kernel versions.

Without this change, Goldfish emulators won't be able to
boot if the kernel 3.10+ is used. This is the case with x86_64
emulator which uses 3.10 Goldfish kernel.

Change-Id: I451f75890c28c812e94948b31a0050bf839ea313
Signed-off-by: Miodrag Dinic <miodrag.dinic@imgtec.com>
8 years agoMerge "Remove unused include." am: 1bdcd4fe9b am: 1cea79e4ff am: 084416512d
Dmitriy Filchenko [Thu, 18 Aug 2016 19:32:05 +0000 (19:32 +0000)]
Merge "Remove unused include." am: 1bdcd4fe9b am: 1cea79e4ff am: 084416512d
am: c80beadf8d  -s ours

Change-Id: I1b42f8089ca0ee8989b67ef34f178a869ba13547

8 years agoMerge "Remove unused include." am: 1bdcd4fe9b am: 1cea79e4ff
Dmitriy Filchenko [Thu, 18 Aug 2016 19:24:33 +0000 (19:24 +0000)]
Merge "Remove unused include." am: 1bdcd4fe9b am: 1cea79e4ff
am: 084416512d

Change-Id: I322be7460ff65b69e76d08d0e11c320fd01d439c

8 years agoMerge "Remove unused include." am: 1bdcd4fe9b
Dmitriy Filchenko [Thu, 18 Aug 2016 19:21:32 +0000 (19:21 +0000)]
Merge "Remove unused include." am: 1bdcd4fe9b
am: 1cea79e4ff

Change-Id: I732be4edfcd3d6fdfd7460653e220777986801cc

8 years agoMerge "Remove unused include."
Dmitriy Filchenko [Thu, 18 Aug 2016 19:15:41 +0000 (19:15 +0000)]
Merge "Remove unused include."
am: 1bdcd4fe9b

Change-Id: Ia757c04441404f38a59f535ed5dfdaa8a2bb436f

8 years agoMerge "Remove unused include."
Treehugger Robot [Thu, 18 Aug 2016 19:11:27 +0000 (19:11 +0000)]
Merge "Remove unused include."

8 years agoRemove unused include.
Dmitriy Filchenko [Thu, 18 Aug 2016 00:59:37 +0000 (17:59 -0700)]
Remove unused include.

BUG: 29824203

Change-Id: Ie5f5de25221d38f81befbaa965427650cdac44c2
Merged-In: Ib764899053dffabae325b8e4e7488afa3892ee85

8 years agoMerge "Update the get_process_name call." am: 7a723567f4 am: d8bc1d3bb2 am: 5b2472a373
Dmitriy Filchenko [Wed, 17 Aug 2016 21:58:39 +0000 (21:58 +0000)]
Merge "Update the get_process_name call." am: 7a723567f4 am: d8bc1d3bb2 am: 5b2472a373
am: afeebfd899  -s ours

Change-Id: Ia12850810b87802f1e5bf03b2b41ce25531d6cc9

8 years agoMerge "Update the get_process_name call." am: 7a723567f4 am: d8bc1d3bb2
Dmitriy Filchenko [Wed, 17 Aug 2016 18:45:56 +0000 (18:45 +0000)]
Merge "Update the get_process_name call." am: 7a723567f4 am: d8bc1d3bb2
am: 5b2472a373

Change-Id: Ia80656ce1e5314c854d88cd5be4735d3f4964816

8 years agoMerge "Update the get_process_name call." am: 7a723567f4
Dmitriy Filchenko [Wed, 17 Aug 2016 18:42:56 +0000 (18:42 +0000)]
Merge "Update the get_process_name call." am: 7a723567f4
am: d8bc1d3bb2

Change-Id: I249ec1f0a156b73d751018eba1a5a9be52f48527

8 years agoMerge "Update the get_process_name call."
Dmitriy Filchenko [Wed, 17 Aug 2016 18:38:53 +0000 (18:38 +0000)]
Merge "Update the get_process_name call."
am: 7a723567f4

Change-Id: I1d9e3ba410bdb7396787cd5b8432172424f3bb37

8 years agoMerge "Update the get_process_name call."
Treehugger Robot [Wed, 17 Aug 2016 17:54:36 +0000 (17:54 +0000)]
Merge "Update the get_process_name call."

8 years agoUpdate the get_process_name call.
Dmitriy Filchenko [Tue, 16 Aug 2016 16:56:25 +0000 (09:56 -0700)]
Update the get_process_name call.

BUG:29824203
Change-Id: I47efa5872619dcfe36579a33162214545daa9907
Merged-In: I47efa5872619dcfe36579a33162214545daa9907

8 years agoMerge "Fix clang-tidy performance warnings in opengl." am: d101620ef6 am: db596417d3...
Chih-Hung Hsieh [Mon, 1 Aug 2016 21:33:28 +0000 (21:33 +0000)]
Merge "Fix clang-tidy performance warnings in opengl." am: d101620ef6 am: db596417d3 am: fea9576f3b
am: 0e9eb5bacf

Change-Id: I0489786274463658e8bebb211222beb94e0a8b50

8 years agoMerge "Fix clang-tidy performance warnings in opengl." am: d101620ef6 am: db596417d3
Chih-Hung Hsieh [Mon, 1 Aug 2016 21:17:19 +0000 (21:17 +0000)]
Merge "Fix clang-tidy performance warnings in opengl." am: d101620ef6 am: db596417d3
am: fea9576f3b

Change-Id: Icd495a3a6fccc64b2bf7631dfba38838d4c57590

8 years agoMerge "Fix clang-tidy performance warnings in opengl." am: d101620ef6
Chih-Hung Hsieh [Mon, 1 Aug 2016 21:13:49 +0000 (21:13 +0000)]
Merge "Fix clang-tidy performance warnings in opengl." am: d101620ef6
am: db596417d3

Change-Id: I3da6e7e21fb7bad59d083d9eaab7e26a226f85fd

8 years agoMerge "Fix clang-tidy performance warnings in opengl."
Chih-Hung Hsieh [Mon, 1 Aug 2016 21:11:21 +0000 (21:11 +0000)]
Merge "Fix clang-tidy performance warnings in opengl."
am: d101620ef6

Change-Id: I53bd1e2a1f9e98a9bd92b24a9768887d5ba3f99f

8 years agoMerge "Fix clang-tidy performance warnings in opengl."
Treehugger Robot [Mon, 1 Aug 2016 21:06:11 +0000 (21:06 +0000)]
Merge "Fix clang-tidy performance warnings in opengl."

8 years agoFix clang-tidy performance warnings in opengl.
Chih-Hung Hsieh [Wed, 27 Jul 2016 17:51:38 +0000 (10:51 -0700)]
Fix clang-tidy performance warnings in opengl.

* Use const reference parameter type to avoid unnecessary copy.

Bug: 30407689
Change-Id: I8b10727a77eb3571c1c6322f8ef957980688d138
Test: build with WITH_TIDY=1

8 years ago Fix possible lock issue in fingerprint.c
Tao Wu [Fri, 22 Jul 2016 01:59:57 +0000 (18:59 -0700)]
Fix possible lock issue in fingerprint.c

    We shouldn't hold lock when calling external api since
    those api could be block or chain to call other callbacks
    we provides.

    Currently qemud_pipe_open is non-blocking and it shouldn't have
    issue. But we don't know if its behavior will change in
    the furture. Call notify while holding lock is a real issue.
    Any way, fix both of them.

Change-Id: I83e9432bfe40f969f737340cd23e6b559ee2f423
Signed-off-by: Tao Wu <lepton@google.com>
8 years agoAdd required video frame size
Dave Detlefs [Thu, 21 Jul 2016 19:13:09 +0000 (12:13 -0700)]
Add required video frame size

b/30253054

The test class android.media.cts.MediaRecorderTest specifies a frame
size of 176x144.  EmulatedFakeCamera does not specify this as a
supported video size.  (In fact, it doesn't specify *any* supported
video sizes.)  This causes a number of failures.  Fix is to
add 176x144 to the list of supported preview sizes and video sizes.

Copied from this mnc-emu-dev CL:

https://googleplex-android-review.git.corp.google.com/#/c/1239780

Change-Id: I561ee428432e5e2bc25944838d91813e5ba2f39b

8 years agoMerge "Max video resolutions consistent with supported"
Dave Detlefs [Wed, 20 Jul 2016 19:35:27 +0000 (19:35 +0000)]
Merge "Max video resolutions consistent with supported"

8 years agoMerge "Remove old opengl code and update references"
Yahan Zhou [Wed, 20 Jul 2016 18:58:29 +0000 (18:58 +0000)]
Merge "Remove old opengl code and update references"

8 years ago[master][sensors] Fix the emulator sensor timestamp and set max/min delays
Yurii Zubrytskyi [Wed, 29 Jun 2016 19:49:10 +0000 (12:49 -0700)]
[master][sensors] Fix the emulator sensor timestamp and set max/min delays

- Emulated sensors may never have their timestamps to go greater
  than the current timestamp - otherwise they appear to be
  coming from the future. CTS don't like time travelers :(

- CTS issues a warning to logcat that emulated sensors don't
  have maxDelay set - let's fix it as well

Change-Id: I4d45953fa99ab659c00948f7ff5a57c95b7b9b69
(cherry picked from commit d8459a08cfd0e41fe5d6e3e9866f6b396f941517)

8 years ago[master][Sensors] Set a minimal delay for all sensors
Yurii Zubrytskyi [Sat, 18 Jun 2016 01:22:40 +0000 (18:22 -0700)]
[master][Sensors] Set a minimal delay for all sensors

If the min delay is not set, Android assumes it's infinite; then
strange things start happening
2000 mcs is the minimum emulator is able to reliably keep up to:
the current implementation may only go down to 1 ms between
ticks, and that's not enough as it needs some non-0 time for the
event generation and processing.

Bug=b/29462288

Change-Id: I791b7a32dbaf9b360d61c55beed72f2861d820c3
(cherry picked from commit 1850cf9f4a1f1053c2c2babd2c3f5f2e302c584f)

8 years agoMax video resolutions consistent with supported
Dave Detlefs [Wed, 20 Jul 2016 17:56:21 +0000 (10:56 -0700)]
Max video resolutions consistent with supported

Four very similar tests in android.media.cts.MediaPlayerTest had been
failing.  It turns out that the camera reports certain available
resolutions, but a separate specification of the max width and height
is given in a certain XML file, and has values less than those of the
max reported resolution.  Updating that specification to the
width/height of the max reported resolution made the tests work.

This CL is the same as the mnc-emu-dev CL

https://googleplex-android-review.git.corp.google.com/#/c/1231696

Change-Id: I9057212b05a8da6b984d857f3045ec602bd167cd

8 years agoRemove old opengl code and update references
Yahan Zhou [Tue, 12 Jul 2016 21:55:28 +0000 (14:55 -0700)]
Remove old opengl code and update references

The opengl code is moved to goldfish-opengl.

Change-Id: Ib8348464c2218c51fc8133396e6eacd5b86ec297

8 years agoFix the naming of sensor pipe
Yahan Zhou [Sat, 16 Jul 2016 00:10:43 +0000 (17:10 -0700)]
Fix the naming of sensor pipe

Making it boot in the emulator.

Change-Id: I12f190f037b2a130ba0819e5ffc8e613673cb41a

8 years agoHave emulated devices say "LTE" when on an LTE network.
Jim Kaye [Thu, 14 Jul 2016 00:09:21 +0000 (17:09 -0700)]
Have emulated devices say "LTE" when on an LTE network.

The default is to say "4G" for LTE. Override that
setting for the emulator.

BUG: http://b/30135811

Change-Id: I131d0c1f7f9ba880f94a92d7ef0ca14d2d2725e3

8 years agoMerge \\\\"Fix misc-macro-parentheses warnings in goldfish/opengl.\\\\" am: 0f478a9c1...
Chih-hung Hsieh [Thu, 7 Jul 2016 23:14:06 +0000 (23:14 +0000)]
Merge \\\\"Fix misc-macro-parentheses warnings in goldfish/opengl.\\\\" am: 0f478a9c1e am: d47aedfaa4 am: 64c0bafc4e
am: eae058b837

Change-Id: Iccd13531e91efd5b6d952bcf897d652e7162eaf8

8 years agoMerge \\\"Fix misc-macro-parentheses warnings in goldfish/opengl.\\\" am: 0f478a9c1e...
Chih-Hung Hsieh [Thu, 7 Jul 2016 23:10:31 +0000 (23:10 +0000)]
Merge \\\"Fix misc-macro-parentheses warnings in goldfish/opengl.\\\" am: 0f478a9c1e am: d47aedfaa4
am: 64c0bafc4e

Change-Id: I8da8e4825aaa61fc069d07c4d8fc9ad22fe1db2b

8 years agoMerge \\"Fix misc-macro-parentheses warnings in goldfish/opengl.\\" am: 0f478a9c1e
Chih-hung Hsieh [Thu, 7 Jul 2016 23:07:22 +0000 (23:07 +0000)]
Merge \\"Fix misc-macro-parentheses warnings in goldfish/opengl.\\" am: 0f478a9c1e
am: d47aedfaa4

Change-Id: I26323a5b5816df6f060ff869d8943cc2404d75c4

8 years agoMerge \"Fix misc-macro-parentheses warnings in goldfish/opengl.\"
Chih-Hung Hsieh [Thu, 7 Jul 2016 23:03:59 +0000 (23:03 +0000)]
Merge \"Fix misc-macro-parentheses warnings in goldfish/opengl.\"
am: 0f478a9c1e

Change-Id: Ia195117d2b2bd67dca0b8fc1c1b6193460696071

8 years agoMerge "Fix misc-macro-parentheses warnings in goldfish/opengl."
Chih-hung Hsieh [Thu, 7 Jul 2016 22:56:53 +0000 (22:56 +0000)]
Merge "Fix misc-macro-parentheses warnings in goldfish/opengl."

8 years agoFix misc-macro-parentheses warnings in goldfish/opengl.
Chih-Hung Hsieh [Thu, 9 Jun 2016 21:02:30 +0000 (14:02 -0700)]
Fix misc-macro-parentheses warnings in goldfish/opengl.

Add parentheses around macro arguments used beside operators.
Use NOLINT to suppress warning or clang-tidy can put parentheses at
wrong places.

Bug: 28705665
Change-Id: I40653d3e617f84c07b308bb9c2869219f6563706
Test: build with clang-tidy

8 years agoMerge \\\\"Fix qemu gps time stamp bug.\\\\" am: 36a3dee483 am: 0322c635fa am: a1f762873f
Bo Hu [Tue, 28 Jun 2016 19:11:00 +0000 (19:11 +0000)]
Merge \\\\"Fix qemu gps time stamp bug.\\\\" am: 36a3dee483 am: 0322c635fa am: a1f762873f
am: fb9a359a88

Change-Id: I141b7ce6d1210bad366982a7be134820c474e1df

8 years agoMerge \\\"Fix qemu gps time stamp bug.\\\" am: 36a3dee483 am: 0322c635fa
Tao Wu [Tue, 28 Jun 2016 19:05:52 +0000 (19:05 +0000)]
Merge \\\"Fix qemu gps time stamp bug.\\\" am: 36a3dee483 am: 0322c635fa
am: a1f762873f

Change-Id: I3c60da9461d3a4728922a138333266f46b544267

8 years agoMerge \\"Fix qemu gps time stamp bug.\\" am: 36a3dee483
Bo Hu [Tue, 28 Jun 2016 19:03:24 +0000 (19:03 +0000)]
Merge \\"Fix qemu gps time stamp bug.\\" am: 36a3dee483
am: 0322c635fa

Change-Id: I3fdc79a4d87c2ea4d1ddfce75cb32237b04295ca

8 years agoMerge \"Fix qemu gps time stamp bug.\"
Tao Wu [Tue, 28 Jun 2016 19:00:57 +0000 (19:00 +0000)]
Merge \"Fix qemu gps time stamp bug.\"
am: 36a3dee483

Change-Id: I4c6e3baa308e7d8b029e40c6a38bdec327fc4562

8 years agoMerge "Fix qemu gps time stamp bug."
Bo Hu [Tue, 28 Jun 2016 18:53:09 +0000 (18:53 +0000)]
Merge "Fix qemu gps time stamp bug."

8 years agoFix qemu gps time stamp bug.
Tao Wu [Tue, 28 Jun 2016 07:18:44 +0000 (00:18 -0700)]
Fix qemu gps time stamp bug.

We were sending out wrong time stamp in qemu GPS code.

Change-Id: Ie421d316d7b86b5a7b056870d3b296c4e6f4bdb1
Signed-off-by: Tao Wu <lepton@google.com>
8 years agoMerge \\\\"rild: setup rild library path in init.<board>.rc file.\\\\" am: 57569485f0...
David Turner [Thu, 23 Jun 2016 08:50:14 +0000 (08:50 +0000)]
Merge \\\\"rild: setup rild library path in init.<board>.rc file.\\\\" am: 57569485f0 am: 8dcbd2b77e am: e15fb48447
am: bb188ff872

Change-Id: I9873eff2e3e3a91fef460469a6e307cefafa4dd1

8 years agoMerge \\\"rild: setup rild library path in init.<board>.rc file.\\\" am: 57569485f0...
David 'Digit' Turner [Thu, 23 Jun 2016 08:46:36 +0000 (08:46 +0000)]
Merge \\\"rild: setup rild library path in init.<board>.rc file.\\\" am: 57569485f0 am: 8dcbd2b77e
am: e15fb48447

Change-Id: I251726007f968fd833fff46569a96af11d07312c

8 years agoMerge \\"rild: setup rild library path in init.<board>.rc file.\\" am: 57569485f0
David Turner [Thu, 23 Jun 2016 08:42:55 +0000 (08:42 +0000)]
Merge \\"rild: setup rild library path in init.<board>.rc file.\\" am: 57569485f0
am: 8dcbd2b77e

Change-Id: I10c707dcfd7cd13514cc8b83287a1326f7eb0a50

8 years agoMerge \"rild: setup rild library path in init.<board>.rc file.\"
David 'Digit' Turner [Thu, 23 Jun 2016 08:39:12 +0000 (08:39 +0000)]
Merge \"rild: setup rild library path in init.<board>.rc file.\"
am: 57569485f0

Change-Id: I69b6314e8aabbbe4d162aa35a8d78205c995aec5

8 years agoMerge "rild: setup rild library path in init.<board>.rc file."
David Turner [Thu, 23 Jun 2016 07:52:29 +0000 (07:52 +0000)]
Merge "rild: setup rild library path in init.<board>.rc file."

8 years agoFix glTexSubImage2D am: fbbbd30da0 am: 975ed60b2a
Yahan Zhou [Wed, 22 Jun 2016 19:05:25 +0000 (19:05 +0000)]
Fix glTexSubImage2D am: fbbbd30da0 am: 975ed60b2a
am: 3a8424e7cd

Change-Id: I54ac170e7c86774682fb76c8342bf3b4cd34fc5a

8 years agoFix glTexSubImage2D am: fbbbd30da0 am: daab61e5a8
Yahan Zhou [Wed, 22 Jun 2016 19:05:24 +0000 (19:05 +0000)]
Fix glTexSubImage2D am: fbbbd30da0 am: daab61e5a8
am: 49f2b78f4c

Change-Id: I823126ac204d6cea7f974f08ed4e2d69b3420544

8 years agoFix glTexSubImage2D am: fbbbd30da0
Yahan Zhou [Wed, 22 Jun 2016 19:01:57 +0000 (19:01 +0000)]
Fix glTexSubImage2D am: fbbbd30da0
am: 975ed60b2a

Change-Id: I84ea4bf366e2bb577079dd648a078a69848da05d

8 years agoFix glTexSubImage2D am: fbbbd30da0
Yahan Zhou [Wed, 22 Jun 2016 18:59:34 +0000 (18:59 +0000)]
Fix glTexSubImage2D am: fbbbd30da0
am: daab61e5a8

Change-Id: I93a35708535da6b9f178de89be2550b50f60b172