OSDN Git Service
David Turner [Mon, 17 Oct 2016 16:05:15 +0000 (16:05 +0000)]
Merge "init.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>
Dmitriy Filchenko [Thu, 18 Aug 2016 19:15:41 +0000 (19:15 +0000)]
Merge "Remove unused include."
am:
1bdcd4fe9b
Change-Id: Ia757c04441404f38a59f535ed5dfdaa8a2bb436f
Treehugger Robot [Thu, 18 Aug 2016 19:11:27 +0000 (19:11 +0000)]
Merge "Remove 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
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
Treehugger Robot [Wed, 17 Aug 2016 17:54:36 +0000 (17:54 +0000)]
Merge "Update 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
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
Treehugger Robot [Mon, 1 Aug 2016 21:06:11 +0000 (21:06 +0000)]
Merge "Fix 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
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
Chih-hung Hsieh [Thu, 7 Jul 2016 22:56:53 +0000 (22:56 +0000)]
Merge "Fix 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
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
Bo Hu [Tue, 28 Jun 2016 18:53:09 +0000 (18:53 +0000)]
Merge "Fix 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>
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
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
David Turner [Thu, 23 Jun 2016 07:52:29 +0000 (07:52 +0000)]
Merge "rild: setup rild library path in init.<board>.rc file."
Yahan Zhou [Wed, 22 Jun 2016 18:57:07 +0000 (18:57 +0000)]
Fix glTexSubImage2D
am:
fbbbd30da0
Change-Id: Icc969a716703b83e3aa82e9dd032a17ed0b0d0c0
David 'Digit' Turner [Wed, 22 Jun 2016 10:00:41 +0000 (12:00 +0200)]
rild: setup rild library path in init.<board>.rc file.
This allows us to remove emulator-specific hacks in
hardware/ril/rild/rild.c
BUG=
25875346
Change-Id: I3b40c19bf6da3eb0bcd3398179d61d363b29941d
David Turner [Wed, 22 Jun 2016 08:15:10 +0000 (08:15 +0000)]
Merge \\"vibrator: Remove qemu dependency.\\" am:
f39888f5db
am:
c05a1a9e98
Change-Id: I83eb96a2bddff4b9106dfe5ebbb01ff2d8cd7f36
David 'Digit' Turner [Wed, 22 Jun 2016 08:12:33 +0000 (08:12 +0000)]
Merge \"vibrator: Remove qemu dependency.\"
am:
f39888f5db
Change-Id: If9baccbeb0744b1a54f3be500cdc093dbcdf7625
David Turner [Wed, 22 Jun 2016 08:10:07 +0000 (08:10 +0000)]
Merge "vibrator: Remove qemu dependency."
David 'Digit' Turner [Tue, 21 Jun 2016 11:23:35 +0000 (13:23 +0200)]
vibrator: Remove qemu dependency.
Remove dependency on the obsolete qemu functions for
libhardware_legacy which are going to be removed by
a future patch. Use the <system/qemu_pipe.h> interface
directly instead.
BUG=
25875346
Change-Id: I7d6db640e1afca3e83d1b53e6e2460fbf58a5615
David Turner [Tue, 21 Jun 2016 08:07:37 +0000 (08:07 +0000)]
resolve merge conflicts of
d6b1ea8 to stage-aosp-master
am:
09c319886e
Change-Id: I407ddf6860cac805a441b000f6c4fd8402d0c24f
David 'Digit' Turner [Tue, 21 Jun 2016 08:03:09 +0000 (10:03 +0200)]
resolve merge conflicts of
d6b1ea8 to stage-aosp-master
Change-Id: Ib0b4f368dae0d8c76a1c031f24785318566216f0
David Turner [Tue, 21 Jun 2016 07:38:01 +0000 (07:38 +0000)]
Merge "Use new <system/qemu_pipe.h> header."
David 'Digit' Turner [Thu, 16 Jun 2016 16:55:11 +0000 (18:55 +0200)]
Use new <system/qemu_pipe.h> header.
Also also remove misc. compiler warnings about unused
parameters or mismatched function pointer types.
BUG=
25875346
Change-Id: I763267e2b670730e194dc361ce356e10b6aa8180
David Turner [Fri, 17 Jun 2016 07:58:37 +0000 (07:58 +0000)]
Merge changes I6badcc6a,I652ac746 am:
dfc610e672
am:
07e51c3536
Change-Id: I7ef7e559d1219ed2c18110e4bdee80ce3a600f9f
David 'Digit' Turner [Fri, 17 Jun 2016 07:55:54 +0000 (07:55 +0000)]
Merge changes I6badcc6a,I652ac746
am:
dfc610e672
Change-Id: I394f0487feb127dbba501197b53d7ac7b6befb42
David Turner [Fri, 17 Jun 2016 07:47:57 +0000 (07:47 +0000)]
Merge changes I6badcc6a,I652ac746
* changes:
rild: Remove support for host-specific radio device.
Remove obsolete 'qemud' service.
David 'Digit' Turner [Wed, 15 Jun 2016 15:34:35 +0000 (17:34 +0200)]
rild: Remove support for host-specific radio device.
The android.qemud kernel parameter was used before this patch
in the following way:
- If defined (e.g. to '1'), then enable the RIL daemon
to control networking.
- If undefined, and android.rild is defined, then use
this device to communicate with a host-side GSM modem
connected to the emulator (using the -radio <chardev>
option). Since this feature is now deprecated / obsolete
there is no need to support it anymore.
- If both parameters are undefined, use the Java-based
emulated telephony stack provided by the framework
itself. The latter was never supported by the emulator
so has never been tested.
This patch removes all the tests to always enable the RIL
daemon, simplifying the script.
Change-Id: I6badcc6aa34f595e4c76c97e4b8a1a0348650fc1
David 'Digit' Turner [Wed, 15 Jun 2016 15:32:25 +0000 (17:32 +0200)]
Remove obsolete 'qemud' service.
The qemud service was a small daemon used to implement
a multiplexing communication channel over a tty between
guest processes and the emulator. It has been replaced
by the QEMU pipe device since at least API level 14, and
is thus not needed anymore.
This patch removes it from the system build.
IMPORTANT NOTE:
Many of the sources include <hardware/qemud.h>, currently
provided by hardware/libhware/include/, but this header
uses the pipe directly to connect to the emulator. Such
code is thus unaffected by this patch.
Change-Id: I652ac746f1d17f8b2cced2782269013f768e3739
Yahan Zhou [Thu, 16 Jun 2016 01:14:56 +0000 (18:14 -0700)]
Fix glTexSubImage2D
Fix b/
29367586
Change-Id: Id690184a060190cf595562c891cf310b3901bc00
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 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
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 [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: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 [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
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 [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