Dan Albert
3bdc5b8268
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
2014-11-20 21:04:35 +00:00
Elliott Hughes
ba4a43c6c7
Merge "Kill INCLUDE_SYS_MOUNT_FOR_STATFS."
2014-11-20 20:58:53 +00:00
Elliott Hughes
9a4e7f492e
Kill INCLUDE_SYS_MOUNT_FOR_STATFS.
...
Change-Id: I692179cae9d476dd5a0b5fa92813b61934dd7c87
2014-11-20 12:54:21 -08:00
Narayan Kamath
9f2c74354a
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.
2014-11-20 11:08:36 +00:00
Narayan Kamath
1bdade0571
resolved conflicts for merge of fd5a3e06
to lmp-mr1-dev-plus-aosp
...
Change-Id: Ib4578fab76fdbb8deda016f065b60dcb172d3ad2
2014-11-20 11:04:43 +00:00
Narayan Kamath
fd5a3e06c2
Merge "Add an installd command to mark the end of boot."
2014-11-20 10:47:11 +00:00
Lajos Molnar
a63caa1983
Merge "omx: add (temporary) index for automatic video frc support" into lmp-mr1-dev
2014-11-20 06:44:42 +00:00
Lajos Molnar
76d4c5cf73
omx: add (temporary) index for automatic video frc support
...
Bug: 17383204
Change-Id: I9b22da03ea3f2a7d9dd85042fff442d2414cbc26
2014-11-19 16:09:49 -08:00
Narayan Kamath
091ea779d4
Add an installd command to mark the end of boot.
...
bug: 18280671
(cherry picked from commit b1a6c2f95a
)
Change-Id: I97542875ffff1b68ab324e9b04fb9266c82633cc
2014-11-19 14:43:05 +00:00
Dan Stoza
e8e23c8b79
am 686c5be4
: am 6b9454d1
: SurfaceFlinger: Do less work when using PTS
...
* commit '686c5be4722dce02ae8e5580d6677f1eeea22464':
SurfaceFlinger: Do less work when using PTS
2014-11-18 20:18:27 +00:00
Dan Stoza
686c5be472
am 6b9454d1
: SurfaceFlinger: Do less work when using PTS
...
* commit '6b9454d1fee0347711af1746642aa7820b1ea04d':
SurfaceFlinger: Do less work when using PTS
2014-11-18 02:07:36 +00:00
Chih-hung Hsieh
ebcc45df77
am accddd9c
: am 947a6adf
: Merge "Remove comparisons that can\'t be true"
...
* commit 'accddd9ca0bef572674b895b9b2b0553b133c793':
Remove comparisons that can't be true
2014-11-18 00:27:52 +00:00
Chih-hung Hsieh
accddd9ca0
am 947a6adf
: Merge "Remove comparisons that can\'t be true"
...
* commit '947a6adf97d9ba86e3ef5704d523b4971246ff1e':
Remove comparisons that can't be true
2014-11-18 00:23:08 +00:00
Chih-hung Hsieh
947a6adf97
Merge "Remove comparisons that can't be true"
2014-11-18 00:14:45 +00:00
Chih-hung Hsieh
765f12c7de
am 22536916
: am 1bb53054
: Merge "Fix class vs. struct mismatch"
...
* commit '22536916a5abd294ed4ccfa5bde9066305c81b48':
Fix class vs. struct mismatch
2014-11-17 23:07:39 +00:00
Chih-hung Hsieh
22536916a5
am 1bb53054
: Merge "Fix class vs. struct mismatch"
...
* commit '1bb53054f2d77ce570a22629006c849fc54707dc':
Fix class vs. struct mismatch
2014-11-17 22:58:50 +00:00
Chih-hung Hsieh
1bb53054f2
Merge "Fix class vs. struct mismatch"
2014-11-17 21:49:45 +00:00
Dan Stoza
6b9454d1fe
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
2014-11-17 21:32:13 +00:00
Dianne Hackborn
97e61fcf88
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...
2014-11-17 20:26:12 +00:00
Bernhard Rosenkränzer
9f425914db
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>
2014-11-17 21:12:15 +01:00
Bernhard Rosenkränzer
6183eb72ec
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>
2014-11-17 21:09:14 +01:00
Dianne Hackborn
519cc65dd8
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...
2014-11-17 19:32:03 +00:00
Marco Nelissen
e792f8b874
am e12cfc23
: am 55f71bc0
: Merge "Replace IInterface::asBinder() with a static"
...
* commit 'e12cfc23b2399ded0cc4608e47c5ba864fc5ab7d':
Replace IInterface::asBinder() with a static
2014-11-17 19:00:15 +00:00
Marco Nelissen
e12cfc23b2
am 55f71bc0
: Merge "Replace IInterface::asBinder() with a static"
...
* commit '55f71bc0800b9ec7a779c5d30d5a90e074c2526b':
Replace IInterface::asBinder() with a static
2014-11-17 18:52:56 +00:00
Dianne Hackborn
7d9fdd1e0d
Merge "Issue #17551667 : Voice interaction service should be disabled..." into lmp-mr1-dev
2014-11-17 18:33:21 +00:00
Marco Nelissen
55f71bc080
Merge "Replace IInterface::asBinder() with a static"
2014-11-17 18:14:16 +00:00
Marco Nelissen
097ca275f4
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
2014-11-17 08:47:01 -08:00
The Android Automerger
b0d03baf32
merge in lmp-mr1-release history after reset to lmp-mr1-dev
2014-11-17 06:11:58 -08:00
Dan Albert
06235085c6
am 36ec7a8b
: am d72ff140
: Merge "Move frameworks/native to libc++."
...
* commit '36ec7a8b99e287d923bfacd2ef69661818aeb85e':
Move frameworks/native to libc++.
2014-11-16 17:35:37 +00:00
Dan Albert
36ec7a8b99
am d72ff140
: Merge "Move frameworks/native to libc++."
...
* commit 'd72ff140e0df44106cd8539396ce686aa8f3306a':
Move frameworks/native to libc++.
2014-11-16 17:31:57 +00:00
Dan Albert
d72ff140e0
Merge "Move frameworks/native to libc++."
2014-11-16 17:23:12 +00:00
Dan Albert
6d72063cfd
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
2014-11-15 18:22:55 -08:00
Yin-Chia Yeh
df6ca6a42a
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
2014-11-15 16:00:58 +00:00
Yin-Chia Yeh
3fd6b2b912
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
2014-11-15 15:46:07 +00:00
Dianne Hackborn
71f6dd7fb4
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
2014-11-14 15:45:13 -08:00
Marco Nelissen
2ea926bda2
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
2014-11-14 14:01:29 -08:00
Narayan Kamath
aedb1c843e
am 5d07648b
: am 26653bad
: Fix build.
...
* commit '5d07648b367319b2da322acc58e3e6157bf912f2':
Fix build.
2014-11-14 19:19:40 +00:00
Lajos Molnar
cc7432254e
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
2014-11-14 19:19:32 +00:00
Dianne Hackborn
abd62d66ef
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...
2014-11-14 19:18:26 +00:00
Ian Rogers
460643fc73
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
2014-11-14 19:18:05 +00:00
Yabin Cui
45b48fe808
am 007335e6
: am bc49cd07
: Merge "kill HAVE_FORKEXEC"
...
* commit '007335e68843a1128b704760a1decf89a124f468':
kill HAVE_FORKEXEC
2014-11-14 19:15:44 +00:00
Andreas Gampe
a20acf6d50
am d09cf8f1
: am 9c17fb19
: Merge "Frameworks/native: Wall Werror in batteryservice & powermanager"
...
* commit 'd09cf8f10f78ef3db2ab4824dc8374360dc7a860':
Frameworks/native: Wall Werror in batteryservice & powermanager
2014-11-14 19:15:35 +00:00
Dan Albert
41a0ef3e28
resolved conflicts for merge of 4037c458
to master
...
Change-Id: I8a2e73b7ba48b790054e0ab99f81b2693244389e
2014-11-14 11:13:20 -08:00
Yin-Chia Yeh
3a1c6dacec
Merge "Add XML files for new camera2 hardware features" into lmp-mr1-dev
2014-11-14 18:56:01 +00:00
Narayan Kamath
5d07648b36
am 26653bad
: Fix build.
...
* commit '26653bad7cdaa09470828781c5a2bab7c4d2445f':
Fix build.
2014-11-14 10:42:55 +00:00
Narayan Kamath
26653bad7c
Fix build.
...
Remove reference to undefined open max index extension.
Change-Id: I984b91afad3ca4d279a31048b4112fa9afdba9e9
2014-11-14 10:24:28 +00:00
Lajos Molnar
c931ca1eec
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
2014-11-14 10:10:15 +00:00
Lajos Molnar
1d5d637d6e
Merge "implement asString() for OMX enumerations used by framework" into lmp-mr1-dev
2014-11-14 10:02:22 +00:00
Dianne Hackborn
88fc1b0ef4
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
2014-11-13 17:55:18 -08:00
Dianne Hackborn
1f3ac8b42f
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...
2014-11-14 01:43:31 +00:00