Michael Lentine
1a3852821d
am 536a95a0
: am 5a350596
: Merge "Fix HWComposer Surface Crop when surface is rotated" into lmp-dev
...
* commit '536a95a058dc2f3bc92402273b6727ad7fd00b0b':
Fix HWComposer Surface Crop when surface is rotated
2014-08-08 02:34:40 +00:00
Michael Lentine
60c66099c0
am 25db8dc7
: Merge "Change output format to not throw warning on volantis." into lmp-dev
...
* commit '25db8dc7c6c155168f308b2f730198bc5a021e35':
Change output format to not throw warning on volantis.
2014-08-08 00:57:00 +00:00
Michael Lentine
536a95a058
am 5a350596
: Merge "Fix HWComposer Surface Crop when surface is rotated" into lmp-dev
...
* commit '5a35059600f85f9489f3c1de885aa6188bec07e5':
Fix HWComposer Surface Crop when surface is rotated
2014-08-08 00:56:01 +00:00
Narayan Kamath
82e98c21f8
Merge "Use set_sched_policy to put dexopt operations in SP_BACKGROUND cgroup"
2014-08-07 18:51:06 +00:00
Brian Carlstrom
0378aaf257
Use set_sched_policy to put dexopt operations in SP_BACKGROUND cgroup
...
Bug: 15927194
Change-Id: Id8bc188de68d62fd5f91a99aaaa6c8f2dea06abd
2014-08-08 22:10:06 -07:00
Hans Boehm
6e5316b1da
Merge "Revert "Revert "Remove incorrect android_atomic_...64 use."""
2014-08-07 15:32:16 +00:00
Michael Lentine
5a35059600
Merge "Fix HWComposer Surface Crop when surface is rotated" into lmp-dev
2014-08-07 15:00:45 +00:00
Michael Lentine
5af281f4ab
Fix HWComposer Surface Crop when surface is rotated
...
Bug: 15091149
Change-Id: I97ecd8af9636da9403fafdb3f9b846f95053ebb7
2014-08-07 13:44:14 -07:00
Brian Carlstrom
3b5f0c618f
am 86770280
: am bb6adf0d
: Merge changes Idae36efa,I6613c971 into lmp-dev
...
* commit '86770280899ca1c4a33be0716626d8328715e513':
Disable compilation based on vold.decrypt. [frameworks/native]
Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [frameworks/native]
2014-08-07 06:55:25 +00:00
Brian Carlstrom
4f72fa8d19
am 1da78195
: am 1abe557b
: Merge "Make system use patchoat to relocate during runtime." into lmp-dev
...
* commit '1da781958a1a3d0d257cb9222e1c3328213bf98f':
Make system use patchoat to relocate during runtime.
2014-08-07 06:55:25 +00:00
Brian Carlstrom
8677028089
am bb6adf0d
: Merge changes Idae36efa,I6613c971 into lmp-dev
...
* commit 'bb6adf0d5af8c18a85035dce80ec6b5425c318ca':
Disable compilation based on vold.decrypt. [frameworks/native]
Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [frameworks/native]
2014-08-07 06:51:16 +00:00
Brian Carlstrom
1da781958a
am 1abe557b
: Merge "Make system use patchoat to relocate during runtime." into lmp-dev
...
* commit '1abe557b6e79ed4acbd4d8d35c604d2a93974c83':
Make system use patchoat to relocate during runtime.
2014-08-07 06:51:15 +00:00
Michael Wright
435acf34e0
am 23c895d1
: am 78f2444a
: Revert "Revert "Add system accelerators for BACK and HOME.""
...
* commit '23c895d1664dfdf7e75368ad1f4c281c2e37791a':
Revert "Revert "Add system accelerators for BACK and HOME.""
2014-08-07 00:48:39 +00:00
Michael Wright
23c895d166
am 78f2444a
: Revert "Revert "Add system accelerators for BACK and HOME.""
...
* commit '78f2444aaf09ba05c7b7e79d85f1e7efafa9fa94':
Revert "Revert "Add system accelerators for BACK and HOME.""
2014-08-07 00:40:51 +00:00
Michael Wright
78f2444aaf
Revert "Revert "Add system accelerators for BACK and HOME.""
...
This reverts commit d671f98a27
.
Change-Id: Ibec48f81653bd2f755fc59a241fa7836baf53233
2014-08-06 16:59:54 -07:00
Brian Carlstrom
bb6adf0d5a
Merge changes Idae36efa,I6613c971 into lmp-dev
...
* changes:
Disable compilation based on vold.decrypt. [frameworks/native]
Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [frameworks/native]
2014-08-06 23:54:36 +00:00
Brian Carlstrom
41cd9eb424
Disable compilation based on vold.decrypt. [frameworks/native]
...
Bug: 15165413
(cherry picked from commit 538998f204
)
Change-Id: Idae36efa1cb3fb99b51fa0a79b6bb037981d1c71
2014-08-06 21:59:35 -07:00
Brian Carlstrom
9a87db6e1f
Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [frameworks/native]
...
This will allow us to conditionally change the compiler-filter based on other properties.
Bug: 15165413
(cherry picked from commit cf51ba1360
)
Change-Id: I6613c9710878d56ed8c121e0caded76a64430f76
2014-08-06 21:59:32 -07:00
Brian Carlstrom
1abe557b6e
Merge "Make system use patchoat to relocate during runtime." into lmp-dev
2014-08-06 23:54:36 +00:00
Michael Lentine
25db8dc7c6
Merge "Change output format to not throw warning on volantis." into lmp-dev
2014-08-06 23:49:20 +00:00
Michael Lentine
b54ee7704e
Change output format to not throw warning on volantis.
...
Change-Id: Id66eb61bdb1ceccfb7aefa0aa70793dac807c257
2014-08-07 14:54:23 -07:00
Alex Light
43c5d30795
Make system use patchoat to relocate during runtime.
...
Make installd understand a patchoat directive and carry it out.
Bug: 15358152
(cherry picked from commit 7365a10689
)
Change-Id: Id84a15e626ddde63876914068d3d9aa037abc65b
2014-08-06 16:27:55 -07:00
Michael Wright
78aaca2803
am b7743e99
: am d671f98a
: Revert "Add system accelerators for BACK and HOME."
...
* commit 'b7743e9944aa5b9ed93a92c9e75c858dfaa16b09':
Revert "Add system accelerators for BACK and HOME."
2014-08-06 23:13:03 +00:00
Hans Boehm
a5a434390c
am 9e0ef391
: am 735082ea
: Merge "Revert "Remove incorrect android_atomic_...64 use.""
...
* commit '9e0ef391e87686aeda3907c27caf9f31b297b9fb':
Revert "Remove incorrect android_atomic_...64 use."
2014-08-06 23:13:02 +00:00
Hans Boehm
71d32164eb
am 52bfb70c
: am c11eca81
: Merge "Remove incorrect android_atomic_...64 use."
...
* commit '52bfb70cf86bf5839cf32b9d985f413b9e127258':
Remove incorrect android_atomic_...64 use.
2014-08-06 23:02:17 +00:00
Michael Wright
979267d7a0
am 9f6c3a8e
: am 278b525d
: Add system accelerators for BACK and HOME.
...
* commit '9f6c3a8e01e3ce879bb50229787f18c9e8a31936':
Add system accelerators for BACK and HOME.
2014-08-06 23:00:49 +00:00
Michael Wright
b7743e9944
am d671f98a
: Revert "Add system accelerators for BACK and HOME."
...
* commit 'd671f98a27f547ebcddff8dc962fe895549355e2':
Revert "Add system accelerators for BACK and HOME."
2014-08-06 22:59:57 +00:00
Hans Boehm
9e0ef391e8
am 735082ea
: Merge "Revert "Remove incorrect android_atomic_...64 use.""
...
* commit '735082ea156d91cf72c241e9134abc22038c8f13':
Revert "Remove incorrect android_atomic_...64 use."
2014-08-06 22:56:57 +00:00
Michael Wright
d671f98a27
Revert "Add system accelerators for BACK and HOME."
...
This reverts commit 278b525d25
.
2014-08-06 15:50:43 -07:00
Hans Boehm
735082ea15
Merge "Revert "Remove incorrect android_atomic_...64 use.""
2014-08-06 21:46:54 +00:00
Hans Boehm
9dc5c269f7
Revert "Remove incorrect android_atomic_...64 use."
...
This reverts commit 88b7541d68
.
Change-Id: Ie701c308451a3697bb167aff119318b932133f90
2014-08-06 22:45:13 +00:00
Hans Boehm
52bfb70cf8
am c11eca81
: Merge "Remove incorrect android_atomic_...64 use."
...
* commit 'c11eca81e66892eb62a03b4553055197d122fe5b':
Remove incorrect android_atomic_...64 use.
2014-08-06 21:21:05 +00:00
Michael Wright
9f6c3a8e01
am 278b525d
: Add system accelerators for BACK and HOME.
...
* commit '278b525d25b852554015ec4f92862f9297b502fd':
Add system accelerators for BACK and HOME.
2014-08-06 19:50:05 +00:00
Michael Wright
278b525d25
Add system accelerators for BACK and HOME.
...
Meta+Backspace -> BACK
Meta+Enter -> HOME
Bug: 14066931
Change-Id: Iff1d027300fa9911626785944a6d8efe4f62235e
2014-08-06 19:01:19 +00:00
Jesse Hall
9fd4a5292f
am 83142a12
: am e2e17e5b
: Merge "GlES2: Add NULL check"
...
* commit '83142a12fbc1249c53551765e3d99b4471b58f19':
GlES2: Add NULL check
2014-08-06 17:41:06 +00:00
Aravind Akella
59ab79b66c
am 776a2789
: am 8f3b7ce8
: Merge "Sensor related changes for NDK." into lmp-dev
...
* commit '776a27890567816c5ba9bcbd78074d16ed9dbc6b':
Sensor related changes for NDK.
2014-08-06 17:38:11 +00:00
Jean-Michel Trivi
f4c1aa2c61
am 4b311c51
: am e91cd213
: AAC codec profile updates
...
* commit '4b311c519f3793c0a24428012b0198d7146bf794':
AAC codec profile updates
2014-08-06 17:34:50 +00:00
Jesse Hall
83142a12fb
am e2e17e5b
: Merge "GlES2: Add NULL check"
...
* commit 'e2e17e5b238ccd214c72ec1a1864cf391425f09f':
GlES2: Add NULL check
2014-08-06 17:22:52 +00:00
Aravind Akella
776a278905
am 8f3b7ce8
: Merge "Sensor related changes for NDK." into lmp-dev
...
* commit '8f3b7ce889d7a371c2da18fe53d3b94e1430a90d':
Sensor related changes for NDK.
2014-08-06 02:27:47 +00:00
Hans Boehm
c11eca81e6
Merge "Remove incorrect android_atomic_...64 use."
2014-08-06 02:12:31 +00:00
Brian Carlstrom
86493c36dd
am 021843c7
: am 8ce28672
: Merge "Make system use patchoat to relocate during runtime."
...
* commit '021843c78d214717c720f27d64273746cb4bd96e':
Make system use patchoat to relocate during runtime.
2014-08-06 01:48:03 +00:00
Jean-Michel Trivi
4b311c519f
am e91cd213
: AAC codec profile updates
...
* commit 'e91cd213d439c076051b1fb02c8bc40c11791dbb':
AAC codec profile updates
2014-08-05 22:53:02 +00:00
Jean-Michel Trivi
e91cd213d4
AAC codec profile updates
...
Add new fields to OMX_AUDIO_PARAM_AACPROFILETYPE for
- SBR configuration
- decoder max number of channels
- decoder DRC parameters
Bug 16740915
Change-Id: Ib01822bc402fe9064c6c1c68b72c570cf72b7ecb
2014-08-05 22:34:37 +00:00
Brian Carlstrom
021843c78d
am 8ce28672
: Merge "Make system use patchoat to relocate during runtime."
...
* commit '8ce28672106956eeff6d0ed2d1d826ec192e58ee':
Make system use patchoat to relocate during runtime.
2014-08-05 21:00:09 +00:00
Aravind Akella
8f3b7ce889
Merge "Sensor related changes for NDK." into lmp-dev
2014-08-05 17:41:31 +00:00
Aravind Akella
b37ba399c1
Sensor related changes for NDK.
...
i) ASensorManager_getDefaultSensor returns a wake-up/non wake-up sensor
depending on the type.
ii) Add ASensor_isWakeUpSensor and ASensorManager_getDefaultSensorEx
methods.
Bug : 16399898
Change-Id: I1a86fb8d9de23039fdf41679d1487e1cd761a9d0
2014-08-05 17:17:51 -07:00
Jesse Hall
e2e17e5b23
Merge "GlES2: Add NULL check"
2014-08-05 17:41:26 +00:00
Anshuman Dani
0627071cc9
GlES2: Add NULL check
...
Check for NULL before calling thread specific glGetString.
CRs-fixed: 569609
Change-Id: Ifee8257152ba7ca7a05df5d7b113171b71d16c82
2014-08-06 21:53:35 +05:30
Brian Carlstrom
8ce2867210
Merge "Make system use patchoat to relocate during runtime."
2014-08-05 00:35:38 +00:00
Alex Light
7365a10689
Make system use patchoat to relocate during runtime.
...
Make installd understand a patchoat directive and carry it out.
Bug: 15358152
Change-Id: Ibe92d8b55a24bbf718b0416a21b76e5df7a2de26
2014-08-05 10:22:10 -07:00