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
26653bad7c
Fix build.
...
Remove reference to undefined open max index extension.
Change-Id: I984b91afad3ca4d279a31048b4112fa9afdba9e9
2014-11-14 10:24:28 +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
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
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
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
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
Craig Mautner
83cbc5a758
Merge "Stop consuming input on error dialogs." into lmp-mr1-dev
2014-11-12 00:16:07 +00:00
Craig Mautner
0c17a2b2ea
Stop consuming input on error dialogs.
...
This code is no longer necessary and was preventing input from
reaching their desired windows. See bug 17648830.
Change-Id: Ib1c026ece70e6fa98343340b89af4199d6d0ffca
2014-11-11 14:05:03 -08:00
Narayan Kamath
37878b1e57
Merge "Add an installd command to mark the end of boot." into lmp-mr1-dev
2014-11-11 16:12:59 +00:00
Narayan Kamath
b1a6c2f95a
Add an installd command to mark the end of boot.
...
bug: 18280671
Change-Id: I6b3aeaf143ab3b78881f163ec5c17b9bf20172ed
2014-11-10 17:04:12 +00:00
The Android Automerger
1e7441e64f
merge in lmp-mr1-release history after reset to lmp-mr1-dev
2014-11-10 06:10:56 -08:00
The Android Automerger
d30c112e01
merge in lmp-mr1-release history after reset to lmp-mr1-dev
2014-11-09 08:05:02 -08:00
Andreas Gampe
bfd633e131
Frameworks/native: Fix unused parameter warning
...
Pulled in in hardware/, where -Werror is used.
Change-Id: I13fc31d31fe2f623d39c84862b0c95a28813723d
(cherry picked from commit a32900deec
)
2014-11-08 22:18:47 +00:00
The Android Automerger
3ff2d3b27c
merge in lmp-mr1-release history after reset to a26143546e
2014-11-08 06:12:55 -08:00
Aravind Akella
a26143546e
Merge "Add a timeout for releasing SensorService wake_lock." into lmp-mr1-dev
2014-11-07 21:47:49 +00:00
Dan Stoza
98d20f82ca
Merge "Add a BufferItem parameter to onFrameAvailable" into lmp-mr1-dev
2014-11-07 19:44:31 +00:00
Dan Stoza
8dc55396fc
Add a BufferItem parameter to onFrameAvailable
...
Passes the BufferItem for the queued buffer to the onFrameAvailable
callback so the consumer can track the BufferQueue's contents. Also
adds an onFrameReplaced callback, which is necessary if the consumer
wants to do anything more than simple queue length tracking.
Bug: 18111837
Change-Id: If9d07229c9b586c668e5f99074e9b63b0468feb0
2014-11-07 10:39:13 -08:00
The Android Automerger
06e899a83c
merge in lmp-mr1-release history after reset to 106e582053
2014-11-06 06:13:44 -08:00
Igor Murashkin
106e582053
Merge "installd: Set priority to background for dexopting" into lmp-mr1-dev
2014-11-06 02:43:56 +00:00
Jeff Tinker
621c6f3b13
Merge "Add missing secure stop methods" into lmp-mr1-dev
2014-11-06 02:33:31 +00:00
Igor Murashkin
9e87a80140
installd: Set priority to background for dexopting
...
This fixes jank caused by dex2oat while installing an application in the
background.
Bug: 17497551
Change-Id: I5a69b00c0fd76ae22a0d1adb242bef6c18a75743
2014-11-05 15:21:12 -08:00
Michael Lentine
2664529840
Merge "Fix for corruption when numFds or numInts is too large." into lmp-mr1-dev
2014-11-05 18:58:22 +00:00
The Android Automerger
fb4dbc40d1
merge in lmp-mr1-release history after reset to 9cea6ccbd8
2014-11-05 06:13:00 -08:00
Mark Salyzyn
9cea6ccbd8
dumpstate: report device uptime mmc performance
...
Bug: 18085992
Change-Id: Ibc0a37d3d2649d1e6708d9357f37ed75f2cea121
2014-11-04 09:39:27 -08:00
Jesse Hall
fee99040de
Revert "Add more logging for dup(fd) failure"
...
Underlying bug has been fixed, extra debug code no longer needed
This reverts commit 36273c991b
.
Change-Id: Ia47f1ae9ee7338329bfb8d710aff57e15e944f20
2014-11-04 08:48:16 -08:00
Jesse Hall
8e5cf83afb
Revert "Parcel: extra validation/debug code for writeDupFileDescriptor"
...
Underlying bug has been fixed, extra debug code no longer needed.
This reverts commit ccf851f108
.
Change-Id: I19ad9239efdf1d8f70cd74af9b7c2ae97713208f
2014-11-04 08:47:57 -08:00
Jesse Hall
de288fe2d4
Revert "bufferqueue: workaround: allow NULL fence with queueBuffer"
...
Underlying bug has been fixed, workaround no longer needed
This reverts commit 5b0cbcf946
.
Change-Id: Ic9532b407d1291a7780a12a75aaa117ae4aa9fcb
2014-11-04 08:47:37 -08:00
The Android Automerger
e1db16b05f
merge in lmp-mr1-release history after reset to 7aa0c47e42
2014-11-04 06:12:31 -08:00
Michael Lentine
dfd06b89a4
Fix for corruption when numFds or numInts is too large.
...
Bug: 18076253
Change-Id: I4c5935440013fc755e1d123049290383f4659fb6
2014-11-03 14:08:54 -08:00
Naseer Ahmed
7aa0c47e42
sf: Add a NULL check in getDisplayConfigs
...
Validate the display binder by adding a NULL check in getDisplayConfigs.
This will prevent a false match if the caller queries the display
configs for an inactive display (whose binder is NULL by default).
Without this change we might end up attempting to index the display
config array, which is unpopulated for inactive displays, and this will
result in a crash. (See getDisplayInfo in SurfaceComposerClient.cpp for
an example of this scenario)
Change-Id: I1a12f43b7c375b9c01998dadd5b658275c733fb2
Acked-by: Tatenda Chipeperekwa <tatendac@codeaurora.org>
2014-11-03 12:16:18 -08:00
The Android Automerger
1ece08100d
merge in lmp-mr1-release history after reset to 793fc0e13d
2014-11-03 06:11:11 -08:00
The Android Automerger
9bb99b2f23
merge in lmp-mr1-release history after reset to 793fc0e13d
2014-11-02 06:10:50 -08:00
Aravind Akella
b4373ac9f5
Add a timeout for releasing SensorService wake_lock.
...
If SensorService is holding a wake_lock and there are no acknowledgements
from ANY app within 5 seconds, release the wake_lock and reset the wake_lock
refcounts for all connections.
Bug: 16874240
Change-Id: I5e950dd393c20173c439cbd5a4ba614ee09d61f4
2014-11-01 18:19:25 -07:00
The Android Automerger
ff6e40f889
merge in lmp-mr1-release history after reset to 793fc0e13d
2014-11-01 06:11:11 -07:00
Michael Lentine
793fc0e13d
Merge "Fix crash when user provides large values in the Parcel." into lmp-mr1-dev
2014-10-31 23:37:47 +00:00
Michael Lentine
8afa1c4ab8
Fix crash when user provides large values in the Parcel.
...
Bug: 18102648
Change-Id: Ie6a24718e586a34424238363de80f9545951514f
2014-10-31 16:08:44 -07:00
Michael Lentine
9853685931
Merge "Fix output of pointers for 64bit devices." into lmp-mr1-dev
2014-10-31 18:39:23 +00:00
Michael Lentine
fae12d4fb4
Fix output of pointers for 64bit devices.
...
Change-Id: I279c1cf8d4c126b98f4a92ca807ade3749d01ff0
2014-10-31 11:08:19 -07:00
Jesse Hall
affc4d809e
Merge "surfaceflinger: fix -Wunused-parameter warning" into lmp-mr1-dev
2014-10-31 16:59:45 +00:00
Jesse Hall
c7636f6062
Merge "surfaceflinger: fix -Wsign-compare warnings" into lmp-mr1-dev
2014-10-31 16:59:26 +00:00
Jesse Hall
6e74e3ccd9
Merge "surfaceflinger: fix -Woverloaded-virtual warning" into lmp-mr1-dev
2014-10-31 16:59:11 +00:00
Jesse Hall
04c9683aa1
Merge "surfaceflinger: fix -Wmismatched-tags warnings" into lmp-mr1-dev
2014-10-31 16:58:45 +00:00
Jesse Hall
7cd85979e8
surfaceflinger: fix -Wunused-parameter warning
...
warning: unused parameter 'mustRecompose' [-Wunused-parameter]
Change-Id: I6b8c671189639d851bfa5548742de988d6fa2687
(cherry picked from d2e514f717
)
2014-10-31 09:52:42 -07:00
Jesse Hall
7844211607
surfaceflinger: fix -Wsign-compare warnings
...
warning: comparison of integers of different signs: 'int' and 'size_t'
(aka 'unsigned int') [-Wsign-compare]
arning: comparison of integers of different signs: 'int32_t' (aka
'int') and 'const uint32_t' (aka 'const unsigned int')
[-Wsign-compare]
Change-Id: I823257aa7218c5fd492a3277853210db539bb2e2
(cherry picked from f9bfdc6c94
)
2014-10-31 09:52:23 -07:00
Jesse Hall
9b901805ed
surfaceflinger: fix -Woverloaded-virtual warning
...
warning: 'android::LayerDim::isOpaque' hides overloaded virtual function
[-Woverloaded-virtual]
Change-Id: Ie27a6c943f485bc89ce11e424a4e7d99805d4dd0
(cherry picked from commit 382574d116
)
2014-10-31 09:52:08 -07:00