OSDN Git Service
Jesse Hall [Sun, 15 Mar 2015 02:41:04 +0000 (02:41 +0000)]
Merge "[MIPS] Fix mips32r1 build"
Andreas Gampe [Tue, 10 Mar 2015 02:10:06 +0000 (02:10 +0000)]
am
5a25a63d: Merge "Installd: Pass debuggable flag"
* commit '
5a25a63de2693177b15817fb19b684ca7bfec582':
Installd: Pass debuggable flag
Andreas Gampe [Mon, 9 Mar 2015 22:14:47 +0000 (22:14 +0000)]
Merge "Installd: Pass debuggable flag"
Andreas Gampe [Tue, 3 Mar 2015 17:15:06 +0000 (09:15 -0800)]
Installd: Pass debuggable flag
Pass the debuggable flag from the package manager to dex2oat.
Change-Id: Id17ec72babe2ee88713a0d274eff86508de30666
Dan Stoza [Mon, 9 Mar 2015 18:05:26 +0000 (18:05 +0000)]
am
3949f664: Merge "SurfaceFlinger: Fix null pointer exception"
* commit '
3949f664c71ad1269ee0c921d176e3b4484015cc':
SurfaceFlinger: Fix null pointer exception
Dan Stoza [Mon, 9 Mar 2015 18:00:28 +0000 (18:00 +0000)]
Merge "SurfaceFlinger: Fix null pointer exception"
Dan Stoza [Mon, 9 Mar 2015 17:04:11 +0000 (10:04 -0700)]
SurfaceFlinger: Fix null pointer exception
Fixes a null pointer exception in getActiveConfig
Bug:
19416124
Change-Id: I45a01f67affb63a348866ce42a6013c5eb71fe8f
Nick Kralevich [Thu, 5 Mar 2015 21:48:25 +0000 (21:48 +0000)]
am
5fec7915: Merge "service_manager: reorder permission checks for find"
* commit '
5fec79156d749322dcc0376da1d6cf4d9ee9ccf4':
service_manager: reorder permission checks for find
Nick Kralevich [Thu, 5 Mar 2015 21:43:07 +0000 (21:43 +0000)]
Merge "service_manager: reorder permission checks for find"
Nick Kralevich [Thu, 5 Mar 2015 18:58:40 +0000 (10:58 -0800)]
service_manager: reorder permission checks for find
Reorder the find permission checks. This avoids generating misleading
SELinux denials when a service doesn't exist, or when a service is
prohibited to isolated apps.
The original reason for structuring the code this way is explained
in https://android-review.googlesource.com/#/c/100530/4/cmds/servicemanager/service_manager.c@172
The concern at the time was to avoid leaking a situation where
a caller could probe for the existance of a service. This turns out
to be unnecessary. The same return value is used for both a
permission denied and a service not found. The only side effect
is the generation of an SELinux audit log, which likely won't be
accessible to the calling application.
Change-Id: I9760e1821ed16102fa5f9bec07f8c34944565be9
Christopher Ferris [Thu, 26 Feb 2015 18:40:42 +0000 (18:40 +0000)]
am
9d68ed0e: Merge "Add timeout for dump_file."
* commit '
9d68ed0ecd3a101c13a163cfe730b13b1564b442':
Add timeout for dump_file.
Christopher Ferris [Thu, 26 Feb 2015 18:35:01 +0000 (18:35 +0000)]
Merge "Add timeout for dump_file."
Mark Salyzyn [Thu, 26 Feb 2015 17:29:07 +0000 (17:29 +0000)]
am
bb67beca: Merge "dumpstate: add pstore read"
* commit '
bb67beca35e7d570ede193a316a92022fbc2f810':
dumpstate: add pstore read
Mark Salyzyn [Thu, 26 Feb 2015 17:23:41 +0000 (17:23 +0000)]
Merge "dumpstate: add pstore read"
Mark Salyzyn [Tue, 16 Dec 2014 17:09:26 +0000 (09:09 -0800)]
dumpstate: add pstore read
Call logcat -L to pull any LAST Android logs. If the kernel is not
configured for PSTORE and PSTORE_PMSG, the hopes are the empty
content will pressure vendors to slice up and configure support.
Change-Id: I5fddfa1e0f59f24fccc30b257ba68af8a8cf8640
Christopher Ferris [Tue, 10 Feb 2015 20:15:01 +0000 (12:15 -0800)]
Add timeout for dump_file.
It turns out dump_file is used on a number of /proc and system files.
In one case, the read of a file stalled and caused a bugreport to
hang forever. It's still possible if there is a kernel bug that this
could stall forever, but less likely.
Also, change the return type of nanotime to uint64_t.
Testing:
- Created a named fifo and verified that dump_file fails with a timeout.
- Created a large /data/anr/traces.txt to verify that large files still
dump properly and that the additional NONBLOCK parameter doesn't cause
a problem.
- Created a dummy /data/tombstones/tombstone_00 to verify that the
dump of these files still works.
- Compared a dump using the old dumpstate to the new dumpstate to verify
nothing obviously different.
Bug:
19117030
Change-Id: I0d3dd27583c853cdaccd2fd278748cb5f9ccd4fb
Greg Hackmann [Thu, 26 Feb 2015 01:07:03 +0000 (01:07 +0000)]
am
56f8c6c4: Merge "Error compiling waitforvsync.cpp"
* commit '
56f8c6c42dab4c3636edb62162088e5d765fa956':
Error compiling waitforvsync.cpp
Greg Hackmann [Wed, 25 Feb 2015 23:42:17 +0000 (23:42 +0000)]
Merge "Error compiling waitforvsync.cpp"
Dan Albert [Wed, 25 Feb 2015 23:00:44 +0000 (23:00 +0000)]
am
79749845: Merge "Fix pointer-to-int and int-to-pointer warnings."
* commit '
797498450cbcb87c28636e775ada942005436909':
Fix pointer-to-int and int-to-pointer warnings.
Dan Albert [Wed, 25 Feb 2015 22:50:10 +0000 (22:50 +0000)]
Merge "Fix pointer-to-int and int-to-pointer warnings."
Dan Albert [Mon, 23 Feb 2015 18:39:14 +0000 (10:39 -0800)]
Fix pointer-to-int and int-to-pointer warnings.
Change-Id: If534cbcf2c3e644270572cbf829ba9b5acab29e6
Mark Salyzyn [Mon, 23 Feb 2015 15:19:59 +0000 (15:19 +0000)]
am
d80268ba: Merge "vsync.cpp test is throwing error whe compiled"
* commit '
d80268ba19f9217c5459a2952580090ef84a7b78':
vsync.cpp test is throwing error whe compiled
Mark Salyzyn [Mon, 23 Feb 2015 15:14:23 +0000 (15:14 +0000)]
Merge "vsync.cpp test is throwing error whe compiled"
Nanik Tolaram [Sat, 14 Feb 2015 00:32:46 +0000 (11:32 +1100)]
vsync.cpp test is throwing error whe compiled
frameworks/native/services/surfaceflinger/tests/vsync/vsync.cpp:55:44: error: 'ALOOPER_EVENT_INPUT' was not declared in this scope
loop->addFd(myDisplayEvent.getFd(), 0, ALOOPER_EVENT_INPUT, receiver,
^
frameworks/native/services/surfaceflinger/tests/vsync/vsync.cpp:64:18: error: 'ALOOPER_POLL_WAKE' was not declared in this scope
case ALOOPER_POLL_WAKE:
^
frameworks/native/services/surfaceflinger/tests/vsync/vsync.cpp:67:18: error: 'ALOOPER_POLL_CALLBACK' was not declared in this scope
case ALOOPER_POLL_CALLBACK:
^
frameworks/native/services/surfaceflinger/tests/vsync/vsync.cpp:70:18: error: 'ALOOPER_POLL_TIMEOUT' was not declared in this scope
case ALOOPER_POLL_TIMEOUT:
^
frameworks/native/services/surfaceflinger/tests/vsync/vsync.cpp:73:18: error: 'ALOOPER_POLL_ERROR' was not declared in this scope
case ALOOPER_POLL_ERROR:
^
it is missing one header file
Change-Id: Ie2fb02523a866b13a99edf837f072d101cacb466
Signed-off-by: Nanik Tolaram <nanikjava@gmail.com>
Elliott Hughes [Fri, 20 Feb 2015 01:13:29 +0000 (01:13 +0000)]
am
f3f22e55: Merge "Add missing <unistd.h> include for close."
* commit '
f3f22e555bae8e362f3cac1efb289ca321266035':
Add missing <unistd.h> include for close.
Elliott Hughes [Fri, 20 Feb 2015 01:08:07 +0000 (01:08 +0000)]
Merge "Add missing <unistd.h> include for close."
Elliott Hughes [Fri, 20 Feb 2015 00:58:44 +0000 (16:58 -0800)]
Add missing <unistd.h> include for close.
Change-Id: Iebce6d74eecb8c275e800b7f47f74bbd4374860d
Bill Yi [Thu, 19 Feb 2015 22:31:45 +0000 (14:31 -0800)]
Jesse Hall [Wed, 18 Feb 2015 17:31:12 +0000 (17:31 +0000)]
Merge "egl: Remove old tuna BGRA vs RGBA workaround."
Elliott Hughes [Tue, 17 Feb 2015 01:24:48 +0000 (01:24 +0000)]
Merge "Add missing <sys/file.h> include for flock."
Elliott Hughes [Mon, 16 Feb 2015 18:44:22 +0000 (10:44 -0800)]
Add missing <sys/file.h> include for flock.
Change-Id: I5c9bb4aa74d8a36d44e086bbcb5d60876727ce4c
Nanik Tolaram [Fri, 13 Feb 2015 13:26:59 +0000 (00:26 +1100)]
Error compiling waitforvsync.cpp
The waitforvsync.cpp throws error when compiling. Following is the error log
target thumb C++: test-waitforvsync <= frameworks/native/services/surfaceflinger/tests/waitforvsync/waitforvsync.cpp
frameworks/native/services/surfaceflinger/tests/waitforvsync/waitforvsync.cpp: In function 'int main(int, char**)':
frameworks/native/services/surfaceflinger/tests/waitforvsync/waitforvsync.cpp:43:17: error: 'close' was not declared in this scope
close(fd);
^
....
....
make: *** [out/target/product/grouper/obj/EXECUTABLES/test-waitforvsync_intermediates/waitforvsync.o] Error 1
the file is missing #include <unistd.h>
Change-Id: I57728dbde65641cd3138625f9a590f9db8648158
Signed-off-by: Nanik Tolaram <nanikjava@gmail.com>
Alistair Strachan [Thu, 12 Feb 2015 20:33:25 +0000 (12:33 -0800)]
egl: Remove old tuna BGRA vs RGBA workaround.
Some time before kitkat, a workaround was put in place to keep tuna
working with obsolete PowerVR GPU drivers. The tuna product was dropped
in AOSP for kitkat, but the workaround remained.
There are still a number of devices shipping with OMAP4 processors, and
this workaround continues to be applied on those products even when it
is not required. The effect is that virtual display CTS will fail on
those devices.
Nick Vaccaro [Wed, 11 Feb 2015 20:04:42 +0000 (20:04 +0000)]
am
b9bb1f13: Merge "Add support for SENSOR_TYPE_WRIST_TILT_GESTURE" into lmp-mr1-modular-dev
* commit '
b9bb1f139bd1cbf3b3faa002b509f3f0a167e20b':
Add support for SENSOR_TYPE_WRIST_TILT_GESTURE
Lajos Molnar [Wed, 11 Feb 2015 20:04:40 +0000 (20:04 +0000)]
am
9b6be8e1: Revert "omx: add Intel\'s SemiPlanar OMX color format that is used on some devices"
* commit '
9b6be8e10b25f6f0bb949fec67b36fc773f5b591':
Revert "omx: add Intel's SemiPlanar OMX color format that is used on some devices"
Nick Vaccaro [Wed, 11 Feb 2015 19:58:18 +0000 (19:58 +0000)]
Merge "Add support for SENSOR_TYPE_WRIST_TILT_GESTURE" into lmp-mr1-modular-dev
Lajos Molnar [Wed, 11 Feb 2015 17:58:06 +0000 (09:58 -0800)]
Revert "omx: add Intel's SemiPlanar OMX color format that is used on some devices"
This reverts commit
61b17d64f90b85fd367ea1c7609cac69485957d4.
Bug:
19317169
Change-Id: Ib1fcc26c46a52c848ffa8238ddbf6abfe57cfa5d
Christopher Ferris [Tue, 10 Feb 2015 16:53:52 +0000 (16:53 +0000)]
am
8511b3ae: Merge "Remove -z option."
* commit '
8511b3ae5eb42810f97f7c3e993d7f80d3393b83':
Remove -z option.
Christopher Ferris [Tue, 10 Feb 2015 01:26:58 +0000 (01:26 +0000)]
Merge "Remove -z option."
Christopher Ferris [Tue, 10 Feb 2015 00:24:47 +0000 (16:24 -0800)]
Remove -z option.
This option doesn't work with the current selinux protections and
doesn't serve much of a purpose. You can get the same results running
this:
dumpstate | gzip > /data/local/tmp/dump.txt.gz
Bug:
19271141
Change-Id: Icc76200df33dc708e30c556ec8a0f393f995fe7c
Nick Vaccaro [Wed, 21 Jan 2015 23:27:23 +0000 (15:27 -0800)]
Add support for SENSOR_TYPE_WRIST_TILT_GESTURE
Change-Id: I7e5516de805618df41de0f9b06805002e32708c3
Lajos Molnar [Sat, 7 Feb 2015 00:06:07 +0000 (00:06 +0000)]
am
d25be0ea: DO NOT MERGE: omx: add OMX_INTEL_COLOR_FormatYUV420PackedSemiPlanar
* commit '
d25be0ea48c775e4038163b546c9553e294d4fdc':
DO NOT MERGE: omx: add OMX_INTEL_COLOR_FormatYUV420PackedSemiPlanar
Lajos Molnar [Fri, 6 Feb 2015 02:37:56 +0000 (18:37 -0800)]
DO NOT MERGE: omx: add OMX_INTEL_COLOR_FormatYUV420PackedSemiPlanar
This seems to have the same layout as OMX_COLOR_FormatYUV420SemiPlanar,
but used under this value on some devices.
Bug:
19246722
Change-Id: Ib866024e52cf7b12608f02eefc43c6d58a1c0aa1
Lajos Molnar [Wed, 4 Feb 2015 20:47:43 +0000 (20:47 +0000)]
am
ea5da67d: add bUsingNativeBuffers to DescribeColorFormatParams
* commit '
ea5da67d90647a1d4b395be51bf9cec218b98b71':
add bUsingNativeBuffers to DescribeColorFormatParams
Christopher Ferris [Wed, 4 Feb 2015 02:08:44 +0000 (02:08 +0000)]
am
50ad67e4: Merge "Add better timeout mechanism for running commands."
* commit '
50ad67e4ce6b07b5f5f4649ace81ed9a8b2c2eac':
Add better timeout mechanism for running commands.
Christopher Ferris [Wed, 4 Feb 2015 01:57:13 +0000 (01:57 +0000)]
Merge "Add better timeout mechanism for running commands."
Christopher Ferris [Fri, 30 Jan 2015 19:00:52 +0000 (11:00 -0800)]
Add better timeout mechanism for running commands.
Change-Id: I60fc9e7d59c3e0e4b8b2f69f79c6903240bfd131
Duane Sand [Tue, 3 Feb 2015 00:54:15 +0000 (16:54 -0800)]
[MIPS] Fix mips32r1 build
Fix regression from
6701fbe5f0d799c5245b0cdf3a69ecdcbfd9fb08 .
The rdhwr instruction is unsupported by mips32r1 cpus, but is
supported via kernel emulation on those cpus.
Change-Id: Ieb3343fff0f0da54003044f451c90e1c761208eb
Elliott Hughes [Fri, 30 Jan 2015 21:16:38 +0000 (21:16 +0000)]
am
51bfedd8: Merge "Add missing includes."
* commit '
51bfedd821c79ae34ee1caffd9ae958faa71ecec':
Add missing includes.
Lajos Molnar [Fri, 30 Jan 2015 18:36:11 +0000 (10:36 -0800)]
add bUsingNativeBuffers to DescribeColorFormatParams
This is needed to find proper color format for flex-YUV native
buffer support.
Bug:
19179927
Change-Id: I91ae6764e302c4307a0750c1d6820506d735c942
Elliott Hughes [Fri, 30 Jan 2015 06:34:37 +0000 (06:34 +0000)]
Merge "Add missing includes."
Elliott Hughes [Fri, 30 Jan 2015 06:32:32 +0000 (22:32 -0800)]
Add missing includes.
Change-Id: I1dad32ab459c25063a70cf52100a29d00fea3a90
Lajos Molnar [Thu, 29 Jan 2015 08:41:35 +0000 (08:41 +0000)]
am
94ee9b59: Merge "CpuConsumer: lock buffers that could be YUV as ycbcr" into lmp-mr1-dev
* commit '
94ee9b5916903e6ee23bb1ce8f688900a4eb6f65':
CpuConsumer: lock buffers that could be YUV as ycbcr
Lajos Molnar [Thu, 29 Jan 2015 07:53:57 +0000 (07:53 +0000)]
Merge "CpuConsumer: lock buffers that could be YUV as ycbcr" into lmp-mr1-dev
Lajos Molnar [Thu, 29 Jan 2015 05:27:46 +0000 (21:27 -0800)]
resolved conflicts for merge of
1f9f71e1 to lmp-mr1-dev-plus-aosp
Change-Id: I627e58fe738e9a3b9831508853f26f9adc350f90
Lajos Molnar [Fri, 23 Jan 2015 00:37:37 +0000 (16:37 -0800)]
CpuConsumer: lock buffers that could be YUV as ycbcr
Bug:
17906609
Change-Id: Ic71af69ec3b19ab1224ed3ad5e0a97c60e81cda6
Lajos Molnar [Thu, 29 Jan 2015 00:16:40 +0000 (16:16 -0800)]
GraphicBufferMapper: handle devices that do not implement lock_ycbcr
Bug:
19179927
Change-Id: I09ffca954fed3cd2d3466c8396627dc7dbc0052d
Michael Lentine [Wed, 28 Jan 2015 22:38:42 +0000 (22:38 +0000)]
am
d6fce7ab: Merge "Remove lock around ref count check in terminate." into lmp-mr1-dev
* commit '
d6fce7ab66e5d33e3ee16247485d1b8c26dd7ee8':
Remove lock around ref count check in terminate.
Michael Lentine [Wed, 28 Jan 2015 22:23:05 +0000 (22:23 +0000)]
Merge "Remove lock around ref count check in terminate." into lmp-mr1-dev
Michael Lentine [Tue, 27 Jan 2015 17:01:03 +0000 (09:01 -0800)]
Remove lock around ref count check in terminate.
Replace the global lock in terminate for the ref count check with atomics and a
local lock.
Bug:
19072064
Change-Id: I0cfd6564e227a75b8387a8788b16381d5bc2cc88
Elliott Hughes [Wed, 28 Jan 2015 17:34:16 +0000 (17:34 +0000)]
am
0e17a265: Merge "Switch dumpstate to "ip link list"."
* commit '
0e17a265f5e8bf233a3e3b74fc03ada3dc467bed':
Switch dumpstate to "ip link list".
Elliott Hughes [Wed, 28 Jan 2015 17:22:27 +0000 (17:22 +0000)]
Merge "Switch dumpstate to "ip link list"."
Elliott Hughes [Wed, 28 Jan 2015 04:48:52 +0000 (20:48 -0800)]
Switch dumpstate to "ip link list".
Change-Id: Ia1db51c866890f09fbd4316764dea5982554598f
Dan Stoza [Tue, 27 Jan 2015 20:06:33 +0000 (20:06 +0000)]
Merge "resolved conflicts for merge of
1665c8e1 to lmp-mr1-dev-plus-aosp" into lmp-mr1-dev-plus-aosp
Yabin Cui [Tue, 27 Jan 2015 19:56:06 +0000 (19:56 +0000)]
am
6e32c037: Merge "Kill HAVE_PTHREADS."
* commit '
6e32c0377db89bafa477715b3a02431d651978cf':
Kill HAVE_PTHREADS.
Dan Stoza [Tue, 27 Jan 2015 19:49:03 +0000 (11:49 -0800)]
resolved conflicts for merge of
1665c8e1 to lmp-mr1-dev-plus-aosp
Change-Id: I0be2ecb8085f2cd9560138460bcc27d71c011608
Yabin Cui [Tue, 27 Jan 2015 19:46:54 +0000 (19:46 +0000)]
Merge "Kill HAVE_PTHREADS."
Dan Stoza [Tue, 27 Jan 2015 18:32:10 +0000 (10:32 -0800)]
Revert "SurfaceFlinger: Attempt to attribute fds to layers"
This reverts commit
03eccb6616744c3789b6018680de7bf5a18f71ce.
Change-Id: I4f0da7bb62bf77bb3d399aee601beae5e03928fe
Yabin Cui [Tue, 27 Jan 2015 03:45:47 +0000 (19:45 -0800)]
Kill HAVE_PTHREADS.
Bug:
19083585
Change-Id: I355491de945590f43c82bdcb7968b01b4bff6e06
Jesse Hall [Mon, 26 Jan 2015 17:39:55 +0000 (17:39 +0000)]
am
a46ff664: Merge "Use register numbers instead of register names"
* commit '
a46ff664571465b7a2741bed4225d30b5bf07503':
Use register numbers instead of register names
Jesse Hall [Mon, 26 Jan 2015 17:17:08 +0000 (17:17 +0000)]
Merge "Use register numbers instead of register names"
Elliott Hughes [Sun, 25 Jan 2015 20:43:27 +0000 (20:43 +0000)]
am
346329b7: Merge "Move atrace from the obsolete bzero to memset."
* commit '
346329b7a70b594895be0aec5dc00f9f4108b533':
Move atrace from the obsolete bzero to memset.
Elliott Hughes [Sun, 25 Jan 2015 19:17:14 +0000 (19:17 +0000)]
Merge "Move atrace from the obsolete bzero to memset."
Elliott Hughes [Sun, 25 Jan 2015 16:35:20 +0000 (08:35 -0800)]
Move atrace from the obsolete bzero to memset.
(This file wasn't including <strings.h> for bzero or <string.h> for memset.)
Change-Id: Icef0e0dbfd36ebd21058cfd8c747e0a17aee8308
Christopher Ferris [Fri, 23 Jan 2015 23:12:16 +0000 (23:12 +0000)]
am
c0e10c6f: Merge "Refactor of the bugreport code."
* commit '
c0e10c6f03eaa126aeb745e0b209ad0b219ade6e':
Refactor of the bugreport code.
Christopher Ferris [Fri, 23 Jan 2015 23:01:28 +0000 (23:01 +0000)]
Merge "Refactor of the bugreport code."
Christopher Ferris [Wed, 21 Jan 2015 03:18:59 +0000 (19:18 -0800)]
Refactor of the bugreport code.
Implemented these changes:
- Make this code C++.
- Avoid hangs by adding a timeout.
- Add the necessary TEMP_FAILURE_RETRY calls.
- Restructure the code a bit.
Bug:
18800936
Change-Id: Iba9f86a4c7beee4f0f36e51234855f4c0834db47
Jesse Hall [Thu, 22 Jan 2015 18:50:55 +0000 (18:50 +0000)]
am
f551e1c1: Merge "[MIPS] Further opengl support for mips64 and mipsr6"
* commit '
f551e1c1a59ae7ac906e2b204c3704d0dbf926a8':
[MIPS] Further opengl support for mips64 and mipsr6
Jesse Hall [Thu, 22 Jan 2015 16:55:04 +0000 (16:55 +0000)]
Merge "[MIPS] Further opengl support for mips64 and mipsr6"
Dan Stoza [Thu, 22 Jan 2015 01:36:06 +0000 (17:36 -0800)]
libui: Add Rect(uint32_t, uint32_t)
Adds a Rect constructor that takes uint32_t instead of int32_t, as
required by a change to Region and -Werror
Change-Id: If91915e5b4ec9ce9e7ba0fb84f03b045d000b023
Dan Stoza [Thu, 22 Jan 2015 00:13:22 +0000 (00:13 +0000)]
am
4ecf6ec9: Merge "Restore Region::set(uint32_t, uint32_t)"
* commit '
4ecf6ec932644b680d5e13791275dd3bc1a1ee6d':
Restore Region::set(uint32_t, uint32_t)
Dan Stoza [Wed, 21 Jan 2015 16:39:22 +0000 (16:39 +0000)]
Merge "Restore Region::set(uint32_t, uint32_t)"
Nikola Veljkovic [Fri, 26 Dec 2014 16:33:14 +0000 (17:33 +0100)]
Use register numbers instead of register names
Avoid ambiguity by using register numbers. Register names are
interpreted depending on the ABI. Fixes the issue with mips64 gcc,
where registers t0-t4 are translated into $8-$11 (o32 ABI) instead
of $12-$15 (o64 ABI).
Also, use t9 ($25) for storing function address
(in getProcAddress.cpp).
Change-Id: I12ef5cd98bf14dab3c01f2756889cc02856c1cd8
Duane Sand [Wed, 26 Nov 2014 21:17:40 +0000 (13:17 -0800)]
[MIPS] Further opengl support for mips64 and mipsr6
Combines 4 patches by Dragoslav and Douglas:
Use t9 to hold the address of the called function.
Add support for gl binding.
Fix inline assembly code to be R6 compatible.
Fix some more inline assembly code to be R6 compatible.
Change-Id: I0b899813790b2ba4ca538bb21692014cc1933f66
Dan Stoza [Sat, 17 Jan 2015 00:50:53 +0000 (00:50 +0000)]
am
ef1c17ae: SurfaceFlinger: Make log message 64-bit compatible
* commit '
ef1c17ae9417abc1e21e49dbc629e448efc947dc':
SurfaceFlinger: Make log message 64-bit compatible
Dan Stoza [Sat, 17 Jan 2015 00:18:51 +0000 (16:18 -0800)]
resolved conflicts for merge of
03eccb66 to lmp-mr1-dev-plus-aosp
Change-Id: I1f38cbe7019b2b48b1094dee154ad97c23fd22c2
Dan Stoza [Fri, 16 Jan 2015 23:58:13 +0000 (15:58 -0800)]
SurfaceFlinger: Make log message 64-bit compatible
Fixes the build on 64-bit targets that complain about using a size_t
with a %d in a format string
Change-Id: I7dfcd3a49eb0dbc5dffeb82bb7208de7f7925f08
Dan Stoza [Fri, 16 Jan 2015 22:13:46 +0000 (14:13 -0800)]
SurfaceFlinger: Attempt to attribute fds to layers
This tracks fds when layers are created and destroyed in an effort to
determine which specific app (if any) is active when fds are leaked
Bug:
19017008
Change-Id: I1f1d5a9cbc1399e3df3a2d350324f80b3a4e3477
Jeff Sharkey [Fri, 16 Jan 2015 06:07:31 +0000 (06:07 +0000)]
am
8f3ade0c: Merge "Follow StrictMode refactoring."
* commit '
8f3ade0c9ab52a1e4f13d6ff1922dd98e3ccdbcc':
Follow StrictMode refactoring.
Jeff Sharkey [Fri, 16 Jan 2015 01:10:51 +0000 (01:10 +0000)]
Merge "Follow StrictMode refactoring."
Christopher Ferris [Thu, 15 Jan 2015 23:51:57 +0000 (23:51 +0000)]
am
1d463883: Merge "Use the timeout stack dump functions."
* commit '
1d4638838aa09b157a68cb3580b8194f8736b880':
Use the timeout stack dump functions.
Christopher Ferris [Thu, 15 Jan 2015 23:40:39 +0000 (23:40 +0000)]
Merge "Use the timeout stack dump functions."
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
(cherry picked from commit
457731f69e3106b5aae8fc04f9565af1d875876c)
Change-Id: I39e8e9c60209e3ef9efac795fedb8e1edce2bd3e
Jeff Davidson [Thu, 15 Jan 2015 23:02:01 +0000 (23:02 +0000)]
am
4df903db: Merge "Revert "Revert "Update protobuf library from 2.3 to 2.6."""
* commit '
4df903dbc71c48e2db6fae9390795b81782470b4':
Revert "Revert "Update protobuf library from 2.3 to 2.6.""
Jeff Davidson [Thu, 15 Jan 2015 22:49:02 +0000 (22:49 +0000)]
Merge "Revert "Revert "Update protobuf library from 2.3 to 2.6."""
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
Jeff Sharkey [Thu, 18 Dec 2014 18:26:57 +0000 (10:26 -0800)]
Follow StrictMode refactoring.
Bug:
18335678
Change-Id: Iea920cfa26b5ebfd77b4601c9e6e65b21599342a