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
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
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
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
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
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
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
Dianne Hackborn
a4cff88d80
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:09:59 -08:00
Ian Rogers
35e5423d4d
am 11bf9e5c
: Merge "Add support for dalvik.vm.isa.<instruction set>.variant"
...
* commit '11bf9e5c2f90101d56d918e1b3fe780b873e5566':
Add support for dalvik.vm.isa.<instruction set>.variant
2014-11-14 00:30:33 +00:00
Ian Rogers
11bf9e5c2f
Merge "Add support for dalvik.vm.isa.<instruction set>.variant"
2014-11-14 00:20:52 +00:00
Yabin Cui
007335e688
am bc49cd07
: Merge "kill HAVE_FORKEXEC"
...
* commit 'bc49cd07664d8a590bc6ed44884ba9405f6b706e':
kill HAVE_FORKEXEC
2014-11-13 23:35:25 +00:00
Yabin Cui
bc49cd0766
Merge "kill HAVE_FORKEXEC"
2014-11-13 23:22:27 +00:00
Andreas Gampe
d09cf8f10f
am 9c17fb19
: Merge "Frameworks/native: Wall Werror in batteryservice & powermanager"
...
* commit '9c17fb191253e9bdc9fc73ba9ff2d590892e5061':
Frameworks/native: Wall Werror in batteryservice & powermanager
2014-11-13 23:19:37 +00:00
Andreas Gampe
4037c458a7
resolved conflicts for merge of 07dffa18
to lmp-mr1-dev-plus-aosp
...
Change-Id: I42d8bc291f4f48f3098754b076889159c4b20e41
2014-11-13 15:16:53 -08:00
Andreas Gampe
9c17fb1912
Merge "Frameworks/native: Wall Werror in batteryservice & powermanager"
2014-11-13 22:55:42 +00:00
Andreas Gampe
07dffa184f
Merge "Frameworks/native: Wall Werror in surfaceflinger"
2014-11-13 22:33:47 +00:00
Andreas Gampe
347f2884db
Frameworks/native: Wall Werror in batteryservice & powermanager
...
Turn on -Wall -Werror in services/batteryservice and services/powermanager.
Fix warnings.
Change-Id: I1da667083013379cd8240377c48d63fa5c53033d
2014-11-13 14:31:11 -08:00
Andreas Gampe
89fd4f7fa6
Frameworks/native: Wall Werror in surfaceflinger
...
Turn on -Wall -Werror in services/surfaceflinger. Fix warnings.
Change-Id: Ifef830300d9d4bc657d8f1257c02bfe8c2b4d9c5
2014-11-13 14:18:56 -08:00
Yin-Chia Yeh
431784accf
Add XML files for new camera2 hardware features
...
Bug: 18276863
Change-Id: I65fa70e5ee2e9b90f819ca39f933279905b37f38
2014-11-13 10:08:20 -08:00
Yabin Cui
0dd549aae0
kill HAVE_FORKEXEC
...
Bug: 18317407
Change-Id: I0c7b5886e5de12bdd95cfcc046bc87e4a6aeef5b
2014-11-12 17:10:40 -08:00
Andreas Gampe
c5657b0c34
am fecc0bf4
: Merge "Frameworks/native: Add pragmas to glgen headers"
...
* commit 'fecc0bf4f1d8d1939807123d0f01ca1fe377bda4':
Frameworks/native: Add pragmas to glgen headers
2014-11-12 18:40:21 +00:00
Andreas Gampe
fecc0bf4f1
Merge "Frameworks/native: Add pragmas to glgen headers"
2014-11-12 18:30:40 +00:00
Andreas Gampe
b5da0d78d2
Frameworks/native: Add pragmas to glgen headers
...
The code currently being generated by glgen is not the cleanest, but
we would like to get core/jni onto -Werror. Thus add pragmas turning
off warnings locally to the C headers.
Also fix signed-comparison in two functions.
Longer term TODO: Emit clean code.
Change-Id: Iee8582f8c0c1de076d64851d3b6ca467afd5bc43
2014-11-12 10:10:12 -08:00
Jesse Hall
3b93c2b9d0
am 7b3fd290
: Merge "EGL: make x86/64 wrappers resistant to -fno-omit-frame-pointer flag"
...
* commit '7b3fd29037bc12c2691e06334bf51171853aa8f3':
EGL: make x86/64 wrappers resistant to -fno-omit-frame-pointer flag
2014-11-12 17:31:03 +00:00
Jesse Hall
7b3fd29037
Merge "EGL: make x86/64 wrappers resistant to -fno-omit-frame-pointer flag"
2014-11-12 17:21:27 +00:00
Lajos Molnar
a1ae5a4fe5
implement asString() for OMX enumerations used by framework
...
Bug: 18285408
Change-Id: I7893cbf0b13514e0fe9001c90db3c8387c1920c0
2014-11-12 09:09:42 -08:00
The Android Automerger
2203e0e5fa
merge in lmp-mr1-release history after reset to lmp-mr1-dev
2014-11-12 06:11:22 -08:00
Michal Wajdeczko
701048cbe8
EGL: make x86/64 wrappers resistant to -fno-omit-frame-pointer flag
...
Wrapper functions were broken on builds that forced -fno-omit-frame-pointer flag.
Change-Id: I5a80f9587fb3db821b4156af56acda59a0b4579b
Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
Signed-off-by: Yong Yao <yong.yao@intel.com>
2014-11-12 06:33:24 +00:00
Dianne Hackborn
ba2e1a332e
am ca69e8f2
: Merge "Add tracking of parcel memory allocations." into lmp-mr1-dev
...
* commit 'ca69e8f2d0a1fc963bd170f9b2bf164028761323':
Add tracking of parcel memory allocations.
2014-11-12 03:51:05 +00:00
Craig Mautner
66af95fa17
am 83cbc5a7
: Merge "Stop consuming input on error dialogs." into lmp-mr1-dev
...
* commit '83cbc5a7588793435fd986e220fe1f9b88342069':
Stop consuming input on error dialogs.
2014-11-12 03:51:04 +00:00
Dianne Hackborn
ca69e8f2d0
Merge "Add tracking of parcel memory allocations." into lmp-mr1-dev
2014-11-12 00:24:29 +00:00
Dianne Hackborn
7e790af756
Add tracking of parcel memory allocations.
...
Change-Id: I76ffed0e69ccfe70e87d98646f11d4de7c3fd980
2014-11-11 16:23:04 -08:00