Commit Graph

50886 Commits

Author SHA1 Message Date
Jeff Brown
c8c5e4c66b Merge "Add trace tag for power management." into lmp-dev 2014-08-15 21:23:40 +00:00
Brian Carlstrom
872f605a30 am ca58175c: Merge "Disable verification based on vold.decrypt. [frameworks/native]"
* commit 'ca58175c831376bc052bde2e25d40798f0cf7ea9':
  Disable verification based on vold.decrypt. [frameworks/native]
2014-08-15 17:44:30 +00:00
Brian Carlstrom
46ab27e624 am e18987ef: Disable verification based on vold.decrypt. [frameworks/native]
* commit 'e18987efb5e39ca1bed15527b7b82bde55c99669':
  Disable verification based on vold.decrypt. [frameworks/native]
2014-08-15 17:20:38 +00:00
Brian Carlstrom
e18987efb5 Disable verification based on vold.decrypt. [frameworks/native]
Bug: 15165413
Change-Id: Ie70bf4e1348b7b8b2454cf9b498b272416d61c34
2014-08-15 09:57:55 -07:00
Brian Carlstrom
ca58175c83 Merge "Disable verification based on vold.decrypt. [frameworks/native]" 2014-08-15 05:40:22 +00:00
Brian Carlstrom
f7765c4a17 Disable verification based on vold.decrypt. [frameworks/native]
Bug: 15165413

(cherry picked from commit e18987efb5)

Change-Id: Ie55ef400c9d1f231b3be64248c756ac798a11ffe
2014-08-15 10:05:32 -07:00
Jeff Brown
3200b0bf50 Add trace tag for power management.
Also added a couple of other existing missing tags in atrace.

Bug: 17004602
Change-Id: I6f697a2a15922bd4695acfa203d45eaae40cd00e
2014-08-14 19:24:47 -07:00
Hans Boehm
dc1fb90857 am a0187a9c: Merge "Revert "Revert "Revert "Revert "Remove incorrect android_atomic_...64 use."""""
* commit 'a0187a9c83cb042b4cb92dac59214247bb7affcf':
  Revert "Revert "Revert "Revert "Remove incorrect android_atomic_...64 use.""""
2014-08-13 00:19:23 +00:00
Hans Boehm
a0187a9c83 Merge "Revert "Revert "Revert "Revert "Remove incorrect android_atomic_...64 use.""""" 2014-08-12 23:11:16 +00:00
Hans Boehm
3effababf2 Revert "Revert "Revert "Revert "Remove incorrect android_atomic_...64 use.""""
After fixing b/16874785.

This reverts commit f010a05c7e.

Change-Id: I1645ca5d6f60595bf5d388913665ce4b8780b26d
2014-08-12 22:56:00 +00:00
Andreas Gampe
f12e678d4b am 1a22eb7b: Merge "Change an accidental ALOGE to an ALOGV"
* commit '1a22eb7ba1062ed1ee35cdb9d797019699cbce8b':
  Change an accidental ALOGE to an ALOGV
2014-08-11 20:00:46 +00:00
Brian Carlstrom
c5106fedec am 3b14e5b1: Use set_sched_policy to put dexopt operations in SP_BACKGROUND cgroup
* commit '3b14e5b1f3fd1f3ef66696dc7ce4e53b6af3c309':
  Use set_sched_policy to put dexopt operations in SP_BACKGROUND cgroup
2014-08-11 18:03:05 +00:00
Andreas Gampe
1a22eb7ba1 Merge "Change an accidental ALOGE to an ALOGV" 2014-08-11 18:01:48 +00:00
Narayan Kamath
93b1b9a42c am 82e98c21: Merge "Use set_sched_policy to put dexopt operations in SP_BACKGROUND cgroup"
* commit '82e98c21f8606e0de8c6beb4372bc4ae9f52b515':
  Use set_sched_policy to put dexopt operations in SP_BACKGROUND cgroup
2014-08-11 17:36:11 +00:00
Brian Carlstrom
3b14e5b1f3 Use set_sched_policy to put dexopt operations in SP_BACKGROUND cgroup
Bug: 15927194

(cherry picked from commit 0378aaf257)

Change-Id: I462b5ac256c4d091ed4023cf4b97dd6a4abcaa5f
2014-08-11 18:31:03 +01:00
Alex Light
a7915d437c Change an accidental ALOGE to an ALOGV
Change-Id: If07bcef597dd9e531ce6d92c7780ba6ad5090f9a
2014-08-11 10:07:02 -07:00
Rachad
4f3abf2771 am 7d1cd4aa: Merge "Tunneled Video Playback support" into lmp-dev
* commit '7d1cd4aae2aa42172abdff00ec1601248cf92b02':
  Tunneled Video Playback support
2014-08-09 05:14:12 +00:00
Hans Boehm
d87319ddc8 am f491f497: Merge "Revert "Revert "Revert "Remove incorrect android_atomic_...64 use.""""
* commit 'f491f497b2a4ba5a0ec60b291cce4ffb3be3d33c':
  Revert "Revert "Revert "Remove incorrect android_atomic_...64 use."""
2014-08-09 02:50:38 +00:00
Hans Boehm
f010a05c7e Revert "Revert "Revert "Remove incorrect android_atomic_...64 use."""
This reverts commit 66629e0de5.

Change-Id: Ic298b345d0e500d18e4297b00e755ce3340f13fb
2014-08-09 01:17:13 +00:00
Rachad
7d1cd4aae2 Merge "Tunneled Video Playback support" into lmp-dev 2014-08-09 00:45:27 +00:00
Hans Boehm
e0b96dbf2a am 6e5316b1: Merge "Revert "Revert "Remove incorrect android_atomic_...64 use."""
* commit '6e5316b1dac10bed0d81f4b2942e4a8749cd67b2':
  Revert "Revert "Remove incorrect android_atomic_...64 use.""
2014-08-09 00:38:27 +00:00
Hans Boehm
66629e0de5 Revert "Revert "Remove incorrect android_atomic_...64 use.""
This reverts commit 9dc5c269f7.
Adds a stdint.h include in case stdatomic.h stops including that.

Change-Id: If3dd1db1f1132c0f2dc1efb0a44617d3f36d7cfb
2014-08-08 17:14:30 -07:00
Hans Boehm
f491f497b2 Merge "Revert "Revert "Revert "Remove incorrect android_atomic_...64 use."""" 2014-08-08 18:16:13 +00:00
Michael Lentine
0ffbac894c am 45e2fc22: Revert "Modify EGL to disconnect the window when the surface gets destroyed."
* commit '45e2fc22261cb8ecac4901b4425bcb7352c71174':
  Revert "Modify EGL to disconnect the window when the surface gets destroyed."
2014-08-08 17:42:02 +00:00
Michael Lentine
45e2fc2226 Revert "Modify EGL to disconnect the window when the surface gets destroyed."
This reverts commit 843cbb241d.
2014-08-08 10:30:44 -07: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
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
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
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