OSDN Git Service
Michael Lentine [Tue, 25 Nov 2014 18:56:41 +0000 (18:56 +0000)]
am
1e611662: am
b947f29a: Merge "Add clamp to Layer and update Transform inverse." into lmp-mr1-dev
* commit '
1e6116621bc2f7aedfd52a5f1327b530328435b0':
Add clamp to Layer and update Transform inverse.
Michael Lentine [Tue, 25 Nov 2014 18:44:51 +0000 (18:44 +0000)]
am
b947f29a: Merge "Add clamp to Layer and update Transform inverse." into lmp-mr1-dev
* commit '
b947f29a6af1622cda16d0b7112595082750dd07':
Add clamp to Layer and update Transform inverse.
Dianne Hackborn [Tue, 25 Nov 2014 17:43:21 +0000 (17:43 +0000)]
am
bbe43a4c: am
e8a4dce8: Merge "Work on issue #
18486438: Reduce size of bugreport output" into lmp-mr1-dev
* commit '
bbe43a4cdd0ea9a06d09e451dc256b7de59b5817':
Work on issue #
18486438: Reduce size of bugreport output
Dianne Hackborn [Tue, 25 Nov 2014 17:36:43 +0000 (17:36 +0000)]
am
e8a4dce8: Merge "Work on issue #
18486438: Reduce size of bugreport output" into lmp-mr1-dev
* commit '
e8a4dce8169ba5fdcd86a5fc29aa6986de1711b0':
Work on issue #
18486438: Reduce size of bugreport output
Michael Lentine [Tue, 25 Nov 2014 00:56:51 +0000 (00:56 +0000)]
Merge "Add clamp to Layer and update Transform inverse." into lmp-mr1-dev
Eino-Ville Talvala [Mon, 24 Nov 2014 18:12:10 +0000 (18:12 +0000)]
am
6086365e: am
9c08f6c8: Merge "Camera: Add XML entries and files for new system features" into lmp-mr1-dev
* commit '
6086365e41e0e1656e8bfffdf4b70f897f080994':
Camera: Add XML entries and files for new system features
Eino-Ville Talvala [Mon, 24 Nov 2014 18:05:35 +0000 (18:05 +0000)]
am
9c08f6c8: Merge "Camera: Add XML entries and files for new system features" into lmp-mr1-dev
* commit '
9c08f6c8364ce82c3855ad8c6ee98cb2c6595141':
Camera: Add XML entries and files for new system features
Dianne Hackborn [Mon, 24 Nov 2014 17:53:55 +0000 (17:53 +0000)]
Merge "Work on issue #
18486438: Reduce size of bugreport output" into lmp-mr1-dev
Narayan Kamath [Mon, 24 Nov 2014 13:28:56 +0000 (13:28 +0000)]
am
769c779c: am
8e5fdac4: Merge "Mark 2 unused paramters as such"
* commit '
769c779ce6dbc0ae780b33956be78bb6944e0705':
Mark 2 unused paramters as such
Narayan Kamath [Mon, 24 Nov 2014 13:24:58 +0000 (13:24 +0000)]
am
8e5fdac4: Merge "Mark 2 unused paramters as such"
* commit '
8e5fdac4de722d4f1333471a5a60412a0db2d1df':
Mark 2 unused paramters as such
Narayan Kamath [Mon, 24 Nov 2014 13:16:36 +0000 (13:16 +0000)]
Merge "Mark 2 unused paramters as such"
Bernhard Rosenkränzer [Sun, 23 Nov 2014 21:28:26 +0000 (22:28 +0100)]
Mark 2 unused paramters as such
Mark 2 unused paramters to prevent clang from erroring out
Change-Id: Ifc9b4a5b820bd6318e9259e737e708d25fdb174b
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
Elliott Hughes [Sat, 22 Nov 2014 08:04:43 +0000 (08:04 +0000)]
am
f167968b: am
e0f91c37: Merge "We HAVE_LITTLE_ENDIAN."
* commit '
f167968b4667df017958a653f74c60831faf5ad8':
We HAVE_LITTLE_ENDIAN.
Elliott Hughes [Sat, 22 Nov 2014 08:01:17 +0000 (08:01 +0000)]
am
e0f91c37: Merge "We HAVE_LITTLE_ENDIAN."
* commit '
e0f91c3731b16b010eb31117e941e5468bdfeb2e':
We HAVE_LITTLE_ENDIAN.
Elliott Hughes [Sat, 22 Nov 2014 07:49:31 +0000 (07:49 +0000)]
Merge "We HAVE_LITTLE_ENDIAN."
Elliott Hughes [Sat, 22 Nov 2014 07:35:36 +0000 (23:35 -0800)]
We HAVE_LITTLE_ENDIAN.
Change-Id: I68551ad663f2649a06b1958e9bef152e6d026e72
Eino-Ville Talvala [Sat, 22 Nov 2014 04:57:51 +0000 (04:57 +0000)]
Merge "Camera: Add XML entries and files for new system features" into lmp-mr1-dev
Eino-Ville Talvala [Thu, 20 Nov 2014 23:37:51 +0000 (15:37 -0800)]
Camera: Add XML entries and files for new system features
Add BURST_CAPTURE and READ_SENSOR_SETTINGS.
Bug:
18281970
Change-Id: Ibf596c97fbca46f2ae044b6c87586d76605a5163
Michael Lentine [Thu, 20 Nov 2014 02:32:37 +0000 (18:32 -0800)]
Add clamp to Layer and update Transform inverse.
Ensure that the adjusted transparent region is within
the display bounds by clamping after the transformation
is applied and clean up transform's inverse function.
Bug:
18452546
Change-Id: Ia473e483ee8374177bcb84d8192eb1f0e86f022a
Dianne Hackborn [Sat, 22 Nov 2014 00:39:24 +0000 (16:39 -0800)]
Work on issue #
18486438: Reduce size of bugreport output
Don't put packages.xml in to the output.
Change-Id: I88a682866365886506a003a64deb4a29c16ba21c
Greg Hackmann [Fri, 21 Nov 2014 23:12:58 +0000 (23:12 +0000)]
am
236e7906: am
e4c7ec84: Merge "atrace: make fs-specific sysfs entries optional" into lmp-mr1-dev
* commit '
236e790608aa3d60630d3946f54fb9a3ae01b19f':
atrace: make fs-specific sysfs entries optional
Greg Hackmann [Fri, 21 Nov 2014 20:36:08 +0000 (20:36 +0000)]
am
e4c7ec84: Merge "atrace: make fs-specific sysfs entries optional" into lmp-mr1-dev
* commit '
e4c7ec847d83edfb54c215f3ab6093efeb17a586':
atrace: make fs-specific sysfs entries optional
Greg Hackmann [Fri, 21 Nov 2014 20:27:07 +0000 (20:27 +0000)]
Merge "atrace: make fs-specific sysfs entries optional" into lmp-mr1-dev
Mike Lockwood [Fri, 21 Nov 2014 12:19:01 +0000 (12:19 +0000)]
am
8b1a2774: am
754f16fc: Merge "Fix installd command line parser"
* commit '
8b1a27740dc9910ffbdf0df775056b6647fe111c':
Fix installd command line parser
Mike Lockwood [Fri, 21 Nov 2014 05:10:57 +0000 (05:10 +0000)]
am
754f16fc: Merge "Fix installd command line parser"
* commit '
754f16fcf4b56f52450f91e3e840bad8a2cc997c':
Fix installd command line parser
Mike Lockwood [Fri, 21 Nov 2014 05:02:50 +0000 (05:02 +0000)]
Merge "Fix installd command line parser"
Lajos Molnar [Thu, 20 Nov 2014 23:19:33 +0000 (23:19 +0000)]
am
eb0ad057: am
a63caa19: Merge "omx: add (temporary) index for automatic video frc support" into lmp-mr1-dev
* commit '
eb0ad057628f18bf762084b5bbefa81c3a228e3f':
omx: add (temporary) index for automatic video frc support
Fix issue #
18356768: some app process may hang at Runtime#exit...
Dan Albert [Thu, 20 Nov 2014 23:16:22 +0000 (15:16 -0800)]
resolved conflicts for merge of
c1ced8bb to master
Change-Id: I83db00ff986ace8a1c77648738b93124613ddfc0
Elliott Hughes [Thu, 20 Nov 2014 23:09:45 +0000 (23:09 +0000)]
am
8d84b6f9: am
ba4a43c6: Merge "Kill INCLUDE_SYS_MOUNT_FOR_STATFS."
* commit '
8d84b6f9f576fe51b2cb4a54042bf95af923e55b':
Kill INCLUDE_SYS_MOUNT_FOR_STATFS.
Lajos Molnar [Thu, 20 Nov 2014 23:05:47 +0000 (23:05 +0000)]
am
a63caa19: Merge "omx: add (temporary) index for automatic video frc support" into lmp-mr1-dev
* commit '
a63caa1983138e561b2b033c5d178636beeb1578':
omx: add (temporary) index for automatic video frc support
Fix issue #
18356768: some app process may hang at Runtime#exit...
Dan Albert [Thu, 20 Nov 2014 23:00:48 +0000 (23:00 +0000)]
am
c894c204: Merge "C++11 compatibility."
* commit '
c894c2045f589571c80af0648e7a9dcd7e97b6a8':
C++11 compatibility.
Elliott Hughes [Thu, 20 Nov 2014 23:00:26 +0000 (23:00 +0000)]
am
ba4a43c6: Merge "Kill INCLUDE_SYS_MOUNT_FOR_STATFS."
* commit '
ba4a43c6c78547444446181b4fae20a5d61d35ff':
Kill INCLUDE_SYS_MOUNT_FOR_STATFS.
Dan Albert [Thu, 20 Nov 2014 22:06:43 +0000 (22:06 +0000)]
Merge "C++11 compatibility."
Greg Hackmann [Thu, 20 Nov 2014 20:59:44 +0000 (12:59 -0800)]
atrace: make fs-specific sysfs entries optional
The availability of these sysfs entries will vary based on the kernel's
supported filesystems, so don't block the disk category if some of them
are missing.
Bug:
18467498
Change-Id: I96200f1b5cf3f1a8fa8186602552adc96ddffc04
Signed-off-by: Greg Hackmann <ghackmann@google.com>
Dan Albert [Thu, 20 Nov 2014 19:50:23 +0000 (11:50 -0800)]
C++11 compatibility.
* Explicit conversion for atomic_uintptr_t initialization.
* Fix string literal concatenation to not be a UD literal.
* Use __typeof__ instead of typeof (should become decltype once this
actually moves to C++11).
Bug:
18466763
Change-Id: I4eedddfb945a2a703ed27317cb6e2b3041b1ebfc
Elliott Hughes [Thu, 20 Nov 2014 20:58:53 +0000 (20:58 +0000)]
Merge "Kill INCLUDE_SYS_MOUNT_FOR_STATFS."
Elliott Hughes [Thu, 20 Nov 2014 20:54:21 +0000 (12:54 -0800)]
Kill INCLUDE_SYS_MOUNT_FOR_STATFS.
Change-Id: I692179cae9d476dd5a0b5fa92813b61934dd7c87
Narayan Kamath [Thu, 20 Nov 2014 11:08:36 +0000 (11:08 +0000)]
am
1bdade05: resolved conflicts for merge of
fd5a3e06 to lmp-mr1-dev-plus-aosp
* commit '
1bdade057133af3a93c35704b917c2a8e8cd0a9a':
Add an installd command to mark the end of boot.
Narayan Kamath [Thu, 20 Nov 2014 11:04:43 +0000 (11:04 +0000)]
resolved conflicts for merge of
fd5a3e06 to lmp-mr1-dev-plus-aosp
Change-Id: Ib4578fab76fdbb8deda016f065b60dcb172d3ad2
Narayan Kamath [Thu, 20 Nov 2014 10:47:10 +0000 (10:47 +0000)]
Merge "Add an installd command to mark the end of boot."
Lajos Molnar [Thu, 20 Nov 2014 06:44:41 +0000 (06:44 +0000)]
Merge "omx: add (temporary) index for automatic video frc support" into lmp-mr1-dev
Lajos Molnar [Thu, 6 Nov 2014 18:47:41 +0000 (10:47 -0800)]
omx: add (temporary) index for automatic video frc support
Bug:
17383204
Change-Id: I9b22da03ea3f2a7d9dd85042fff442d2414cbc26
Narayan Kamath [Mon, 10 Nov 2014 15:03:46 +0000 (15:03 +0000)]
Add an installd command to mark the end of boot.
bug:
18280671
(cherry picked from commit
b1a6c2f95a455aa2829340fcc8d233493855f4d4)
Change-Id: I97542875ffff1b68ab324e9b04fb9266c82633cc
Dan Stoza [Tue, 18 Nov 2014 20:18:27 +0000 (20:18 +0000)]
am
686c5be4: am
6b9454d1: SurfaceFlinger: Do less work when using PTS
* commit '
686c5be4722dce02ae8e5580d6677f1eeea22464':
SurfaceFlinger: Do less work when using PTS
Dan Stoza [Tue, 18 Nov 2014 02:07:36 +0000 (02:07 +0000)]
am
6b9454d1: SurfaceFlinger: Do less work when using PTS
* commit '
6b9454d1fee0347711af1746642aa7820b1ea04d':
SurfaceFlinger: Do less work when using PTS
Chih-hung Hsieh [Tue, 18 Nov 2014 00:27:52 +0000 (00:27 +0000)]
am
accddd9c: am
947a6adf: Merge "Remove comparisons that can\'t be true"
* commit '
accddd9ca0bef572674b895b9b2b0553b133c793':
Remove comparisons that can't be true
Chih-hung Hsieh [Tue, 18 Nov 2014 00:23:08 +0000 (00:23 +0000)]
am
947a6adf: Merge "Remove comparisons that can\'t be true"
* commit '
947a6adf97d9ba86e3ef5704d523b4971246ff1e':
Remove comparisons that can't be true
Chih-hung Hsieh [Tue, 18 Nov 2014 00:14:44 +0000 (00:14 +0000)]
Merge "Remove comparisons that can't be true"
Chih-hung Hsieh [Mon, 17 Nov 2014 23:07:39 +0000 (23:07 +0000)]
am
22536916: am
1bb53054: Merge "Fix class vs. struct mismatch"
* commit '
22536916a5abd294ed4ccfa5bde9066305c81b48':
Fix class vs. struct mismatch
Chih-hung Hsieh [Mon, 17 Nov 2014 22:58:50 +0000 (22:58 +0000)]
am
1bb53054: Merge "Fix class vs. struct mismatch"
* commit '
1bb53054f2d77ce570a22629006c849fc54707dc':
Fix class vs. struct mismatch
Chih-hung Hsieh [Mon, 17 Nov 2014 21:49:45 +0000 (21:49 +0000)]
Merge "Fix class vs. struct mismatch"
Dan Stoza [Sat, 8 Nov 2014 00:00:59 +0000 (16:00 -0800)]
SurfaceFlinger: Do less work when using PTS
Currently, SurfaceFlinger is very dumb about how it handles buffer
updates at less than 60fps. If there is a new frame pending, but its
timestamp says not to present it until later SurfaceFlinger will wake
up every vsync until it is time to present it. Even worse, if
SurfaceFlinger has woken up but nothing has changed, it still goes
through the entire composition process.
This change (mostly) fixes that inefficiency. SurfaceFlinger will
still wake up every refresh period while there is a new frame
pending, but if there is no work to do, it will almost immediately go
back to sleep.
Bug:
18111837
Change-Id: I7825bacd37f40bf26edcc6a5e0f051dce45291fb
Dianne Hackborn [Mon, 17 Nov 2014 20:26:12 +0000 (20:26 +0000)]
am
519cc65d: am
7d9fdd1e: Merge "Issue #
17551667: Voice interaction service should be disabled..." into lmp-mr1-dev
* commit '
519cc65dd84f04c9078d70fb06c01fb63357ae93':
Issue #
17551667: Voice interaction service should be disabled...
Bernhard Rosenkränzer [Mon, 17 Nov 2014 20:12:15 +0000 (21:12 +0100)]
Fix class vs. struct mismatch
egl_connection_t is a struct - shouldn't be forward-declared as a class
Change-Id: I39f5d9bff9fc64f4694fb2bef7e4afa131b449cc
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
Bernhard Rosenkränzer [Mon, 17 Nov 2014 20:09:14 +0000 (21:09 +0100)]
Remove comparisons that can't be true
keyBitmask and ledBitmask are arrays, "!their address" always evaluates to
false. clang complains about this.
Change-Id: I6aed45a203b0eeaad2093dbdebea03a2c2fc1a3d
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
Dianne Hackborn [Mon, 17 Nov 2014 19:32:03 +0000 (19:32 +0000)]
am
7d9fdd1e: Merge "Issue #
17551667: Voice interaction service should be disabled..." into lmp-mr1-dev
* commit '
7d9fdd1e0d980fb9e67fbb96b4c499b1895109f1':
Issue #
17551667: Voice interaction service should be disabled...
Marco Nelissen [Mon, 17 Nov 2014 19:00:15 +0000 (19:00 +0000)]
am
e12cfc23: am
55f71bc0: Merge "Replace IInterface::asBinder() with a static"
* commit '
e12cfc23b2399ded0cc4608e47c5ba864fc5ab7d':
Replace IInterface::asBinder() with a static
Marco Nelissen [Mon, 17 Nov 2014 18:52:56 +0000 (18:52 +0000)]
am
55f71bc0: Merge "Replace IInterface::asBinder() with a static"
* commit '
55f71bc0800b9ec7a779c5d30d5a90e074c2526b':
Replace IInterface::asBinder() with a static
Dianne Hackborn [Mon, 17 Nov 2014 18:33:20 +0000 (18:33 +0000)]
Merge "Issue #
17551667: Voice interaction service should be disabled..." into lmp-mr1-dev
Marco Nelissen [Mon, 17 Nov 2014 18:14:15 +0000 (18:14 +0000)]
Merge "Replace IInterface::asBinder() with a static"
Marco Nelissen [Fri, 14 Nov 2014 16:01:01 +0000 (08:01 -0800)]
Replace IInterface::asBinder() with a static
so we can do NULL checks again, and update calls to IInterface::asBinder()
to use the new static version.
Change-Id: Ia7b10eb38ca55b72278bfd33d3bf647f338b4e6a
The Android Automerger [Mon, 17 Nov 2014 14:11:58 +0000 (06:11 -0800)]
merge in lmp-mr1-release history after reset to lmp-mr1-dev
Dan Albert [Sun, 16 Nov 2014 17:35:37 +0000 (17:35 +0000)]
am
36ec7a8b: am
d72ff140: Merge "Move frameworks/native to libc++."
* commit '
36ec7a8b99e287d923bfacd2ef69661818aeb85e':
Move frameworks/native to libc++.
Dan Albert [Sun, 16 Nov 2014 17:31:57 +0000 (17:31 +0000)]
am
d72ff140: Merge "Move frameworks/native to libc++."
* commit '
d72ff140e0df44106cd8539396ce686aa8f3306a':
Move frameworks/native to libc++.
Dan Albert [Sun, 16 Nov 2014 17:23:12 +0000 (17:23 +0000)]
Merge "Move frameworks/native to libc++."
Dan Albert [Sun, 16 Nov 2014 02:18:17 +0000 (18:18 -0800)]
Move frameworks/native to libc++.
I'm pretty sure I had done this before... Must have been new
dependencies that slipped in when L merged in.
Bug:
15193147
Change-Id: Ib9b1b8a65665d25c33c6141b9476a8e13c4084e0
Yin-Chia Yeh [Sat, 15 Nov 2014 16:00:58 +0000 (16:00 +0000)]
am
3fd6b2b9: am
3a1c6dac: Merge "Add XML files for new camera2 hardware features" into lmp-mr1-dev
* commit '
3fd6b2b912037a7cca8d2591dfa8f9a83d0e46e7':
Add XML files for new camera2 hardware features
Yin-Chia Yeh [Sat, 15 Nov 2014 15:46:07 +0000 (15:46 +0000)]
am
3a1c6dac: Merge "Add XML files for new camera2 hardware features" into lmp-mr1-dev
* commit '
3a1c6dacecb328a38ae26c513246eab7a84219f2':
Add XML files for new camera2 hardware features
Dianne Hackborn [Fri, 14 Nov 2014 23:45:13 +0000 (15:45 -0800)]
Issue #
17551667: Voice interaction service should be disabled...
...by default on Svelte devices
Make the voice interaction feature not available on svelte devices.
Change-Id: Iae16ff59873e6588d2aaa29624006261439262ef
Marco Nelissen [Fri, 14 Nov 2014 16:01:01 +0000 (08:01 -0800)]
Replace IInterface::asBinder() with a static
so we can do NULL checks again, and update calls to IInterface::asBinder()
to use the new static version.
Change-Id: Ia7b10eb38ca55b72278bfd33d3bf647f338b4e6a
Narayan Kamath [Fri, 14 Nov 2014 19:19:40 +0000 (19:19 +0000)]
Lajos Molnar [Fri, 14 Nov 2014 19:19:32 +0000 (19:19 +0000)]
am
c931ca1e: am
1d5d637d: Merge "implement asString() for OMX enumerations used by framework" into lmp-mr1-dev
* commit '
c931ca1eec00218e70c039e965c8152daa1f4d0a':
implement asString() for OMX enumerations used by framework
Dianne Hackborn [Fri, 14 Nov 2014 19:18:26 +0000 (19:18 +0000)]
am
1f3ac8b4: am
a4cff88d: Fix issue #
18356768: some app process may hang at Runtime#exit...
* commit '
1f3ac8b42ff784930d8194b75d33aef1098a8231':
Fix issue #
18356768: some app process may hang at Runtime#exit...
Ian Rogers [Fri, 14 Nov 2014 19:18:05 +0000 (19:18 +0000)]
am
35e5423d: am
11bf9e5c: Merge "Add support for dalvik.vm.isa.<instruction set>.variant"
* commit '
35e5423d4df88e8a0d0b4a7d4ca723e43a3bf35c':
Add support for dalvik.vm.isa.<instruction set>.variant
Yabin Cui [Fri, 14 Nov 2014 19:15:44 +0000 (19:15 +0000)]
am
007335e6: am
bc49cd07: Merge "kill HAVE_FORKEXEC"
* commit '
007335e68843a1128b704760a1decf89a124f468':
kill HAVE_FORKEXEC
Andreas Gampe [Fri, 14 Nov 2014 19:15:35 +0000 (19:15 +0000)]
am
d09cf8f1: am
9c17fb19: Merge "Frameworks/native: Wall Werror in batteryservice & powermanager"
* commit '
d09cf8f10f78ef3db2ab4824dc8374360dc7a860':
Frameworks/native: Wall Werror in batteryservice & powermanager
Dan Albert [Fri, 14 Nov 2014 19:09:30 +0000 (11:09 -0800)]
resolved conflicts for merge of
4037c458 to master
Change-Id: I8a2e73b7ba48b790054e0ab99f81b2693244389e
Yin-Chia Yeh [Fri, 14 Nov 2014 18:56:00 +0000 (18:56 +0000)]
Merge "Add XML files for new camera2 hardware features" into lmp-mr1-dev
Narayan Kamath [Fri, 14 Nov 2014 10:42:55 +0000 (10:42 +0000)]
Narayan Kamath [Fri, 14 Nov 2014 10:23:48 +0000 (10:23 +0000)]
Fix build.
Remove reference to undefined open max index extension.
Change-Id: I984b91afad3ca4d279a31048b4112fa9afdba9e9
Lajos Molnar [Fri, 14 Nov 2014 10:10:15 +0000 (10:10 +0000)]
am
1d5d637d: Merge "implement asString() for OMX enumerations used by framework" into lmp-mr1-dev
* commit '
1d5d637d6e68bd4965bf0ff9df7b99bc146172f3':
implement asString() for OMX enumerations used by framework
Lajos Molnar [Fri, 14 Nov 2014 10:02:21 +0000 (10:02 +0000)]
Merge "implement asString() for OMX enumerations used by framework" into lmp-mr1-dev
Dianne Hackborn [Fri, 14 Nov 2014 01:07:40 +0000 (17:07 -0800)]
Fix issue #
18356768: some app process may hang at Runtime#exit...
...in Parcel destructor
Don't use a Mutux object, just use simple posix mutex primitives,
to avoid static init/destroy order problems.
Change-Id: Ic012d94297564c0a55d58869f8276d7d10545fbc
Dianne Hackborn [Fri, 14 Nov 2014 01:43:31 +0000 (01:43 +0000)]
am
a4cff88d: Fix issue #
18356768: some app process may hang at Runtime#exit...
* commit '
a4cff88d80bf1acbdbd063af88ecad83a8b9b7b4':
Fix issue #
18356768: some app process may hang at Runtime#exit...
Dianne Hackborn [Fri, 14 Nov 2014 01:07:40 +0000 (17:07 -0800)]
Fix issue #
18356768: some app process may hang at Runtime#exit...
...in Parcel destructor
Don't use a Mutux object, just use simple posix mutex primitives,
to avoid static init/destroy order problems.
Change-Id: Ic012d94297564c0a55d58869f8276d7d10545fbc
Ian Rogers [Fri, 14 Nov 2014 00:30:33 +0000 (00:30 +0000)]
am
11bf9e5c: Merge "Add support for dalvik.vm.isa.<instruction set>.variant"
* commit '
11bf9e5c2f90101d56d918e1b3fe780b873e5566':
Add support for dalvik.vm.isa.<instruction set>.variant
Ian Rogers [Fri, 14 Nov 2014 00:20:51 +0000 (00:20 +0000)]
Merge "Add support for dalvik.vm.isa.<instruction set>.variant"
Yabin Cui [Thu, 13 Nov 2014 23:35:25 +0000 (23:35 +0000)]
am
bc49cd07: Merge "kill HAVE_FORKEXEC"
* commit '
bc49cd07664d8a590bc6ed44884ba9405f6b706e':
kill HAVE_FORKEXEC
Yabin Cui [Thu, 13 Nov 2014 23:22:26 +0000 (23:22 +0000)]
Merge "kill HAVE_FORKEXEC"
Andreas Gampe [Thu, 13 Nov 2014 23:19:37 +0000 (23:19 +0000)]
am
9c17fb19: Merge "Frameworks/native: Wall Werror in batteryservice & powermanager"
* commit '
9c17fb191253e9bdc9fc73ba9ff2d590892e5061':
Frameworks/native: Wall Werror in batteryservice & powermanager
Andreas Gampe [Thu, 13 Nov 2014 22:59:49 +0000 (14:59 -0800)]
resolved conflicts for merge of
07dffa18 to lmp-mr1-dev-plus-aosp
Change-Id: I42d8bc291f4f48f3098754b076889159c4b20e41
Andreas Gampe [Thu, 13 Nov 2014 22:55:41 +0000 (22:55 +0000)]
Merge "Frameworks/native: Wall Werror in batteryservice & powermanager"
Andreas Gampe [Thu, 13 Nov 2014 22:33:47 +0000 (22:33 +0000)]
Merge "Frameworks/native: Wall Werror in surfaceflinger"
Andreas Gampe [Thu, 13 Nov 2014 22:31:11 +0000 (14:31 -0800)]
Frameworks/native: Wall Werror in batteryservice & powermanager
Turn on -Wall -Werror in services/batteryservice and services/powermanager.
Fix warnings.
Change-Id: I1da667083013379cd8240377c48d63fa5c53033d
Andreas Gampe [Thu, 13 Nov 2014 22:18:56 +0000 (14:18 -0800)]
Frameworks/native: Wall Werror in surfaceflinger
Turn on -Wall -Werror in services/surfaceflinger. Fix warnings.
Change-Id: Ifef830300d9d4bc657d8f1257c02bfe8c2b4d9c5
Yin-Chia Yeh [Thu, 13 Nov 2014 18:08:20 +0000 (10:08 -0800)]
Add XML files for new camera2 hardware features
Bug:
18276863
Change-Id: I65fa70e5ee2e9b90f819ca39f933279905b37f38
Yabin Cui [Tue, 11 Nov 2014 17:26:00 +0000 (09:26 -0800)]
kill HAVE_FORKEXEC
Bug:
18317407
Change-Id: I0c7b5886e5de12bdd95cfcc046bc87e4a6aeef5b
Dan Stoza [Wed, 12 Nov 2014 20:14:29 +0000 (20:14 +0000)]
Merge "Enable clang for libui/libgui/surfaceflinger"
Andreas Gampe [Wed, 12 Nov 2014 19:12:59 +0000 (19:12 +0000)]
am
c5657b0c: am
fecc0bf4: Merge "Frameworks/native: Add pragmas to glgen headers"
* commit '
c5657b0c344b39d794c4c8241004d4e19341c096':
Frameworks/native: Add pragmas to glgen headers
Andreas Gampe [Wed, 12 Nov 2014 18:40:21 +0000 (18:40 +0000)]
am
fecc0bf4: Merge "Frameworks/native: Add pragmas to glgen headers"
* commit '
fecc0bf4f1d8d1939807123d0f01ca1fe377bda4':
Frameworks/native: Add pragmas to glgen headers
OSDN Git Service
