Commit Graph

51232 Commits

Author SHA1 Message Date
Jeff Davidson
bca4262dac Revert "Update protobuf library from 2.3 to 2.6."
This reverts commit a42cdf1690.

Change-Id: I8f75e6fcc921041ebdfd35c4724134fcb2c739c6
2015-01-12 20:00:33 +00:00
Jeff Davidson
9200d4e3bf Merge "Update protobuf library from 2.3 to 2.6." 2015-01-12 19:37:20 +00:00
Christopher Ferris
4f9bfffe23 Merge "Fix message when a command times out." 2015-01-12 18:41:07 +00:00
Jesse Hall
fcd15b478c 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
2015-01-10 15:41:01 -08:00
Christopher Ferris
67c5a8af9e Fix message when a command times out.
The previous version printed out the nanoseconds elapsed, not seconds.

Change-Id: I10f6d7bf7b7a4647658313ed83781fda6fd744a5
2015-01-09 16:42:56 -08:00
Elliott Hughes
a7dcab6954 Merge "We have POSIX clocks, and we don't need to ask for the openssl headers." 2015-01-10 00:03:46 +00:00
Elliott Hughes
5ea47f7a32 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
2015-01-09 15:56:15 -08:00
Jeff Davidson
a42cdf1690 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
2015-01-08 16:12:02 -08:00
Andreas Gampe
96e4409e8c Merge "Installd: Disallow relocation for decryption" 2015-01-07 22:04:29 +00:00
neo.chae
14e084d39a 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>
2015-01-07 22:03:07 +00:00
Narayan Kamath
033f7e8e35 Merge "InputDispatcher: Optimize count()" 2014-12-24 10:25:43 +00:00
Bernhard Rosenkraenzer
fe4966d59b Restore Region::set(uint32_t, uint32_t)
The Region::set(uint32_t,uint32_t) ABI is used by the Nexus 10 graphics
driver blobs.
After commit dd883c0b08, Nexus 10 blobs
need a rebuild unless the old ABI is added back

Change-Id: I138dcc1cc281b8d3cde0021282bf874054ec4eaf
Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
2014-12-22 21:15:08 +01:00
Andreas Gampe
d325507698 Merge "Installd: Swap file for dex2oat" 2014-12-22 18:30:58 +00:00
Andreas Gampe
e1c01353c4 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 f68ce4de7f)

Change-Id: I131448f3907115054a592af73db86d2b9257ea33
2014-12-18 17:23:34 -08:00
Riley Andrews
53186a4d78 Merge "Add binder tests" 2014-12-19 00:39:40 +00:00
Riley Andrews
06b01adcb8 Add binder tests
Change-Id: Ib0b38708dd6387fc4d5a4857ca74a217f3edad1a
2014-12-19 00:39:31 +00:00
Riley Andrews
dbd252eab0 Merge "Add binder driver interface test" 2014-12-19 00:38:41 +00:00
Riley Andrews
dc9b148985 Add binder driver interface test
Test ioctls and some binder commands without using libbinder.

Change-Id: I86dde56ff1380bca17d086021ac5324dc5210354
2014-12-19 00:38:27 +00:00
Andreas Gampe
1be4021c2a Merge "Installd: Remove dalvik paths" 2014-12-16 02:29:12 +00:00
Andreas Gampe
bd872e4956 Installd: Remove dalvik paths
Dalvik is dead. Dexopt is dead.

Change-Id: I9ff6b638a3e2c52ae7aec33d7b08a7bee012854f
2014-12-15 11:41:11 -08:00
Chih-Hung Hsieh
bceb29c83e Merge "Fix clang -Wc++11-narrowing warnings." 2014-12-11 22:48:18 +00:00
Chih-Hung Hsieh
3bded9177b 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
2014-12-11 14:45:56 -08:00
Andreas Gampe
a59d7a6a66 Merge "GUI: Remove unused variables" 2014-12-09 19:57:05 +00:00
Andreas Gampe
7398a5af38 GUI: Remove unused variables
For build-system CFLAGS clean-up, remove unused variables.

Bug: 18632512
Change-Id: I79fdcf830683d7278f4bf114cfb76a26da1b88ff
2014-12-08 20:42:40 -08:00
Dan Stoza
e22262ffd0 Merge "libgui: Enable -Weverything and -Werror" 2014-12-08 18:46:08 +00:00
Andreas Gampe
8fd567b127 Merge "Libui: Remove unused variables" 2014-12-08 18:23:15 +00:00
Andreas Gampe
ff78750c64 Libui: Remove unused variables
For build-system CFLAGS clean-up, remove unused variables.

