Jesse Hall
a059fc7353
am 3b93c2b9
: am 7b3fd290
: Merge "EGL: make x86/64 wrappers resistant to -fno-omit-frame-pointer flag"
...
* commit '3b93c2b9d0bd4495b6d0fa5f834214f6665873ab':
EGL: make x86/64 wrappers resistant to -fno-omit-frame-pointer flag
2014-11-12 17:36:52 +00: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
Dianne Hackborn
00326f6409
am ba2e1a33
: am ca69e8f2
: Merge "Add tracking of parcel memory allocations." into lmp-mr1-dev
...
* commit 'ba2e1a332eb24fcf4eef3634b8233d1681fd1309':
Add tracking of parcel memory allocations.
2014-11-12 16:36:49 +00:00
Craig Mautner
d2af156688
am 66af95fa
: am 83cbc5a7
: Merge "Stop consuming input on error dialogs." into lmp-mr1-dev
...
* commit '66af95fa175baa8c0c9b9b2caa5141f66d635928':
Stop consuming input on error dialogs.
2014-11-12 16:36:48 +00: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
Dmitriy Ivanov
415a87b36a
am 741625a1
: resolved conflicts for merge of 37878b1e
to lmp-mr1-dev-plus-aosp
...
* commit '741625a17e80bc0ad8e728ba73536386efb1fb4d':
Add an installd command to mark the end of boot.
2014-11-12 03:43:22 +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
Craig Mautner
83cbc5a758
Merge "Stop consuming input on error dialogs." into lmp-mr1-dev
2014-11-12 00:16:07 +00:00
Dmitriy Ivanov
741625a17e
resolved conflicts for merge of 37878b1e
to lmp-mr1-dev-plus-aosp
...
Change-Id: I748a7d2fb43fd63189f4688edbd0991e2b609dba
2014-11-11 16:08:29 -08: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
Andreas Gampe
ff8be8c267
am 32dc54a1
: am bfd633e1
: Frameworks/native: Fix unused parameter warning
...
* commit '32dc54a1c9a717ee5a7ebdf417bfeafa115c9c59':
Frameworks/native: Fix unused parameter warning
2014-11-09 00:34:33 +00:00
Andreas Gampe
32dc54a1c9
am bfd633e1
: Frameworks/native: Fix unused parameter warning
...
* commit 'bfd633e131585d8e924b6a77c66284ec7e5dcc72':
Frameworks/native: Fix unused parameter warning
2014-11-09 00:30:37 +00: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
Andreas Gampe
70a49ba624
am a32900de
: Frameworks/native: Fix unused parameter warning
...
* commit 'a32900deec6284973100a29f7b399d061f82b3a8':
Frameworks/native: Fix unused parameter warning
2014-11-08 00:55:44 +00:00
Andreas Gampe
a32900deec
Frameworks/native: Fix unused parameter warning
...
Pulled in in hardware/, where -Werror is used.
Change-Id: I13fc31d31fe2f623d39c84862b0c95a28813723d
2014-11-07 16:49:48 -08:00
Aravind Akella
e75a9a26ee
am 686edee8
: am a2614354
: Merge "Add a timeout for releasing SensorService wake_lock." into lmp-mr1-dev
...
* commit '686edee8e9894363caf8f01b370a6d3c9bc13e91':
Add a timeout for releasing SensorService wake_lock.
2014-11-07 22:08:47 +00:00
Aravind Akella
686edee8e9
am a2614354
: Merge "Add a timeout for releasing SensorService wake_lock." into lmp-mr1-dev
...
* commit 'a26143546e4665cc3b07d6527b63a2e4bb04fb9f':
Add a timeout for releasing SensorService wake_lock.
2014-11-07 22:01:03 +00: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
6b7a45859e
am 8e624d4c
: am 98d20f82
: Merge "Add a BufferItem parameter to onFrameAvailable" into lmp-mr1-dev
...
* commit '8e624d4cad45532c09879356f3adaa3b65fdcfc9':
Add a BufferItem parameter to onFrameAvailable
2014-11-07 20:09:39 +00:00
Dan Stoza
8e624d4cad
am 98d20f82
: Merge "Add a BufferItem parameter to onFrameAvailable" into lmp-mr1-dev
...
* commit '98d20f82ca8979b30c81df9639f54ab11e1951f9':
Add a BufferItem parameter to onFrameAvailable
2014-11-07 20:03:42 +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 Albert
e1cd7966d2
am cad831fb
: am c6f93a43
: Merge "Add missing include to fix libc++ build."
...
* commit 'cad831fb15f3c35945cb250d95d31c9b43d65785':
Add missing include to fix libc++ build.
2014-11-07 18:41:43 +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
Dan Albert
cad831fb15
am c6f93a43
: Merge "Add missing include to fix libc++ build."
...
* commit 'c6f93a43d636b0ad16b75adf664c6a33d30b39dd':
Add missing include to fix libc++ build.
2014-11-07 18:37:43 +00:00
Dan Albert
c6f93a43d6
Merge "Add missing include to fix libc++ build."
2014-11-07 18:04:49 +00:00
Dan Albert
0d1c700214
Add missing include to fix libc++ build.
...
This was previously committed, but I guess it got lost in the merge
queue.
Bug: 15193147
Change-Id: Ic0e5d90ab403fb833d6a3bb7c55d279c56534869
2014-11-07 09:33:44 -08:00
Igor Murashkin
cdf2e3f26a
am cd647d01
: am 106e5820
: Merge "installd: Set priority to background for dexopting" into lmp-mr1-dev
...
* commit 'cd647d01e5e5a17c272f1a0c691c39cb24ae107c':
installd: Set priority to background for dexopting
2014-11-06 03:01:51 +00:00
Igor Murashkin
cd647d01e5
am 106e5820
: Merge "installd: Set priority to background for dexopting" into lmp-mr1-dev
...
* commit '106e582053121f1934c33a6c98d35377e8ae384a':
installd: Set priority to background for dexopting
2014-11-06 02:55:23 +00:00
Jeff Tinker
cbd9e8d34c
am 52211048
: am 621c6f3b
: Merge "Add missing secure stop methods" into lmp-mr1-dev
...
* commit '522110485465a05f4602ad42ba14a18b11184cca':
Add missing secure stop methods
2014-11-06 02:48:18 +00:00
Jeff Tinker
5221104854
am 621c6f3b
: Merge "Add missing secure stop methods" into lmp-mr1-dev
...
* commit '621c6f3b13f96b0e84163f355c6f3024cd3afb2e':
Add missing secure stop methods
2014-11-06 02:44:25 +00: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
585cccc7ff
am a2f27a0d
: am 26645298
: Merge "Fix for corruption when numFds or numInts is too large." into lmp-mr1-dev
...
* commit 'a2f27a0d63da87b23bf214355882bbcea6a163ea':
Fix for corruption when numFds or numInts is too large.
2014-11-05 20:11:32 +00:00
Michael Lentine
a2f27a0d63
am 26645298
: Merge "Fix for corruption when numFds or numInts is too large." into lmp-mr1-dev
...
* commit '26645298400c0ae3a95731388364263d6a914ee4':
Fix for corruption when numFds or numInts is too large.
2014-11-05 19:06:19 +00: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
Dan Albert
c954a121e1
Add a missing include.
...
Was being included transitively by stlport.
Bug: 15193147
Change-Id: If462e5ddcf4a620367fb4b5533f44960fd3b7378
2014-11-04 22:31:05 -08:00
Dan Albert
66aae0a4c8
am 090dbeb7
: am c90b7d9c
: am d12586b8
: Merge "Move hwc tests to libc++."
...
* commit '090dbeb7f174e5c1c605d8d91ef0faa2c46e9ee3':
Move hwc tests to libc++.
2014-11-05 03:29:55 +00:00
Dan Albert
090dbeb7f1
am c90b7d9c
: am d12586b8
: Merge "Move hwc tests to libc++."
...
* commit 'c90b7d9c0f1df1cec8afbfebad0f111d878113e7':
Move hwc tests to libc++.
2014-11-05 02:57:31 +00:00
Dan Albert
c90b7d9c0f
am d12586b8
: Merge "Move hwc tests to libc++."
...
* commit 'd12586b8593cf0cb894d02104a9794ed9dd85d16':
Move hwc tests to libc++.
2014-11-05 02:41:59 +00:00
Dan Albert
d12586b859
Merge "Move hwc tests to libc++."
2014-11-05 01:38:09 +00:00
Dan Albert
bcc1ae07d9
Move hwc tests to libc++.
...
Since these tests were pulling in a static library linked against
stlport, the tests needed to be explicit about which STL they're
using. Might as well be libc++.
Bug: 15193147
Change-Id: I4e0fc4ea10f7982dd04e7baaf57139dd5d55543e
2014-11-04 17:25:12 -08:00
Mark Salyzyn
1fd0695a3b
am ea14602e
: am 9cea6ccb
: dumpstate: report device uptime mmc performance
...
* commit 'ea14602e6e1e415f3c6b53ef498d4deff00c23ac':
dumpstate: report device uptime mmc performance
2014-11-05 00:21:48 +00:00
Mark Salyzyn
ea14602e6e
am 9cea6ccb
: dumpstate: report device uptime mmc performance
...
* commit '9cea6ccbd8789f9583c78ce2b36ac5dd75717b6c':
dumpstate: report device uptime mmc performance
2014-11-05 00:15:47 +00:00