OSDN Git Service
Lingfeng Yang [Fri, 27 May 2016 16:52:03 +0000 (16:52 +0000)]
Don\'t optimize out rcUpdateColorBuffer am:
03031766dd
am:
611c9ce987
* commit '
611c9ce987d6db46445286e3385b8719e80f9d7e':
Don't optimize out rcUpdateColorBuffer
Change-Id: I29ee62bd181e22db61cca8c3af4b7752c291904a
Lingfeng Yang [Fri, 27 May 2016 16:48:24 +0000 (16:48 +0000)]
Don\'t optimize out rcUpdateColorBuffer
am:
03031766dd
* commit '
03031766dd3978edbb4b6e6d39139d215036921c':
Don't optimize out rcUpdateColorBuffer
Change-Id: I5d5db64d94139b8c99c37cd85ee5203ff4c5011b
Lingfeng Yang [Wed, 25 May 2016 15:31:06 +0000 (08:31 -0700)]
Don't optimize out rcUpdateColorBuffer
bug:
28406160
If we want to use rcUpdateColorBuffer to
synchronize on the host in order to remove
out of order webcam frames, we need to call it
if (cb->hostHandle), not just when
the width and height are nonzero.
Otherwise, we get deadlocks.
Change-Id: Ib98774b935e8786e307dd38711a0f2f9ffea440e
(cherry picked from commit
6298285500362b217b73b96def2ce207e206171d)
Dan Austin [Wed, 25 May 2016 21:06:29 +0000 (21:06 +0000)]
Merge "Fix const issues in preparation for libcxx rebase." am:
c3aab193bf am:
d0347bc119
am:
bf3f6190b6
* commit '
bf3f6190b61921383f3615e75dcb60db8368f1dd':
Fix const issues in preparation for libcxx rebase.
Change-Id: I83ed69d251bc3efd309fafae1e14e7d4a7d54a3b
Dan Austin [Wed, 25 May 2016 20:57:38 +0000 (20:57 +0000)]
Merge "Fix const issues in preparation for libcxx rebase." am:
c3aab193bf
am:
d0347bc119
* commit '
d0347bc119c08c49db485cb0786372e0c2a7902d':
Fix const issues in preparation for libcxx rebase.
Change-Id: Icdc695f2c42ec0ed97610c31055d1c643aca7b3d
Dan Austin [Wed, 25 May 2016 20:52:57 +0000 (20:52 +0000)]
Merge "Fix const issues in preparation for libcxx rebase."
am:
c3aab193bf
* commit '
c3aab193bf45fb871e04c0b2096e088b3a2089bb':
Fix const issues in preparation for libcxx rebase.
Change-Id: If925b6590d99539e270dc96cf32244f3b1541609
Dan Austin [Wed, 25 May 2016 20:40:19 +0000 (20:40 +0000)]
Merge "Fix const issues in preparation for libcxx rebase."
Dan Austin [Wed, 25 May 2016 19:46:28 +0000 (12:46 -0700)]
Fix const issues in preparation for libcxx rebase.
Change-Id: I2a939c87af3ef9881d9c806ba374185bd31a4954
Android Build Merger (Role) [Tue, 24 May 2016 20:57:17 +0000 (20:57 +0000)]
Merge "Create and read color buffer when expecting reads am:
ca3b20ff0d am:
8a6571bd3a" into nyc-mr1-dev-plus-aosp
Bjoern Johansson [Tue, 24 May 2016 20:57:01 +0000 (20:57 +0000)]
Create and read color buffer when expecting reads am:
ca3b20ff0d
am:
8a6571bd3a
* commit '
8a6571bd3a03fb2fc328b6f632052debca9f0db0':
Create and read color buffer when expecting reads
Change-Id: I48b3a37fbcf447d3f728ed701acebf8ffd79897e
Bjoern Johansson [Tue, 24 May 2016 20:57:00 +0000 (20:57 +0000)]
Create and read color buffer when expecting reads am:
ca3b20ff0d
am:
de2df84ba9
* commit '
de2df84ba9cfdabb2d0b4956b9d81ca1030dd9fe':
Create and read color buffer when expecting reads
Change-Id: I04feaf5ac5683e2f8536f8b1cc6769ccc1c5f4a8
Bjoern Johansson [Tue, 24 May 2016 20:54:27 +0000 (20:54 +0000)]
Create and read color buffer when expecting reads
am:
ca3b20ff0d
* commit '
ca3b20ff0dd8fed5dae26409c255c68ce73723af':
Create and read color buffer when expecting reads
Change-Id: I9493b13c8953ca04846d5cb94039608671daf1a0
Bjoern Johansson [Tue, 24 May 2016 20:54:27 +0000 (20:54 +0000)]
Create and read color buffer when expecting reads
am:
ca3b20ff0d
* commit '
ca3b20ff0dd8fed5dae26409c255c68ce73723af':
Create and read color buffer when expecting reads
Change-Id: Ifd5181703ab28e3c34879eb8fe17887f694077df
Bjoern Johansson [Thu, 12 May 2016 17:38:27 +0000 (10:38 -0700)]
Create and read color buffer when expecting reads
Make sure color buffers are created when gralloc is allocating buffers
that indicate that software reads are going to happen. In this case
software will require the rendered data to be available from the host at
a later point and that means that rendering has to be stored in a color
buffer. Also make sure that when gralloc locks a buffer for reading it
will actually read the data from the host if the buffer is marked for
reading.
BUG:
28932862
Change-Id: Ief4b7fe34401727cabec9fdd5c2b9812a6c49612
(cherry picked from commit
2637058369fe1ba1a692e5eb9da95624f1bc6f9c)
Yurii Zubrytskyi [Mon, 16 May 2016 20:49:01 +0000 (20:49 +0000)]
[phone] Set up the GPU caching parameters for emulator device am:
6fc69c7d71
am:
065e459db0
* commit '
065e459db0e5e08489b22f251181a8dd51523e7b':
Change-Id: If519e7bd108c4660d76dd4a932ce8a7ef71bce53
Yurii Zubrytskyi [Mon, 16 May 2016 20:44:19 +0000 (20:44 +0000)]
[phone] Set up the GPU caching parameters for emulator device am:
6fc69c7d71
am:
ecb63f7dc4
* commit '
ecb63f7dc4e4b22dd0b3c6aee75a7586438dc8b4':
[phone] Set up the GPU caching parameters for emulator device
Change-Id: I52eb05a3c0eef785586abd183083de5a4338538e
Yurii Zubrytskyi [Mon, 16 May 2016 20:41:59 +0000 (20:41 +0000)]
[phone] Set up the GPU caching parameters for emulator device
am:
6fc69c7d71
* commit '
6fc69c7d7126a515f0f92b5da5d576e9c9d0cc4e':
[phone] Set up the GPU caching parameters for emulator device
Change-Id: I1686aa81daf80a8003e0c5d206406de761332a1a
Yurii Zubrytskyi [Mon, 16 May 2016 20:41:57 +0000 (20:41 +0000)]
[phone] Set up the GPU caching parameters for emulator device
am:
6fc69c7d71
* commit '
6fc69c7d7126a515f0f92b5da5d576e9c9d0cc4e':
[phone] Set up the GPU caching parameters for emulator device
Change-Id: I21e1bf166d3b1c044439c8277eae3d7b7fefb06b
Yurii Zubrytskyi [Fri, 13 May 2016 21:13:32 +0000 (14:13 -0700)]
[phone] Set up the GPU caching parameters for emulator device
Default texture cache is way too small to be able to handle
large background images; this causes huge performance issues
in the emulator;
This CL tweaks the caching parameters to be on par with physical
devices
Bug=https://b.corp.google.com/u/0/issues/
28752126
Change-Id: I1852038f7065cc4b00b425fdf5fc35afe4168ace
Android Build Merger (Role) [Tue, 3 May 2016 23:30:21 +0000 (23:30 +0000)]
Merge "Emulator: fix fingerprint regression am:
ad525fea6e am:
93ab10b0c1" into nyc-mr1-dev-plus-aosp
bohu [Tue, 3 May 2016 23:30:12 +0000 (23:30 +0000)]
Emulator: fix fingerprint regression am:
ad525fea6e
am:
93ab10b0c1
* commit '
93ab10b0c1c644566b13e30d9c89708897189a0b':
Emulator: fix fingerprint regression
Change-Id: I4dcf60ea67767f56a7feb11dcc6ad4ae3d59bfb5
bohu [Tue, 3 May 2016 23:30:11 +0000 (23:30 +0000)]
Emulator: fix fingerprint regression am:
ad525fea6e
am:
5a0df9cf6a
* commit '
5a0df9cf6a28f1548a091ac33d9496d8cd4c0c7c':
Emulator: fix fingerprint regression
Change-Id: I9381b715ca097989faba059e1be0eb7ff7883ea1
bohu [Tue, 3 May 2016 23:27:44 +0000 (23:27 +0000)]
Emulator: fix fingerprint regression
am:
ad525fea6e
* commit '
ad525fea6eae8c4614c7ae25f9e718084513248c':
Emulator: fix fingerprint regression
Change-Id: Iec22776cfc97e003401be2257255599d831cf98f
bohu [Tue, 3 May 2016 23:27:44 +0000 (23:27 +0000)]
Emulator: fix fingerprint regression
am:
ad525fea6e
* commit '
ad525fea6eae8c4614c7ae25f9e718084513248c':
Emulator: fix fingerprint regression
Change-Id: I8c42ba1e1882b16b33c0bb957cd2da374234cd18
bohu [Thu, 28 Apr 2016 19:51:12 +0000 (12:51 -0700)]
Emulator: fix fingerprint regression
bug:
28421052
Now the authenticator_id means something.
Change-Id: Icfca3b672fe00b0c2e40ad58e1facdf2f60281dd
Nick Kralevich [Tue, 12 Apr 2016 22:12:06 +0000 (22:12 +0000)]
Delete /mnt/sdcard symlink
am:
f7f9192
* commit '
f7f9192d71c19fa3c14339316000084f27d21063':
Delete /mnt/sdcard symlink
Change-Id: Idaaf9182b82187114130ecf511fd313f0ba5da9c
Yahan Zhou [Tue, 12 Apr 2016 22:12:06 +0000 (22:12 +0000)]
Exit when QemuPipe is corrupted by GL
am:
bb75ccc
* commit '
bb75cccc6426826294aee990a095b19060ee8883':
Exit when QemuPipe is corrupted by GL
Change-Id: I60166c4161a5394e2edadca6b9f10a8f784dc6fa
Nick Kralevich [Tue, 12 Apr 2016 19:45:00 +0000 (12:45 -0700)]
Delete /mnt/sdcard symlink
Bug:
28108983
Change-Id: I259be7b9ba00950846674bd3b328deb0ba657f1a
Yahan Zhou [Tue, 8 Mar 2016 22:02:22 +0000 (14:02 -0800)]
Exit when QemuPipe is corrupted by GL
Previously when QemuPipe is corrupted, it prints an error message, and
the application will continue to use it, which leads to random behaviour
in GL on the host.
This patch crashes the APP and pops up the crash dialog when the pipe is
(going to be) corrupted. It would happen if the user asks GL to write /
read a NULL pointer (i.e. passing NULL to glGenBuffers). It might also
happen for other unknown reasons.
Change-Id: I303772029bb72a845fa0d4c79b0d38dba1fca2c7
(cherry picked from commit
5bc2615d233a2a5de39f1033be4f063d0ae8f5e4)
Yahan Zhou [Tue, 12 Apr 2016 17:18:02 +0000 (17:18 +0000)]
Merge "Workaround: disable checksum for a problem in glTexSubImage2D" into nyc-dev
am:
6dfd183
* commit '
6dfd183133a94c6e38982fc2756cb79ed5b6eae5':
Workaround: disable checksum for a problem in glTexSubImage2D
Change-Id: I4b60269382ad0bb6926acccb5c4b08830d3dcfbb
Bo Hu [Tue, 12 Apr 2016 17:09:21 +0000 (17:09 +0000)]
Merge "Workaround: disable checksum for a problem in glTexSubImage2D" into nyc-dev
Yahan Zhou [Tue, 12 Apr 2016 17:02:38 +0000 (10:02 -0700)]
Workaround: disable checksum for a problem in glTexSubImage2D
This is a temporary workaround for a problem in glTexSubImage2D. It
disables the GL checksum to avoid crashes. Please revert this CL when
the root cause is solved.
Change-Id: I8401449e42da87f580f119982a1bcb1b6b9a4c8b
Lingfeng Yang [Thu, 7 Apr 2016 23:59:27 +0000 (23:59 +0000)]
Merge "Stop aggressive validation in glVertexAttribPointer" into nyc-dev
am:
3bf9ef4
* commit '
3bf9ef45c19b85eec827cd8acef1bcdcf26f4182':
Stop aggressive validation in glVertexAttribPointer
Change-Id: Ib5fff9b967f9de0efbab325d92d5de22de93d04f
Lingfeng Yang [Thu, 7 Apr 2016 23:47:12 +0000 (23:47 +0000)]
Merge "Stop aggressive validation in glVertexAttribPointer" into nyc-dev
bohu [Thu, 7 Apr 2016 23:08:02 +0000 (23:08 +0000)]
Emulator: Fix camera crash
am:
d81ee62
* commit '
d81ee62349fc40c82200803077b7a9550d44fe19':
Emulator: Fix camera crash
Change-Id: I28cd5c3445951944acf28033cd5b34f1729b7540
bohu [Thu, 7 Apr 2016 22:51:14 +0000 (15:51 -0700)]
Emulator: Fix camera crash
Because the camera runs a thread without giving it a name.
bug:
28074344
Change-Id: I85fd0d0786e82305d6615e7f50b7394785e96df7
Lingfeng Yang [Thu, 7 Apr 2016 22:23:28 +0000 (15:23 -0700)]
Stop aggressive validation in glVertexAttribPointer
This breaks Antutu 3D benchmark.
Change-Id: I72ef2fe25f841b851bcc947b707019d94c88a8e1
Yahan Zhou [Wed, 23 Mar 2016 21:13:02 +0000 (21:13 +0000)]
Merge changes from topic \'GL pipe checksum (nyc)\' into nyc-dev
am:
6f05412
* commit '
6f054128fe33fd98d929c43aa4b8d8af630f73ad':
Checksum for GLES messages from host to guest
Checksum for GL pipe communication
Yahan Zhou [Wed, 23 Mar 2016 20:58:49 +0000 (20:58 +0000)]
Merge changes from topic 'GL pipe checksum (nyc)' into nyc-dev
* changes:
Checksum for GLES messages from host to guest
Checksum for GL pipe communication
Yahan Zhou [Wed, 16 Mar 2016 19:41:08 +0000 (12:41 -0700)]
Checksum for GLES messages from host to guest
Add checksum for GLES messages from host to guest. This patch contains
generated code (gl_enc.cpp, gl2_enc.cpp, renderControl_enc.cpp) and
shared code with the host (ChecksumCalculator.cpp,
ChecksumCalculator.h).
(cherry picked from commit
eee828509ce3d8fac4f962a68e8d381e83223f8a)
Change-Id: Ie95128c50ad4536ecdcf5f075889313169d677d2
Yahan Zhou [Thu, 10 Mar 2016 19:45:02 +0000 (11:45 -0800)]
Checksum for GL pipe communication
This is the guest side implementation for cl go/oag/c/207292.
It initializes checksum whenever a renderControl is created. Each
HostConnection owns a checksum structure.
The list contains mostly auto-generated code by emugen.
(cherry picked from commit
bfd420ab5f9e0704012b6796522ef78cd56a3ac4)
Change-Id: I2eacc654522f048a82a77803f71116ba58a39e86
Yahan Zhou [Wed, 23 Mar 2016 00:00:37 +0000 (00:00 +0000)]
Fix a typo in GLES encoder headers
am:
eaf0c97
* commit '
eaf0c975eee97b004b32e1243fa6a49bc89c81fd':
Fix a typo in GLES encoder headers
Yahan Zhou [Mon, 21 Mar 2016 23:11:38 +0000 (16:11 -0700)]
Fix a typo in GLES encoder headers
Unimportant but let's fix it.
Change-Id: I360ba0dc0b676238adaeb5d4360c10a9ec8c2371
(cherry picked from commit
10c23934975b8c053e1991af4e5af06c5d4a6573)
Brian Carlstrom [Mon, 14 Mar 2016 15:24:44 +0000 (15:24 +0000)]
device/generic/goldfish/camera: Make Thread::run threadName argument required
am:
3d1bfd57c1
* commit '
3d1bfd57c186daca1e06c362b0ba09729ddee88f':
device/generic/goldfish/camera: Make Thread::run threadName argument required
Brian Carlstrom [Sun, 13 Mar 2016 05:38:47 +0000 (21:38 -0800)]
device/generic/goldfish/camera: Make Thread::run threadName argument required
Bug:
27557176
Change-Id: If15d0574a53a7d48ac87d6d0865a43f3cc6debbc
Prathmesh Prabhu [Fri, 11 Mar 2016 18:43:27 +0000 (18:43 +0000)]
fingerprint: Don\'t call notify on fingerprit_cancel.
am:
80b6241d91
* commit '
80b6241d91920fa56270e29b132cbd113001004d':
fingerprint: Don't call notify on fingerprit_cancel.
Prathmesh Prabhu [Fri, 11 Mar 2016 02:14:19 +0000 (18:14 -0800)]
fingerprint: Don't call notify on fingerprit_cancel.
Fingerprint cancel doesn't expect notify to be called as a result of
calling fingerprint_cancel. In fact, doing so will cause it to crash
when fingerprint_remove is called.
BUG:
27548519
Change-Id: Ib4467756f8128ab74754e358f3bef3966dcf6d9f
Prathmesh Prabhu [Tue, 8 Mar 2016 20:06:26 +0000 (20:06 +0000)]
Merge "Settings: Show on-screen keyboard when hardware keyboard is attached." into nyc-dev
am:
9940731ed3
* commit '
9940731ed3a495337093bc9ab57c9089bcbe4b3a':
Settings: Show on-screen keyboard when hardware keyboard is attached.
Prathmesh Prabhu [Tue, 8 Mar 2016 19:55:58 +0000 (19:55 +0000)]
Merge "Settings: Show on-screen keyboard when hardware keyboard is attached." into nyc-dev
Prathmesh Prabhu [Fri, 4 Mar 2016 23:55:47 +0000 (23:55 +0000)]
Merge "Settings: Start with screen unlocked after boot." into nyc-dev
am:
01d7db0cc5
* commit '
01d7db0cc50b4f0b735c70a7a620decfcc7a5378':
Settings: Start with screen unlocked after boot.
Prathmesh Prabhu [Fri, 4 Mar 2016 23:49:07 +0000 (23:49 +0000)]
Merge "Settings: Start with screen unlocked after boot." into nyc-dev
Prathmesh Prabhu [Fri, 4 Mar 2016 23:40:29 +0000 (15:40 -0800)]
Settings: Show on-screen keyboard when hardware keyboard is attached.
Changes the default behvaiour of hiding the on-screen keyboard when a
hardware keyboard is attached. We want both for the users of emulator.
BUG:
27484734
Change-Id: I8c8f0183cbbe17d857dea8ed36a1855be95ab25a
Prathmesh Prabhu [Fri, 4 Mar 2016 21:41:10 +0000 (13:41 -0800)]
Settings: Start with screen unlocked after boot.
This CL adds a product overlay for goldfish and overrides the default
property used by SettingsProvider to unlock screen on boot.
BUG:
2748734
Change-Id: I222a8b2781169603e33147c787692a893d32c1e0
bohu [Fri, 4 Mar 2016 18:10:23 +0000 (18:10 +0000)]
Emulator: remove expensive glCheckFramebufferStatus
am:
4df5506384
* commit '
4df5506384ebefc4c12b3cda389d95c228476a60':
Emulator: remove expensive glCheckFramebufferStatus
bohu [Fri, 4 Mar 2016 07:58:54 +0000 (23:58 -0800)]
Emulator: remove expensive glCheckFramebufferStatus
The additional calls of glCheckFramebufferStatus in glDraw*
functions have very negative impact on framerate.
More specifically, the glCheckFramebufferStatus will flush
the write buffer of qemu-pipe and then do a block read until
the host finishes all the gl calls before this call and send
back results. This turns out to be costly, probably partially
due to the relatively longer latency (than real GPU) we have
in the GPU emulation layer -- it would be nice to hammer
that latency down in the near future.
bug:
27418143
Change-Id: Ic6d9e739562c6bd0b688d62805fda4d469b98759
Lingfeng Yang [Wed, 2 Mar 2016 06:46:11 +0000 (06:46 +0000)]
Cache glGetIntegerv(GL_MAX_VERTEX_ATTRIBS, int*).
am:
a31a031015
* commit '
a31a0310154660e3105ab6a1955d3667efda3630':
Cache glGetIntegerv(GL_MAX_VERTEX_ATTRIBS, int*).
Lingfeng Yang [Wed, 2 Mar 2016 05:27:49 +0000 (21:27 -0800)]
Cache glGetIntegerv(GL_MAX_VERTEX_ATTRIBS, int*).
BUG:
27418143
If we don't, the chatter over the pipe will
kill framerate.
I believe this is OK for the emulator,
as the parameter is dependent on only the
GPU hardware.
Change-Id: I9bd74de6317316902bddf54b915ef509625cee52
bohu [Tue, 1 Mar 2016 22:56:40 +0000 (22:56 +0000)]
Merge "Revert "Fix glActiveTexture invalid parameter bug"" into nyc-dev
am:
24db87f763
* commit '
24db87f76308c1eb933dbb32f312fe53f945cbc9':
Revert "Fix glActiveTexture invalid parameter bug"
Bo Hu [Tue, 1 Mar 2016 21:36:42 +0000 (21:36 +0000)]
Merge "Revert "Fix glActiveTexture invalid parameter bug"" into nyc-dev
Yu Ning [Mon, 29 Feb 2016 21:20:34 +0000 (21:20 +0000)]
ranchu: Enable an adoptable SD card
am:
61d3a7e611
* commit '
61d3a7e61111ea06f7173635e1118a2648a6db80':
ranchu: Enable an adoptable SD card
Yu Ning [Fri, 8 Jan 2016 09:53:31 +0000 (17:53 +0800)]
ranchu: Enable an adoptable SD card
This CL is only applicable to API 23 and above. It is the ranchu version
of https://android-review.googlesource.com/195220. See also a related CL
that works for APIs 21 and 22:
https://android-review.googlesource.com/145850
It requires the following CLs:
https://android-review.googlesource.com/195057
https://android-review.googlesource.com/195240
Change-Id: Id77a3bc3d0d9a054f7e9c0f70cce678f2627912a
Signed-off-by: Yu Ning <yu.ning@intel.com>
(cherry picked from commit
f08ecd12ddcde47deee418dfdb652fde5d38a16d)
Prathmesh Prabhu [Fri, 26 Feb 2016 00:13:57 +0000 (00:13 +0000)]
[camera] Be permissive about no-op metadata request.
am:
294e955a1c
* commit '
294e955a1cbb89366a9224d1d01338d14a91cd58':
[camera] Be permissive about no-op metadata request.
Prathmesh Prabhu [Thu, 25 Feb 2016 23:47:11 +0000 (15:47 -0800)]
[camera] Be permissive about no-op metadata request.
Instead of returning error, silently agree if emulated camera is
requested to not include metadata in the video. We don't support
metadata, but if we return an error when requested to not include
metadata, framework treats it as an error, and video recording fails.
BUG=b.android.com/201678
Change-Id: I3ccf8de76ae150a881d82da5e13f87aa60f49aa0
bohu [Thu, 25 Feb 2016 23:22:41 +0000 (23:22 +0000)]
Revert "Fix glActiveTexture invalid parameter bug"
am:
276fa6bd1d
* commit '
276fa6bd1d188bd606c7f006ff5fa30710b7b19d':
Revert "Fix glActiveTexture invalid parameter bug"
bohu [Thu, 25 Feb 2016 23:07:31 +0000 (15:07 -0800)]
Revert "Fix glActiveTexture invalid parameter bug"
This reverts commit
ac3f6d133db03e03dbbd15754d0d342748a81967.
Because somehow, the init is not called and the check failed
everytime.
bug:
27324004
Change-Id: Id667926cf40e94ea666fbec534a4b54277657aea
bohu [Thu, 25 Feb 2016 23:07:31 +0000 (15:07 -0800)]
Revert "Fix glActiveTexture invalid parameter bug"
This reverts commit
ac3f6d133db03e03dbbd15754d0d342748a81967.
Because somehow, the init is not called and the check failed
everytime.
bohu [Thu, 25 Feb 2016 19:24:06 +0000 (19:24 +0000)]
Emulator: use FINGERPRINT_FILENAME
am:
2d354db529
* commit '
2d354db5299a0d4c1f61abd06202ec180a95276a':
Emulator: use FINGERPRINT_FILENAME
bohu [Thu, 25 Feb 2016 19:00:21 +0000 (11:00 -0800)]
Emulator: use FINGERPRINT_FILENAME
instead of hardcoded filename
Change-Id: Ie046904160c34eedaa04fe22caa799d52376013e
bohu [Thu, 25 Feb 2016 18:56:01 +0000 (18:56 +0000)]
Emulator: fix fingerprint regression
am:
27c1e6cd69
* commit '
27c1e6cd697493e3c7e3ee7479080a58249cd72e':
Emulator: fix fingerprint regression
bohu [Thu, 25 Feb 2016 18:23:23 +0000 (10:23 -0800)]
Emulator: fix fingerprint regression
It cannot save fingerprints or load it at restart.
bug:
27337363
Fixed by (1) correcting the filename (2) loading
fingerprints _after_ active group is set.
Change-Id: I3f8fabdecb8ebe1ebad91bd8c5d42dd8095a0c71
Yahan Zhou [Mon, 22 Feb 2016 21:48:35 +0000 (21:48 +0000)]
GL encoder null pointer check before write
am:
e11bc58ade
* commit '
e11bc58adeae10786220c16e499e4078f112cf0b':
GL encoder null pointer check before write
Yahan Zhou [Fri, 19 Feb 2016 21:59:34 +0000 (13:59 -0800)]
GL encoder null pointer check before write
BUG=
27273457
Previously when encoding some functions, if the user gives us a null
pointer, the encoder will write a header with some data length while not
actually writing any data. This patch fix it by writing 0 into the data
length field for all those functions.
The changed functions include:
glBufferSubData
glCompressedSubTexImage2D
glTexSubImage3DOES
glCompressedTexImage3DOES
glCompressedTexSubImage3DOES
Other functions do not directly write user's pointer, so they don't need
to be updated.
Since this is auto-generated code, there would be another patch in
emu-master-dev to update the code generator.
Change-Id: I05fca078dfcf01e20fa757f1050820b21ca080b7
(cherry picked from commit
82b3ebce97851f019991965301ab6063ba7a1fee)
Yu Ning [Sat, 20 Feb 2016 01:37:47 +0000 (01:37 +0000)]
goldfish: Make SD card adoptable
am:
4b25713034
* commit '
4b25713034cd4eeed734812aef1fe41dce963621':
goldfish: Make SD card adoptable
Yu Ning [Fri, 8 Jan 2016 07:16:02 +0000 (15:16 +0800)]
goldfish: Make SD card adoptable
The current storage configuration for the classic emulator (goldfish)
follows the "Android 6.0: Physical primary only" example per:
https://source.android.com/devices/storage/config-example.html
It only allows the virtual SD card to be used as external storage. A
better configuration scheme would be "Android 6.0: Emulated primary,
physical secondary", which gives the user the choice to format the
virtual SD card as internal storage, if they so prefer.
This CL implements the new configuration. It is only applicable to API
23 and above, and requires the following CL:
https://android-review.googlesource.com/195057
BUG=
27273457
Change-Id: Idd2b51da5e90680b54d3534e5fed1424dc7e2a60
Signed-off-by: Yu Ning <yu.ning@intel.com>
(cherry picked from commit
ec1e5323e59192dd9641695248a16049939aa8e0)
Prathmesh Prabhu [Fri, 19 Feb 2016 22:36:39 +0000 (22:36 +0000)]
GLESv2: Correctly handle location -1 in shared groups.
am:
c675b2a62b
* commit '
c675b2a62b59ed17c5a6b97401798ed39063fba2':
GLESv2: Correctly handle location -1 in shared groups.
Prathmesh Prabhu [Fri, 19 Feb 2016 22:20:44 +0000 (14:20 -0800)]
GLESv2: Correctly handle location -1 in shared groups.
Before this CL, getHostLocation left an out parameter undefined when
accessing location == -1.
It now sets it to -1, consistent with the rest of the SharedGroup
library.
BUG=b.android.com/199855
BUG=
27273807
Change-Id: Ibbc234e22895083b2057fe5feb34dbd6d7b02be3
Christopher Wiley [Fri, 19 Feb 2016 20:02:44 +0000 (12:02 -0800)]
resolve merge conflicts of
935f252c6e to nyc-dev-plus-aosp
Change-Id: I0a452ab019db8d5d06550f9f7f942561f9c08599
Christopher Wiley [Fri, 19 Feb 2016 19:42:01 +0000 (19:42 +0000)]
Merge "Build camera related goldfish HALs as brilloemulator for Brillo"
bohu [Fri, 19 Feb 2016 06:35:49 +0000 (06:35 +0000)]
Add check for data partition
am:
70bef5f034
* commit '
70bef5f03409de145fa56e720f4ac30d2cc0bce8':
Add check for data partition
bohu [Wed, 17 Feb 2016 20:12:14 +0000 (12:12 -0800)]
Add check for data partition
bug:
b.android.com/201150
When the data partition is corrupted, emulator will fail
to boot. Adding check to reduce the possibility of boot
failure due to corrupted data partition.
Note: fstab.golfish has check already. ranchu seems
should have it as well.
Note: I don't see much boot time degradation either.
Note: need to give e2fsck SELINUX permission to do the check
bug: https://b2.corp.google.com/u/0/issues/
27224003
Change-Id: I9b040ecd2009a3003c5b6c4c6e4b30c7d03fa71a
Jim Kaye [Fri, 19 Feb 2016 02:17:14 +0000 (02:17 +0000)]
Don\'t mis-parse the Emulator\'s GPS altitude
am:
af4659f02d
* commit '
af4659f02d250020317a42056a73665745e5041f':
Don't mis-parse the Emulator's GPS altitude
Jim Kaye [Wed, 17 Feb 2016 18:02:01 +0000 (10:02 -0800)]
Don't mis-parse the Emulator's GPS altitude
When tokenizing an NMEA string, don't skip null input fields;
turn them into null tokens.
By skipping null fields, the subsequent values become mis-aligned.
This bug prevented the code from handling the altitude in the
NMEA 0183 GPGGA string.
b.android.com/200940
Change-Id: I774de342cd9ebfb85dcc6d72b4033e1c3e101434
(cherry picked from commit
40bbf5b37a20d5fdcc392ad30edb9a475fc6344e)
Grigory Dzhavadyan [Fri, 19 Feb 2016 02:02:29 +0000 (02:02 +0000)]
Add support for new sensors in the QEMU-specific sensors HAL module
am:
737bb41ef2
* commit '
737bb41ef2946730b0b0ec7b702ec3445047863b':
Add support for new sensors in the QEMU-specific sensors HAL module
Grigory Dzhavadyan [Fri, 30 Oct 2015 22:11:15 +0000 (15:11 -0700)]
Add support for new sensors in the QEMU-specific sensors HAL module
Change-Id: I596aa8e90ecdb81d5984d6c2eb33410ced0fd861
(cherry picked from commit
d9c1ea0d820055ab0e262958938ff9e5e4fd91de)
dcashman [Fri, 19 Feb 2016 01:48:29 +0000 (01:48 +0000)]
Run fingerprintd as system user.
am:
33f6216acd
* commit '
33f6216acd47589ec6cc20c58e6b4db998860e48':
Run fingerprintd as system user.
bohu [Fri, 19 Feb 2016 01:35:13 +0000 (01:35 +0000)]
Enable fingerprint daemon on ranchu
am:
2a107261ad
* commit '
2a107261ad52ef36cc802e060d1a09e02b6c59ec':
Enable fingerprint daemon on ranchu
dcashman [Tue, 8 Dec 2015 20:47:45 +0000 (12:47 -0800)]
Run fingerprintd as system user.
Address the following denials:
type=1400 audit(
1449001264.880:5): avc: denied { dac_override } for pid=1264 comm="fingerprintd" capability=1 scontext=u:r:fingerprintd:s0 tcontext=u:r:fingerprintd:s0 tclass=capability permissive=0
type=1400 audit(
1449001264.880:6): avc: denied { dac_read_search } for pid=1264 comm="fingerprintd" capability=2 scontext=u:r:fingerprintd:s0 tcontext=u:r:fingerprintd:s0 tclass=capability permissive=0
Bug:
25951089
Change-Id: I72adbfd1565b555aec5193afe8114d2d67a1de9e
(cherry picked from commit
7e9c67b73f93977f739a6e641a0bf5163b721533)
bohu [Tue, 1 Dec 2015 01:26:30 +0000 (17:26 -0800)]
Enable fingerprint daemon on ranchu
Change-Id: I0813e9e0d248acb964491cfc8c28ed8b46e5d182
(cherry picked from commit
1a681387f53ff1fe3855d48129ebd259366aefe3)
Prathmesh Prabhu [Fri, 19 Feb 2016 01:28:27 +0000 (01:28 +0000)]
Merge "gps: Add ranchu support." into nyc-dev
am:
3713f93da8
* commit '
3713f93da8a6db140b30a19a70e8d283c4b5a122':
gps: Add ranchu support.
Prathmesh Prabhu [Fri, 19 Feb 2016 01:25:08 +0000 (01:25 +0000)]
Merge "gps: Add ranchu support." into nyc-dev
bohu [Fri, 19 Feb 2016 01:21:13 +0000 (01:21 +0000)]
Turn off dhcp since radio is working on ranchu
am:
6fc29096a9
* commit '
6fc29096a91146ec628ed59d9abc37141a0643f7':
Turn off dhcp since radio is working on ranchu
bohu [Mon, 23 Nov 2015 23:30:09 +0000 (15:30 -0800)]
Turn off dhcp since radio is working on ranchu
Change-Id: Ia1550bf009fbb5f57213cac07d98360b3b789a71
(cherry picked from commit
c249484b0928b5e6c2c34eacb342845e7e22c0a4)
Chaoren Lin [Wed, 18 Nov 2015 02:51:40 +0000 (18:51 -0800)]
gps: Add ranchu support.
Compile the code as gps.ranchu.so, in addition to
gps.goldfish.so to enable the gps on the ranchu
board as well as on the goldfish board.
Change-Id: I2e7c77d6352d300a1b3a172f944a4dd78bebcd20
(cherry picked from commit
61eb21dace6df5bedca7aab11c9c362e203642c6)
Lingfeng Yang [Fri, 19 Feb 2016 00:46:11 +0000 (00:46 +0000)]
Compile camera for ranchu as well as goldfish
am:
834da40409
* commit '
834da404097017ddfb49af4d13d75bdb73249b4f':
Compile camera for ranchu as well as goldfish
Lingfeng Yang [Wed, 18 Nov 2015 00:00:35 +0000 (16:00 -0800)]
Compile camera for ranchu as well as goldfish
This is for camera support in QEMU2
with the new emulator.
Previously, only camera.goldfish.*.so's
were being built, so the camera did not work in QEMU2.
Building camera.ranchu.*.so's seems to have fixed
the problem on guest side.
Change-Id: I9cc16ed0a48729d9a17bd5ce8a0a04bb6e031415
(cherry picked from commit
e249aa0ce28c5cf33fee39eae7323d50fee0591e)
Sasha Levitskiy [Thu, 18 Feb 2016 23:01:32 +0000 (23:01 +0000)]
Fingerprint: Add set_active_group()
am:
c0d37d7743
* commit '
c0d37d77439be7c91276ebc1063003f5b45f52f0':
Fingerprint: Add set_active_group()
Sasha Levitskiy [Wed, 10 Feb 2016 21:25:26 +0000 (13:25 -0800)]
Fingerprint: Add set_active_group()
Bug:
21109822
Change-Id: Ie925dcb95f39be758de4fb88a58d1d0e48373277
Yahan Zhou [Thu, 18 Feb 2016 19:03:55 +0000 (19:03 +0000)]
Fix crash when forgot to call glVertexAttribPointer
am:
c2fa3dca08
* commit '
c2fa3dca08d30325238d9aa24c0d2450490003e1':
Fix crash when forgot to call glVertexAttribPointer
Yahan Zhou [Thu, 18 Feb 2016 19:03:50 +0000 (19:03 +0000)]
Support glDrawElements with GL_UNSIGNED_INT in the encoder
am:
49435c0ad0
* commit '
49435c0ad04bb4698b3e553ec413250322a3346a':
Support glDrawElements with GL_UNSIGNED_INT in the encoder
Yahan Zhou [Thu, 18 Feb 2016 19:03:45 +0000 (19:03 +0000)]
Fix the GLES version number in the emulator encoder
am:
10665c8e74
* commit '
10665c8e74cbbef8444242ec6723816d6641d00f':
Fix the GLES version number in the emulator encoder