Bug: 18632512
Change-Id: Ib78912ae442ddc6410960ab1efb4fb2faa1a9208
2014-12-05 20:52:16 -08:00
Dan Stoza
dd883c0b08 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:
  d723bd7669
  00d504c06e
  429ba89cd2

Change-Id: I034abec27bf4020d84af60d7acc1939c59986dd6
2014-12-05 14:59:29 -08:00
Dan Stoza
e1a2caeb2c Merge "Fix crash when user provides large values in the Parcel." 2014-12-05 21:08:42 +00:00
Michael Lentine
ae33effd43 Fix crash when user provides large values in the Parcel.
Bug: 18102648
Change-Id: Ie6a24718e586a34424238363de80f9545951514f
(cherry-picked from commit 8afa1c4ab8)
2014-12-05 20:31:09 +00:00
Dan Albert
09b9193d10 Merge "Fix -Werror on 64-bit builds" 2014-12-05 17:48:53 +00:00
Dan Albert
67df03d054 Merge "Disable struct padding warning/error" 2014-12-05 17:48:47 +00:00
Dan Albert
35df753169 Merge "libui: Enable -Weverything and -Werror" 2014-12-05 17:48:11 +00:00
Dan Albert
5588d9000c Merge "Enable clang for libui/libgui/surfaceflinger" 2014-12-05 17:47:58 +00:00
Dan Albert
e2824e0494 Merge "Fix for corruption when numFds or numInts is too large." 2014-12-05 17:47:37 +00:00
Dan Stoza
133caacf87 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 116c7a113c)
2014-12-04 18:06:48 -08:00
Dan Stoza
42af278173 Disable struct padding warning/error
Adds -Wno-padded, which was triggering on 64-bit devices

Change-Id: If27bac27881f2081a222b32213901f5087554b07
(cherry picked from commit 4e84bd310c)
2014-12-04 18:06:48 -08:00
Dan Stoza
d318240042 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 303b9a5123)
2014-12-04 17:56:27 -08:00
Dan Stoza
01049c8321 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 f10c46ef85)
2014-12-04 17:56:17 -08:00
Michael Lentine
3880326857 Fix for corruption when numFds or numInts is too large.
Bug: 18076253
Change-Id: I4c5935440013fc755e1d123049290383f4659fb6
(cherry picked from commit dfd06b89a4)
2014-12-04 17:49:31 -08:00
Andreas Gampe
f8954c81a4 Merge "OpenGL tests: Fix unused variables" 2014-12-02 18:24:57 +00:00
Jesse Hall
4aaa39358f Merge "Avoid overwriting EGL14.EGL_NO_SURFACE" 2014-12-02 00:34:51 +00:00
Dan Stoza
80e8150549 Merge "binder: Add {read,write}Uint32 methods to Parcel" 2014-12-01 19:16:17 +00:00
Dan Stoza
41a0f2f86c binder: Add {read,write}Uint32 methods to Parcel
Adds readUint32 and writeUint32 methods to the Parcel class. This
saves a lot of static_casting in anything implementing a Binder
interface on the native side.

Change-Id: Iafc73b0633654a3a4c49767f41806b56906c924f
2014-12-01 11:13:11 -08:00
Dan Stoza
104e12594e Merge "binder: Return pid_t/uid_t instead of int" 2014-12-01 19:10:58 +00:00
Dan Stoza
9c634fd2d1 binder: Return pid_t/uid_t instead of int
Makes IPCThreadState::getCalling{Pid,Uid} return a more
appropriate type.

Change-Id: I97f8a83c1c0722bc1afbf8a6df1a288f8f1f0d2c
2014-12-01 11:07:14 -08:00
Jon McCaffrey
65dbe971b1 InputDispatcher: Optimize count()
Count items as they are added and removed rather than iterating over the
entire list to count them.

Increases performance slightly, particularly when tracing is turned on,
which causes count to be queried more often, and when the number of
items in the queues grow large.  This can happen due to applications not
responding, for example.

Change-Id: I0f11f7edd46089612af910cdfabfeb3ee685d7d9
2014-11-26 12:04:47 -08:00
Chih-hung Hsieh
46ca041f43 Merge "Don't error out because SensorEventConnection::dump overloads BBinder::dump" 2014-11-25 23:45:38 +00:00
Bernhard Rosenkränzer
72952efe5c Don't error out because SensorEventConnection::dump overloads BBinder::dump
clang warns about SensorEventConnection::dump overloading BBinder::dump
in some conditions.

Since the cause isn't fixable without changing the API, tell clang not
to error out on it.

Change-Id: I15659de7c5499d937019599cfefb01305039e6b5
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
2014-11-25 15:42:27 -08:00
Chih-hung Hsieh
2d7ec9d7b5 Merge "Fix build with clang in C++11 mode" 2014-11-25 22:43:44 +00:00