ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
51,519 Commits 2 Branches 0 Tags 54 MiB
40a206b867
Commit Graph

51519 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Ian Rogers
16a95b267a Add support for dalvik.vm.isa.<instruction set>.variant 
Bug: 18056890
Change-Id: Ia266fa9f2a79158ced82016106aa1cd2529259c9
 2014-11-08 16:58:13 -08: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
The Android Automerger
3ff2d3b27c merge in lmp-mr1-release history after reset to a26143546e 2014-11-08 06:12:55 -08: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
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
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 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
The Android Automerger
06e899a83c merge in lmp-mr1-release history after reset to 106e582053 2014-11-06 06:13:44 -08: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
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
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
The Android Automerger
fb4dbc40d1 merge in lmp-mr1-release history after reset to 9cea6ccbd8 2014-11-05 06:13:00 -08:00
Serguei Katkov
62bb385728 Fix installd command line parser 
Parser does not take into account that the last argument can be empty.
In this case it will skip end of line marker and continue parsing.

Change-Id: I2d029a69ed22cef497893e592ff3275ced97f85f
Signed-off-by: Serguei Katkov <serguei.i.katkov@intel.com>
 2014-11-05 13:39:43 +06: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
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
Mark Salyzyn
9cea6ccbd8 dumpstate: report device uptime mmc performance 
Bug: 18085992
Change-Id: Ibc0a37d3d2649d1e6708d9357f37ed75f2cea121
 2014-11-04 09:39:27 -08:00
Jesse Hall
06ce109470 am fee99040: Revert "Add more logging for dup(fd) failure" 
* commit 'fee99040de000a64f6036a7db172fb7c68d9764a':
  Revert "Add more logging for dup(fd) failure"
 2014-11-04 17:35:23 +00:00
Jesse Hall
88361aaaf4 am 8e5cf83a: Revert "Parcel: extra validation/debug code for writeDupFileDescriptor" 
* commit '8e5cf83afbe2b671f96d04786cf0d0f967e342f9':
  Revert "Parcel: extra validation/debug code for writeDupFileDescriptor"
 2014-11-04 17:35:23 +00:00
Jesse Hall
aa4ccfd123 am de288fe2: Revert "bufferqueue: workaround: allow NULL fence with queueBuffer" 
* commit 'de288fe2d43adfa1b2243ae534faaf832bf50491':
  Revert "bufferqueue: workaround: allow NULL fence with queueBuffer"
 2014-11-04 17:35:22 +00: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
Chih-Hung Hsieh
923b0f6a67 am ac5cd96f: am dbab409c: Merge "Avoid two warnings from clang." 
* commit 'ac5cd96fe24690d9e0ae823c77334b8579139aa2':
  Avoid two warnings from clang.
 2014-11-04 01:58:17 +00:00
Chih-Hung Hsieh
ac5cd96fe2 am dbab409c: Merge "Avoid two warnings from clang." 
* commit 'dbab409c49ca5dd6686912d0b3eeb19ef1c37a3e':
  Avoid two warnings from clang.
 2014-11-04 01:24:07 +00:00
Chih-Hung Hsieh
dbab409c49 Merge "Avoid two warnings from clang." 2014-11-04 01:14:17 +00:00
Naseer Ahmed
ff520bb938 am 7aa0c47e: sf: Add a NULL check in getDisplayConfigs 
* commit '7aa0c47e4205c6fca136c38f272d911c25c8a8fa':
  sf: Add a NULL check in getDisplayConfigs
 2014-11-03 22:31:50 +00: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