OSDN Git Service
Christopher Ferris [Thu, 15 Jan 2015 01:52:14 +0000 (01:52 +0000)]
am
457731f6: Use the timeout stack dump functions.
* commit '
457731f69e3106b5aae8fc04f9565af1d875876c':
Use the timeout stack dump functions.
Christopher Ferris [Thu, 15 Jan 2015 01:39:17 +0000 (01:39 +0000)]
am
d195f87b: Fix message when a command times out.
* commit '
d195f87b2dd4aa731a21ef3acd321e2441c5bffb':
Fix message when a command times out.
Christopher Ferris [Wed, 14 Jan 2015 21:23:30 +0000 (13:23 -0800)]
Use the timeout stack dump functions.
Use the native stack dumping functions that allows time outs. If
debuggerd locks up, before a bugreport would hang forever. Now
it will timeout properly and still get all of the other information.
Bug:
18766581
Change-Id: I85053b8dcfe6224e2b64b4d8f7f2ef448b3cda34
Christopher Ferris [Fri, 9 Jan 2015 23:56:21 +0000 (15:56 -0800)]
Fix message when a command times out.
The previous version printed out the nanoseconds elapsed, not seconds.
Bug:
18766581
(cherry picked from commit
67c5a8af9ed128d8bb56d4723303aef6f0a4500f)
Change-Id: Icbaaee83a92767694fd98e3c790f36f4d24681b0
Riley Andrews [Tue, 13 Jan 2015 23:26:02 +0000 (23:26 +0000)]
am
aec92242: Merge "Replace all instances of intptr_t with uintptr_t."
* commit '
aec922426620804768f00a6c5cb902f278f2967f':
Replace all instances of intptr_t with uintptr_t.
Riley Andrews [Tue, 13 Jan 2015 23:26:01 +0000 (23:26 +0000)]
am
41a160c4: Merge "Fix signed/unsigned comparison warnings in driver interface test."
* commit '
41a160c4cda1ef2c916028ec2d0801da738b5249':
Fix signed/unsigned comparison warnings in driver interface test.
Riley Andrews [Tue, 13 Jan 2015 22:06:05 +0000 (22:06 +0000)]
Merge "Replace all instances of intptr_t with uintptr_t."
Riley Andrews [Tue, 13 Jan 2015 22:00:23 +0000 (22:00 +0000)]
Merge "Fix signed/unsigned comparison warnings in driver interface test."
Riley Andrews [Tue, 13 Jan 2015 02:16:29 +0000 (18:16 -0800)]
Replace all instances of intptr_t with uintptr_t.
When compiling 32 bit binaries against a 64 bit binder interface,
implicit promotions of intptr_t types to uint64_t for fields in the
binder ioctl structures can result in invalid pointers because of sign
extension.
Brian Carlstrom [Tue, 13 Jan 2015 06:27:45 +0000 (06:27 +0000)]
am
6f9c6541: Merge "[MIPS] Build libGLES for mips64, mips32r6"
* commit '
6f9c6541b77b18a6922d1f50326faa9ec6ed6d2a':
[MIPS] Build libGLES for mips64, mips32r6
Brian Carlstrom [Tue, 13 Jan 2015 06:19:36 +0000 (06:19 +0000)]
Merge "[MIPS] Build libGLES for mips64, mips32r6"
Duane Sand [Wed, 26 Nov 2014 00:43:13 +0000 (16:43 -0800)]
[MIPS] Build libGLES for mips64, mips32r6
For now, use generic C code instead of assembler.
Change-Id: I604ecdcde2d5373f1f68ab97a63a80667b630846
Riley Andrews [Tue, 13 Jan 2015 02:14:55 +0000 (18:14 -0800)]
Fix signed/unsigned comparison warnings in driver interface test.
Jesse Hall [Mon, 12 Jan 2015 23:41:46 +0000 (23:41 +0000)]
am
5b730570: Merge "surfaceflinger: use Mutex timedLock instead of tryLock loop"
* commit '
5b730570be2bd1f90346a5921d0b70dc11351396':
surfaceflinger: use Mutex timedLock instead of tryLock loop
Jesse Hall [Mon, 12 Jan 2015 23:33:06 +0000 (23:33 +0000)]
Merge "surfaceflinger: use Mutex timedLock instead of tryLock loop"
Jeff Davidson [Mon, 12 Jan 2015 20:10:05 +0000 (20:10 +0000)]
am
83f14309: Merge "Revert "Update protobuf library from 2.3 to 2.6.""
* commit '
83f14309f17af398ec8ff7f82d9b2f010ea7cd5f':
Revert "Update protobuf library from 2.3 to 2.6."
Jeff Davidson [Mon, 12 Jan 2015 20:00:51 +0000 (20:00 +0000)]
Merge "Revert "Update protobuf library from 2.3 to 2.6.""
Jeff Davidson [Mon, 12 Jan 2015 20:00:33 +0000 (20:00 +0000)]
Revert "Update protobuf library from 2.3 to 2.6."
This reverts commit
a42cdf169060e1bb65c77bc8a394d266403d8583.
Change-Id: I8f75e6fcc921041ebdfd35c4724134fcb2c739c6
Jeff Davidson [Mon, 12 Jan 2015 19:46:11 +0000 (19:46 +0000)]
am
9200d4e3: Merge "Update protobuf library from 2.3 to 2.6."
* commit '
9200d4e3bf0bf9bf21d9bb335e04818364bf12a8':
Update protobuf library from 2.3 to 2.6.
Jeff Davidson [Mon, 12 Jan 2015 19:37:20 +0000 (19:37 +0000)]
Merge "Update protobuf library from 2.3 to 2.6."
Christopher Ferris [Mon, 12 Jan 2015 18:48:23 +0000 (18:48 +0000)]
am
4f9bfffe: Merge "Fix message when a command times out."
* commit '
4f9bfffe23d40fdaabe91ea7c7691e52800edb79':
Fix message when a command times out.
Christopher Ferris [Mon, 12 Jan 2015 18:41:06 +0000 (18:41 +0000)]
Merge "Fix message when a command times out."
Jesse Hall [Tue, 23 Dec 2014 21:57:23 +0000 (13:57 -0800)]
surfaceflinger: use Mutex timedLock instead of tryLock loop
Rather than trying to acquire the state lock without waiting three
times at 1 second intervals in SurfaceFlinger::dump(), just try to
acquire the lock once with a 1 second timeout. Avoids spurious mutex
acquire failures that lead to flaky
com.android.cts.jank.opengl.CtsHostJankOpenGl results.
Bug:
18842510
Change-Id: I00ce6109647de2aef8831dd2f8fa98652ba7f4e0
Rachad [Sat, 10 Jan 2015 02:00:07 +0000 (02:00 +0000)]
am
806f23de: OpenMax IL: Added support for E-AC3 codec configuration params
* commit '
806f23de71be2494cfabbe08d11c09606966a5d5':
OpenMax IL: Added support for E-AC3 codec configuration params
Christopher Ferris [Fri, 9 Jan 2015 23:56:21 +0000 (15:56 -0800)]
Fix message when a command times out.
The previous version printed out the nanoseconds elapsed, not seconds.
Change-Id: I10f6d7bf7b7a4647658313ed83781fda6fd744a5
Elliott Hughes [Sat, 10 Jan 2015 00:14:12 +0000 (00:14 +0000)]
am
a7dcab69: Merge "We have POSIX clocks, and we don\'t need to ask for the openssl headers."
* commit '
a7dcab6954467fa3726824a099b83d0e7490d6d5':
We have POSIX clocks, and we don't need to ask for the openssl headers.
Elliott Hughes [Sat, 10 Jan 2015 00:03:46 +0000 (00:03 +0000)]
Merge "We have POSIX clocks, and we don't need to ask for the openssl headers."
Elliott Hughes [Fri, 9 Jan 2015 23:56:15 +0000 (15:56 -0800)]
We have POSIX clocks, and we don't need to ask for the openssl headers.
This code doesn't need to run on the Mac, and the BoringSSL transition
will be easier without references to external/openssl.
Change-Id: I14ea11fa2911af0f4e95e69636e6a2c26126cbe0
Jeff Davidson [Tue, 16 Sep 2014 01:14:22 +0000 (18:14 -0700)]
Update protobuf library from 2.3 to 2.6.
Remove generated cpp/h files for gltrace.proto as we can use the build
system to generate these dynamically.
Change-Id: I949d32fb5126f1c05e2a6ed48f6636a4a9b15a48
Andreas Gampe [Wed, 7 Jan 2015 22:12:26 +0000 (22:12 +0000)]
am
96e4409e: Merge "Installd: Disallow relocation for decryption"
* commit '
96e4409e8c38b1d79285eca9886d44ff850b5748':
Installd: Disallow relocation for decryption
Andreas Gampe [Wed, 7 Jan 2015 22:04:28 +0000 (22:04 +0000)]
Merge "Installd: Disallow relocation for decryption"
neo.chae [Wed, 7 Jan 2015 09:46:13 +0000 (18:46 +0900)]
Installd: Disallow relocation for decryption
When decrypting a device, a tmpfs is temporarily mounted as /data,
the size of which is usually small. When the zygote, system server
and necessary apps are brought up, they will be compiled into the
tmpfs.
If the system image contains prebuilts, they will be relocated instead
of compiled. This is unnecessary. In this special situation it is
acceptable to run out of the prebuilt oat files without relocation,
which can save space in the tmpfs.
This patch ensures that apps are not being relocated.
Change-Id: I42bfb7e3039574b7e4f2772e0d395f093d59ed1b
Signed-off-by: Hyangseok Chae <neo.chae@lge.com>
Narayan Kamath [Wed, 24 Dec 2014 10:32:20 +0000 (10:32 +0000)]
am
033f7e8e: Merge "InputDispatcher: Optimize count()"
* commit '
033f7e8e35ac76404fe823a67e07ba7c42bc357c':
InputDispatcher: Optimize count()
Narayan Kamath [Wed, 24 Dec 2014 10:25:42 +0000 (10:25 +0000)]
Merge "InputDispatcher: Optimize count()"
Rachad [Wed, 24 Dec 2014 00:04:59 +0000 (16:04 -0800)]
OpenMax IL: Added support for E-AC3 codec configuration params
Bug:
17883772
Change-Id: Ibf00534607db4bba14c935cf1eaa80eb740297f9
Andreas Gampe [Mon, 22 Dec 2014 18:39:37 +0000 (18:39 +0000)]
am
d3255076: Merge "Installd: Swap file for dex2oat"
* commit '
d325507698d8379e431a8c8fefcfafe59956bd88':
Installd: Swap file for dex2oat
Andreas Gampe [Mon, 22 Dec 2014 18:30:57 +0000 (18:30 +0000)]
Merge "Installd: Swap file for dex2oat"
Brian Carlstrom [Fri, 19 Dec 2014 04:24:04 +0000 (04:24 +0000)]
am
42740668: (-s ours) Merge "Installd: Swap file for dex2oat" into lmp-mr1-dev
* commit '
42740668423d6cd9d0a3b406c3e5c160dbbdabca':
Installd: Swap file for dex2oat
Riley Andrews [Fri, 19 Dec 2014 03:52:36 +0000 (03:52 +0000)]
am
53186a4d: Merge "Add binder tests"
* commit '
53186a4d78479ba21213b6e055c7a85faeb318e2':
Add binder tests
Riley Andrews [Fri, 19 Dec 2014 03:52:35 +0000 (03:52 +0000)]
am
dbd252ea: Merge "Add binder driver interface test"
* commit '
dbd252eab09d669a7d4b917890d75408193a85d3':
Add binder driver interface test
Andreas Gampe [Thu, 11 Dec 2014 00:41:11 +0000 (16:41 -0800)]
Installd: Swap file for dex2oat
Add swap file support for dex2oat to installd. Only use in low-memory
mode.
Bug:
18596910
(cherry picked from commit
f68ce4de7fcfcc090af7985972b304eed7dbaf63)
Change-Id: I131448f3907115054a592af73db86d2b9257ea33
Riley Andrews [Fri, 19 Dec 2014 00:39:39 +0000 (00:39 +0000)]
Merge "Add binder tests"
Riley Andrews [Thu, 18 Dec 2014 20:10:08 +0000 (12:10 -0800)]
Add binder tests
Change-Id: Ib0b38708dd6387fc4d5a4857ca74a217f3edad1a
Riley Andrews [Fri, 19 Dec 2014 00:38:41 +0000 (00:38 +0000)]
Merge "Add binder driver interface test"
Riley Andrews [Thu, 18 Dec 2014 19:54:32 +0000 (11:54 -0800)]
Add binder driver interface test
Test ioctls and some binder commands without using libbinder.
Change-Id: I86dde56ff1380bca17d086021ac5324dc5210354
Brian Carlstrom [Fri, 19 Dec 2014 00:38:06 +0000 (00:38 +0000)]
Merge "Installd: Swap file for dex2oat" into lmp-mr1-dev
Andreas Gampe [Thu, 11 Dec 2014 00:41:11 +0000 (16:41 -0800)]
Installd: Swap file for dex2oat
Add swap file support for dex2oat to installd. Only use in low-memory
mode.
Bug:
18596910
Change-Id: I131448f3907115054a592af73db86d2b9257ea33
Andreas Gampe [Tue, 16 Dec 2014 20:34:31 +0000 (20:34 +0000)]
am
1be4021c: Merge "Installd: Remove dalvik paths"
* commit '
1be4021c2a867c7e067a3c5b937a054f0eb7817f':
Installd: Remove dalvik paths
Andreas Gampe [Tue, 16 Dec 2014 02:29:11 +0000 (02:29 +0000)]
Merge "Installd: Remove dalvik paths"
Andreas Gampe [Mon, 15 Dec 2014 19:41:11 +0000 (11:41 -0800)]
Installd: Remove dalvik paths
Dalvik is dead. Dexopt is dead.
Change-Id: I9ff6b638a3e2c52ae7aec33d7b08a7bee012854f
Mathieu Chartier [Fri, 12 Dec 2014 14:41:23 +0000 (14:41 +0000)]
am
472d2afb: Increase growth limit from 64m to 80m for 1024mb hdpi tablet
* commit '
472d2afb19b8194075d72c318e01a4760e5dbe82':
Increase growth limit from 64m to 80m for 1024mb hdpi tablet
Chih-Hung Hsieh [Thu, 11 Dec 2014 23:02:01 +0000 (23:02 +0000)]
am
bceb29c8: Merge "Fix clang -Wc++11-narrowing warnings."
* commit '
bceb29c83ea54d38b38e40d66402e56364cff56b':
Fix clang -Wc++11-narrowing warnings.
Chih-Hung Hsieh [Thu, 11 Dec 2014 22:48:17 +0000 (22:48 +0000)]
Merge "Fix clang -Wc++11-narrowing warnings."
Chih-Hung Hsieh [Thu, 11 Dec 2014 18:39:59 +0000 (10:39 -0800)]
Fix clang -Wc++11-narrowing warnings.
Clang compiler gives warning to implicit conversions of
literal structure fields, although the compiler generated
implicit conversions are what we want in these cases.
Change-Id: I8f04e7f2fa1db0ed1d1937135d9091532eec3d5b
Mathieu Chartier [Thu, 11 Dec 2014 17:56:31 +0000 (09:56 -0800)]
Increase growth limit from 64m to 80m for 1024mb hdpi tablet
Prevents apps hitting oome due to old linear alloc objects being
allocated in the java heap causing the heap to be larger than it
used to be.
Bug:
18707227
Change-Id: Ia49a7e6b24ae9fba1961d600d4599c17313b556b
Dmitriy Ivanov [Thu, 11 Dec 2014 00:10:44 +0000 (16:10 -0800)]
resolved conflicts for merge of
e9b6f1f7 to lmp-mr1-dev-plus-aosp
Change-Id: I87618573198d1f476b1680dbf9163a7dc90a66f8
Dmitriy Ivanov [Mon, 20 Oct 2014 21:17:26 +0000 (14:17 -0700)]
Switch to libsigchain.a
Use LOCAL_WHOLE_STATIC_LIBRARIES to instruct static linker
to export symbols from the static library.
(cherry picked from commit
4340a14fbfe761a46e7a655b568cbd0953773df3)
Bug:
18701723
Change-Id: I70f6fdb64b0d1adbadf96c8de85870a903ec186a
Andreas Gampe [Tue, 9 Dec 2014 20:09:18 +0000 (20:09 +0000)]
am
a59d7a6a: Merge "GUI: Remove unused variables"
* commit '
a59d7a6a66a2b8dcb2d00dbd6371fa89ae45ab04':
GUI: Remove unused variables
Andreas Gampe [Tue, 9 Dec 2014 19:57:05 +0000 (19:57 +0000)]
Merge "GUI: Remove unused variables"
Dan Stoza [Tue, 9 Dec 2014 13:18:36 +0000 (13:18 +0000)]
am
e22262ff: (-s ours) Merge "libgui: Enable -Weverything and -Werror"
* commit '
e22262ffd0bbed53e6d964f2fbcd5ecd85c04403':
libgui: Enable -Weverything and -Werror
Andreas Gampe [Tue, 9 Dec 2014 11:25:32 +0000 (11:25 +0000)]
am
8fd567b1: Merge "Libui: Remove unused variables"
* commit '
8fd567b127170a3962bc9de637eb7987cee71810':
Libui: Remove unused variables
Andreas Gampe [Tue, 9 Dec 2014 04:42:40 +0000 (20:42 -0800)]
GUI: Remove unused variables
For build-system CFLAGS clean-up, remove unused variables.
Bug:
18632512
Change-Id: I79fdcf830683d7278f4bf114cfb76a26da1b88ff
Michael Lentine [Mon, 8 Dec 2014 19:10:21 +0000 (19:10 +0000)]
am
e329be2e: am
784fd39a: resolved conflicts for merge of
d6308379 to lmp-dev
* commit '
e329be2e0004216474fe0545ab7a2cb1863d387a':
Fix for corruption when numFds or numInts is too large.
Dan Stoza [Mon, 8 Dec 2014 18:46:08 +0000 (18:46 +0000)]
Merge "libgui: Enable -Weverything and -Werror"
Andreas Gampe [Mon, 8 Dec 2014 18:23:15 +0000 (18:23 +0000)]
Merge "Libui: Remove unused variables"
Andreas Gampe [Sat, 6 Dec 2014 04:50:34 +0000 (20:50 -0800)]
Libui: Remove unused variables
For build-system CFLAGS clean-up, remove unused variables.
Bug:
18632512
Change-Id: Ib78912ae442ddc6410960ab1efb4fb2faa1a9208
Dan Stoza [Tue, 18 Nov 2014 18:24:03 +0000 (10:24 -0800)]
libgui: Enable -Weverything and -Werror
Enables -Weverything and -Werror, with just a few exceptions for
warnings we can't (or shouldn't need to) work around.
This is a squashed commit based on an initial change with a couple of
fixes to avoid breaking certain targets. The source commits are:
d723bd7669b4fc88dc282d8bf8ba5ecb2849d22f
00d504c06ea034befe143e6b8cb34d004670ed02
429ba89cd293633d2f882165066b422c96597df2
Change-Id: I034abec27bf4020d84af60d7acc1939c59986dd6
Dan Stoza [Fri, 5 Dec 2014 21:19:19 +0000 (21:19 +0000)]
am
e1a2caeb: Merge "Fix crash when user provides large values in the Parcel."
* commit '
e1a2caeb2c75840b092081e28d988342ee958c34':
Fix crash when user provides large values in the Parcel.
Dan Stoza [Fri, 5 Dec 2014 21:08:42 +0000 (21:08 +0000)]
Merge "Fix crash when user provides large values in the Parcel."
Michael Lentine [Fri, 31 Oct 2014 18:10:13 +0000 (11:10 -0700)]
Fix crash when user provides large values in the Parcel.
Bug:
18102648
Change-Id: Ie6a24718e586a34424238363de80f9545951514f
(cherry-picked from commit
8afa1c4ab86d724feb7716e153b7835385534590)
Dan Albert [Fri, 5 Dec 2014 18:01:50 +0000 (18:01 +0000)]
am
09b9193d: Merge "Fix -Werror on 64-bit builds"
* commit '
09b9193d10b3849e426c5370a757a0eedc65a7ff':
Fix -Werror on 64-bit builds
Dan Albert [Fri, 5 Dec 2014 18:01:49 +0000 (18:01 +0000)]
am
67df03d0: Merge "Disable struct padding warning/error"
* commit '
67df03d054f0cc4bd0e47066642b791198e9b0ad':
Disable struct padding warning/error
Dan Albert [Fri, 5 Dec 2014 18:01:49 +0000 (18:01 +0000)]
am
35df7531: Merge "libui: Enable -Weverything and -Werror"
* commit '
35df753169397d9b647b251446af7093e237d047':
libui: Enable -Weverything and -Werror
Dan Albert [Fri, 5 Dec 2014 18:01:48 +0000 (18:01 +0000)]
am
5588d900: Merge "Enable clang for libui/libgui/surfaceflinger"
* commit '
5588d9000cd1ef217185c9001d6b5ecd84db9741':
Enable clang for libui/libgui/surfaceflinger
Dan Albert [Fri, 5 Dec 2014 18:01:47 +0000 (18:01 +0000)]
am
e2824e04: Merge "Fix for corruption when numFds or numInts is too large."
* commit '
e2824e04942adf5a30c73751636648dd6fc18fef':
Fix for corruption when numFds or numInts is too large.
Dan Albert [Fri, 5 Dec 2014 17:48:53 +0000 (17:48 +0000)]
Merge "Fix -Werror on 64-bit builds"
Dan Albert [Fri, 5 Dec 2014 17:48:47 +0000 (17:48 +0000)]
Merge "Disable struct padding warning/error"
Dan Albert [Fri, 5 Dec 2014 17:48:10 +0000 (17:48 +0000)]
Merge "libui: Enable -Weverything and -Werror"
Dan Albert [Fri, 5 Dec 2014 17:47:58 +0000 (17:47 +0000)]
Merge "Enable clang for libui/libgui/surfaceflinger"
Dan Albert [Fri, 5 Dec 2014 17:47:37 +0000 (17:47 +0000)]
Merge "Fix for corruption when numFds or numInts is too large."
Dan Stoza [Mon, 1 Dec 2014 23:15:31 +0000 (15:15 -0800)]
Fix -Werror on 64-bit builds
Add another static_cast to avoid an error on 64-bit builds
Change-Id: I62fb2c67766c4aab70d9d1834f255d06ff82dd8d
(cherry picked from commit
116c7a113cb2db4d3f7708627ac4713c7e92cd43)
Dan Stoza [Mon, 1 Dec 2014 23:03:34 +0000 (15:03 -0800)]
Disable struct padding warning/error
Adds -Wno-padded, which was triggering on 64-bit devices
Change-Id: If27bac27881f2081a222b32213901f5087554b07
(cherry picked from commit
4e84bd310c876e1450077959333c87e6e83dbf63)
Dan Stoza [Mon, 17 Nov 2014 20:03:59 +0000 (12:03 -0800)]
libui: Enable -Weverything and -Werror
Enables -Weverything and -Werror, with just a few exceptions for
warnings we can't (or shouldn't need to) work around.
Change-Id: I470a267e9b1c373f2d5c960f005c3b0e02b2db63
(cherry picked from commit
303b9a51239d36d237a7d40c67b5085cdb3c1059)
Dan Stoza [Tue, 11 Nov 2014 18:32:31 +0000 (10:32 -0800)]
Enable clang for libui/libgui/surfaceflinger
Enables clang and C++11 for libui/libgui/surfaceflinger, and
eliminates all compile-time warnings.
Change-Id: Ie237fdb5ae44f2bfcddaa884f9c65ec3f08ae50f
(cherry picked from commit
f10c46ef855b6410b20ebd8b1351d4d78d8eca8e)
Michael Lentine [Fri, 31 Oct 2014 22:25:03 +0000 (15:25 -0700)]
Fix for corruption when numFds or numInts is too large.
Bug:
18076253
Change-Id: I4c5935440013fc755e1d123049290383f4659fb6
(cherry picked from commit
dfd06b89a4b77fc75eb85a3c1c700da3621c0118)
Michael Lentine [Thu, 4 Dec 2014 23:06:47 +0000 (23:06 +0000)]
am
784fd39a: resolved conflicts for merge of
d6308379 to lmp-dev
* commit '
784fd39a19f659e3b464bd9a78361c0adc1cdcab':
Fix for corruption when numFds or numInts is too large.
Eino-Ville Talvala [Thu, 4 Dec 2014 20:23:37 +0000 (20:23 +0000)]
am
c5380438: Revert "Camera: Add XML entries and files for new system features"
* commit '
c538043889b773eeeae0bf0ac54b06cd68360734':
Revert "Camera: Add XML entries and files for new system features"
Dan Stoza [Wed, 3 Dec 2014 20:43:29 +0000 (20:43 +0000)]
am
5878444f: SurfaceFlinger: Listen to HWC invalidate
* commit '
5878444fb8da043021f30d3de739531f15390df5':
SurfaceFlinger: Listen to HWC invalidate
Eino-Ville Talvala [Wed, 3 Dec 2014 18:54:28 +0000 (18:54 +0000)]
Revert "Camera: Add XML entries and files for new system features"
This reverts commit
e86d1091766b012da1f6616c7ec270d332baef95.
Bug:
18281970
Bug:
18573576
Change-Id: If1cf236ef7eabd15ffb2a5dd33d25a8acabdd14c
Dan Stoza [Wed, 3 Dec 2014 00:58:17 +0000 (16:58 -0800)]
SurfaceFlinger: Listen to HWC invalidate
"Do less work when using PTS" broke the invalidate path up from HWC
to SurfaceFlinger. When HWC would signal an invalidate, SurfaceFinger
would wake up, see no new buffers, and go back to sleep. This is fine,
except when the invalidate is a result of an HDMI hotplug, in which
case the screen remains blank. This change makes that functionality
work again.
Bug:
18564815
Bug:
18558468
Change-Id: I2e2171d86839945f4e4e6555d66f7e2895bd096a
Michael Lentine [Tue, 2 Dec 2014 19:15:56 +0000 (11:15 -0800)]
resolved conflicts for merge of
d6308379 to lmp-dev
Change-Id: I92ed61b6fdfe458cf5f8bfd6f0b37ff736280500
Andreas Gampe [Tue, 2 Dec 2014 18:47:20 +0000 (18:47 +0000)]
am
f8954c81: Merge "OpenGL tests: Fix unused variables"
* commit '
f8954c81a4ec43958867d1f6f497ef449bf091fd':
OpenGL tests: Fix unused variables
Andreas Gampe [Tue, 2 Dec 2014 18:24:56 +0000 (18:24 +0000)]
Merge "OpenGL tests: Fix unused variables"
Michael Lentine [Tue, 2 Dec 2014 18:04:09 +0000 (18:04 +0000)]
am
76ebd319: am
3d89edca: am
e6f7a44e: Fix for corruption when numFds or numInts is too large.
* commit '
76ebd319d96494049a2a598f4449c0ec417220f6':
Fix for corruption when numFds or numInts is too large.
Michael Lentine [Tue, 2 Dec 2014 17:52:00 +0000 (17:52 +0000)]
am
3d89edca: am
e6f7a44e: Fix for corruption when numFds or numInts is too large.
* commit '
3d89edca65e07319c9ac3b9bb9889e80e8c40578':
Fix for corruption when numFds or numInts is too large.
Michael Lentine [Tue, 2 Dec 2014 17:45:44 +0000 (17:45 +0000)]
am
e6f7a44e: Fix for corruption when numFds or numInts is too large.
* commit '
e6f7a44e835d320593fa33052f35ea52948ff0b2':
Fix for corruption when numFds or numInts is too large.
Jesse Hall [Tue, 2 Dec 2014 00:42:23 +0000 (00:42 +0000)]
am
4aaa3935: Merge "Avoid overwriting EGL14.EGL_NO_SURFACE"
* commit '
4aaa39358f538d8e06e026385bb8be8088d78c35':
Avoid overwriting EGL14.EGL_NO_SURFACE
Jesse Hall [Tue, 2 Dec 2014 00:34:50 +0000 (00:34 +0000)]
Merge "Avoid overwriting EGL14.EGL_NO_SURFACE"
Dan Stoza [Mon, 1 Dec 2014 19:27:00 +0000 (19:27 +0000)]
am
80e81505: Merge "binder: Add {read,write}Uint32 methods to Parcel"
* commit '
80e8150549c9d8380dadf942336d41ab3d92bf78':
binder: Add {read,write}Uint32 methods to Parcel
Dan Stoza [Mon, 1 Dec 2014 19:23:22 +0000 (19:23 +0000)]
am
104e1259: Merge "binder: Return pid_t/uid_t instead of int"
* commit '
104e12594e085bc8dd32eedb96643b774b1508a0':
binder: Return pid_t/uid_t instead of int
OSDN Git Service
