Christopher Ferris
06ad7bf518
am 7dc7f322
: Add dumping of tombstones to dumpstate.
...
* commit '7dc7f3221f26b771c266a26ec785eb74287922f1':
Add dumping of tombstones to dumpstate.
2014-07-24 19:48:11 +00:00
Christopher Ferris
7dc7f3221f
Add dumping of tombstones to dumpstate.
...
Dump only those tombstones modified within the last half an hour.
Change-Id: I8ce836b2e19eba7a9c0c31a4f312f9a382526da7
2014-07-23 19:18:07 -07:00
Christopher Ferris
672e3a51bd
resolved conflicts for merge of e8878921
to lmp-dev-plus-aosp
...
Change-Id: I930dda54336a3f6d694cec06299f09e3580671a0
2014-07-23 18:03:00 -07:00
Chong Zhang
27981c1aa6
am 2cbba477
: add noteResetVideo/Audio to IBatteryStats
...
* commit '2cbba477bea136698944ece498115dbddd7bb659':
add noteResetVideo/Audio to IBatteryStats
2014-07-23 22:04:39 +00:00
Chong Zhang
2cbba477be
add noteResetVideo/Audio to IBatteryStats
...
Bug: 12979595
Change-Id: Ida474e539a3af0a85ec157a66bbf986430c8020e
2014-07-23 21:51:56 +00:00
Colin Cross
fb3c1a11e9
am 45e695a2
: Merge "crash if getNativeBuffer() called on NULL GraphicBuffer" into lmp-dev
...
* commit '45e695a248ab9548c1e8ab976572f7a978ecd64b':
crash if getNativeBuffer() called on NULL GraphicBuffer
2014-07-23 20:05:26 +00:00
Ying Wang
f65eb9bffd
am e9105be3
: Merge "Install symlinks in multilib build."
...
* commit 'e9105be32f6856dcb4fa67bd9f9a4fa91bff9b97':
Install symlinks in multilib build.
2014-07-23 19:25:18 +00:00
Christopher Ferris
e8878921db
Merge "Add dumping of tombstones to dumpstate."
2014-07-23 18:56:15 +00:00
Christopher Ferris
1fe6107b66
Add dumping of tombstones to dumpstate.
...
Dump only those tombstones modified within the last half an hour.
Change-Id: I8ce836b2e19eba7a9c0c31a4f312f9a382526da7
2014-07-23 16:33:01 -07:00
Colin Cross
45e695a248
Merge "crash if getNativeBuffer() called on NULL GraphicBuffer" into lmp-dev
2014-07-23 18:56:15 +00:00
Ying Wang
e9105be32f
Merge "Install symlinks in multilib build."
2014-07-23 18:56:15 +00:00
Ying Wang
c3aed1eaef
Install symlinks in multilib build.
...
Change-Id: Ia8a4995de127c42beebb3fe603366ce29a6f94d3
2014-07-23 11:55:43 -07:00
Colin Cross
18fae75350
crash if getNativeBuffer() called on NULL GraphicBuffer
...
If getNativeBuffer() is called on a NULL GraphicBuffer the
static_cast of this from GraphicBuffer* to ANativeWindowBuffer*
will return a small pointer like (ANativeWindowBuffer*)0x10.
This value can propagate past NULL checks until it causes a crash
far away from the original NULL pointer. Crash immediately
instead.
Change-Id: Id614b9eb1484108b3c3c733545309844c4b87532
2014-07-22 17:47:03 -07:00
Chong Zhang
12d6575220
am 9b365296
: Merge "update battery status for audio/video" into lmp-dev
...
* commit '9b365296a745751c08731f369435e00682165f18':
update battery status for audio/video
2014-07-23 00:14:28 +00:00
Chong Zhang
9b365296a7
Merge "update battery status for audio/video" into lmp-dev
2014-07-22 21:50:21 +00:00
Chong Zhang
bd42d38b16
update battery status for audio/video
...
Bug: 12979595
Change-Id: Ic8e8d625becc6d1050f840ad63b7423f388eeba3
2014-07-22 23:08:53 +00:00
Antoine Labour
27bda67f30
am 78014f32
: BufferQueue: release mutex while allocating. DO NOT MERGE
...
* commit '78014f32da6d0ebf52fb34ebb7663863000520a0':
BufferQueue: release mutex while allocating. DO NOT MERGE
2014-07-22 21:47:39 +00:00
Antoine Labour
78014f32da
BufferQueue: release mutex while allocating. DO NOT MERGE
...
BufferQueueProducer::allocateBuffers used to keep the BufferQueueCore
mutex while doing the buffer allocation, which would cause the consumer
(which also needs the mutex) to block if the allocation takes a long
time.
Instead, release the mutex while doing the allocation, and grab it again
before filling the slots. Keep a bool state and a condvar to prevent
other producers from trying to allocate the slots while the mutex is
released.
Bug: 11792166
Change-Id: I4ab1319995ef892be2beba892f1fdbf50ce0416d
(cherry picked from commit ea96044470
)
2014-07-22 19:45:55 +00:00
Ben Clayton
c537748512
am 7b3f48d2
: Use the count parameter to store all the uniform vectors, not just the first one. DO NOT MERGE.
...
* commit '7b3f48d2efc83094de70c24520bafacda3749a20':
Use the count parameter to store all the uniform vectors, not just the first one. DO NOT MERGE.
2014-07-21 15:11:53 +00:00
Jesse Hall
244e4662db
am c6414d13
: Merge "Add OpenGL ES AEP feature xml." into lmp-dev
...
* commit 'c6414d13a3611f9e29eac11a037c7c51b94d0c58':
Add OpenGL ES AEP feature xml.
2014-07-21 12:40:28 +00:00
Ben Clayton
7b3f48d2ef
Use the count parameter to store all the uniform vectors, not just the first one. DO NOT MERGE.
...
Change-Id: Ib56d859051f0b895de5c12ffa371cd4b2b65ac0b
(cherry picked from commit 31b0aec64b
)
2014-07-21 09:52:48 +00:00
Elliott Hughes
a4e55ae915
am d2a04922
: Always #include <sys/...>, not <linux/...>.
...
* commit 'd2a049220a8299ab19a96d6dcc12b7034da28d28':
Always #include <sys/...>, not <linux/...>.
2014-07-20 18:02:21 +00:00
Elliott Hughes
198baa3c5e
am 119b765a
: Fix implicit declaration of function \'prctl\' in installd.
...
* commit '119b765a053f650b4b47256245ce836f8c403d7f':
Fix implicit declaration of function 'prctl' in installd.
2014-07-20 18:00:45 +00:00
Jesse Hall
c6414d13a3
Merge "Add OpenGL ES AEP feature xml." into lmp-dev
2014-07-20 04:41:30 +00:00
Elliott Hughes
d2a049220a
Always #include <sys/...>, not <linux/...>.
...
(cherry picked from commit 1e4ee9afd2
)
Change-Id: Ie005774484f98bb33c8f867cddb778ac04a1d4ea
2014-07-18 18:19:54 -07:00
Elliott Hughes
8acb810235
am 76cbbc07
: Merge "Always #include <sys/...>, not <linux/...>."
...
* commit '76cbbc07ea98d2a2f75173fe7ba5444d44ebd99f':
Always #include <sys/...>, not <linux/...>.
2014-07-19 01:01:01 +00:00
Elliott Hughes
6fd0408de1
am 4dd0d800
: Merge "Fix implicit declaration of function \'prctl\' in installd."
...
* commit '4dd0d8008a84d1b8e5d9cae2a3491fa92b79c388':
Fix implicit declaration of function 'prctl' in installd.
2014-07-19 00:38:11 +00:00
Elliott Hughes
119b765a05
Fix implicit declaration of function 'prctl' in installd.
...
(cherry picked from commit ec535c5ba5
)
Change-Id: I3da977d85ce544b23ff00934fdbd201d683e9210
2014-07-18 17:30:32 -07:00
Jesse Hall
abc8098fcb
Add OpenGL ES AEP feature xml.
...
Bug: 15593761
Change-Id: Ia961c64c5bf33da752518921c570c7f6dafe724e
2014-07-18 14:25:39 -07:00
Jeff Brown
4d8ee47d92
am 31d825d7
: Add glance gesture for doze mode.
...
* commit '31d825d7edcaac7254f310d3cf85af9fc1927c25':
Add glance gesture for doze mode.
2014-07-18 03:16:59 +00:00
Jeff Brown
31d825d7ed
Add glance gesture for doze mode.
...
Change-Id: I038a706c3999200313ff5360c5ff1150ec081f08
2014-07-17 18:19:53 -07:00
Elliott Hughes
76cbbc07ea
Merge "Always #include <sys/...>, not <linux/...>."
2014-07-17 22:34:48 +00:00
Elliott Hughes
1e4ee9afd2
Always #include <sys/...>, not <linux/...>.
...
Change-Id: I9a3f574e0dd1d3ba39312254513b8b193b610c09
2014-07-18 17:54:09 -07:00
Elliott Hughes
ec535c5ba5
Fix implicit declaration of function 'prctl' in installd.
...
Change-Id: I469ee15a0a8a79d005b15aad5097b6c13c20ab7e
2014-07-18 17:29:15 -07:00
Elliott Hughes
4dd0d8008a
Merge "Fix implicit declaration of function 'prctl' in installd."
2014-07-17 22:34:48 +00:00
Colin Cross
d4e6080637
am 0d6180f1
: dumpstate: fix dumping traces for vm processes on 64-bit
...
* commit '0d6180f122127a9541e6193e0e6eceb5b08c608c':
dumpstate: fix dumping traces for vm processes on 64-bit
2014-07-17 21:29:24 +00:00
Eino-Ville Talvala
7a21e90811
am 8227caaa
: Add XML files for new camera2 hardware features
...
* commit '8227caaabfdb6c693bac125cffbe559993450258':
Add XML files for new camera2 hardware features
2014-07-17 20:59:32 +00:00
Colin Cross
0d6180f122
dumpstate: fix dumping traces for vm processes on 64-bit
...
dumpstate was not dumping any stack traces for vm processes because
it was failing the string compare for /system/bin/app_process.
64-bit devices use app_process32 and app_process64 instead of
app_process, and zygote64 alongside zygote. Change the string
matching to be prefix matching.
(cherry picked from commit 8eb25d552b
)
Change-Id: I6b1568161fae278f0e6107990e5b750cf0ca902b
2014-07-17 12:42:14 -07:00
Colin Cross
3903a10d44
am da92bfda
: Merge "dumpstate: fix dumping traces for vm processes on 64-bit"
...
* commit 'da92bfda815aaa5f29ff77a38fcc6d821f61804c':
dumpstate: fix dumping traces for vm processes on 64-bit
2014-07-17 16:32:07 +00:00
Colin Cross
da92bfda81
Merge "dumpstate: fix dumping traces for vm processes on 64-bit"
2014-07-16 23:31:38 +00:00
Colin Cross
8eb25d552b
dumpstate: fix dumping traces for vm processes on 64-bit
...
dumpstate was not dumping any stack traces for vm processes because
it was failing the string compare for /system/bin/app_process.
64-bit devices use app_process32 and app_process64 instead of
app_process, and zygote64 alongside zygote. Change the string
matching to be prefix matching.
Change-Id: I6970e1b1fedfcd601f8db6af62852422fcb71d59
2014-07-16 19:03:49 -07:00
Eino-Ville Talvala
8227caaabf
Add XML files for new camera2 hardware features
...
Bug: 15415688
Change-Id: I1ea9f65b03c4fa06a5004f9d1d485935742001c8
2014-07-16 10:19:15 -07:00
Jeff Sharkey
baf8918cf1
am c796b681
: Offer to delete code cache directories.
...
* commit 'c796b681e52fbb792da9a5b4f30e935cc927c1d7':
Offer to delete code cache directories.
2014-07-16 17:00:31 +00:00
Jeff Sharkey
c796b681e5
Offer to delete code cache directories.
...
Bug: 16187224
Change-Id: Ia860b051a34ffdfb4f6e0ea19f90cb73509c4eee
2014-07-15 21:49:51 -07:00
Sean Wan
fb3e63fcc7
am 7869e224
: CW on L: Fix a SIGSEGV crash in sensor service.
...
* commit '7869e224aaaf717b5ab86df00b60fd5be5a0996c':
CW on L: Fix a SIGSEGV crash in sensor service.
2014-07-15 18:50:12 +00:00
Riley Spahn
2f15fa66b4
am 2a0e4094
: Add MAC for remaining service_manager functionality.
...
* commit '2a0e40945b5f7adf2055b2f439b3ba4c6389ddc3':
Add MAC for remaining service_manager functionality.
2014-07-15 18:49:26 +00:00
Sean Wan
7869e224aa
CW on L: Fix a SIGSEGV crash in sensor service.
...
This is to fix b/16189080.
BUG: 16189080
Change-Id: I78d44e82f797c0808891acde609040c46745a0bb
2014-07-15 11:10:44 -07:00
Riley Spahn
2a0e40945b
Add MAC for remaining service_manager functionality.
...
Add SELinux MAC for the list and find functionality
to service_manager. By default the list action uses
the service_manager_type attribute as its target
object.
(cherry picked from commit c67e6307ca
)
Change-Id: Iaf14b21346822a6b544091a0f4a9949117934b9a
2014-07-15 10:11:33 -07:00
Ruben Brunk
8de3c19392
am 2ad9d8a6
: Merge "Add sticky transform to surfaceflinger." into lmp-dev
...
* commit '2ad9d8a6e71f80b373c3ed0fece26b286d846292':
Add sticky transform to surfaceflinger.
2014-07-14 23:10:58 +00:00
Jesse Hall
a774467619
am b7d559be
: Merge "surfaceflinger: Make all sources depend on Android.mk" into lmp-dev
...
* commit 'b7d559be1f931585c444a54637cd49cda248a8fb':
surfaceflinger: Make all sources depend on Android.mk
2014-07-14 23:10:57 +00:00