Keun-young Park
bbf282a738
am ea116f1a
: am 111d920b
: am d3b2c029
: Merge "[MIPS] Add MIPS architecture support to opengl framework"
...
* commit 'ea116f1acb911963751d72515714803aeae95d59':
[MIPS] Add MIPS architecture support to opengl framework
2013-03-28 23:11:59 -07:00
Keun-young Park
ea116f1acb
am 111d920b
: am d3b2c029
: Merge "[MIPS] Add MIPS architecture support to opengl framework"
...
* commit '111d920bb588669006bdd8699e786d6305f14c36':
[MIPS] Add MIPS architecture support to opengl framework
2013-03-28 23:09:44 -07:00
Keun-young Park
111d920bb5
am d3b2c029
: Merge "[MIPS] Add MIPS architecture support to opengl framework"
...
* commit 'd3b2c029eba356e7bed3754d60ade556c216348e':
[MIPS] Add MIPS architecture support to opengl framework
2013-03-28 23:08:17 -07:00
Keun-young Park
d3b2c029eb
Merge "[MIPS] Add MIPS architecture support to opengl framework"
2013-03-29 05:26:28 +00:00
Mathias Agopian
0b003fab82
am 8171aece
: fix uninitialized attribute in SurfaceFlinger
...
* commit '8171aece3d89a2107eda02c0e9daf79518b40174':
fix uninitialized attribute in SurfaceFlinger
2013-03-28 17:55:24 -07:00
Mathias Agopian
8171aece3d
fix uninitialized attribute in SurfaceFlinger
...
Change-Id: I8277f67e297a8b6a99195387060d03154a2cd929
2013-03-28 17:52:36 -07:00
Mathias Agopian
a6e3962f53
am bf667e31
: Merge changes I22f1b358,I5496d0de,Ifd98966b into jb-mr2-dev
...
* commit 'bf667e31558d14d75076e45da665288d6fa2ed3c':
replace eglWaitSyncANDROID by eglWaitSyncKHR
update EGL headers to most recent
cleanup EGL extensions strings and entry-points
2013-03-28 15:53:16 -07:00
Mathias Agopian
bf667e3155
Merge changes I22f1b358,I5496d0de,Ifd98966b into jb-mr2-dev
...
* changes:
replace eglWaitSyncANDROID by eglWaitSyncKHR
update EGL headers to most recent
cleanup EGL extensions strings and entry-points
2013-03-28 22:51:06 +00:00
Jesse Hall
e1254d4207
am 94ebadf4
: Merge "Remove unused clz.cpp" into jb-mr2-dev
...
* commit '94ebadf433ae9d0e7c1c18bc85e15579d3a9818c':
Remove unused clz.cpp
2013-03-28 15:18:59 -07:00
Jesse Hall
94ebadf433
Merge "Remove unused clz.cpp" into jb-mr2-dev
2013-03-28 22:16:50 +00:00
Mathias Agopian
2bb716871c
replace eglWaitSyncANDROID by eglWaitSyncKHR
...
Change-Id: I22f1b3588011c88389e249f738f1e6915cc97e72
2013-03-28 14:31:09 -07:00
Mathias Agopian
12af3f6665
update EGL headers to most recent
...
- add ANDROID extensions missing from official headers:
EGL_ANDROID_wait_sync
EGL_ANDROID_presentation_time
Change-Id: I5496d0de123a6279234098c19f9a12220adec876
2013-03-28 14:17:54 -07:00
Mathias Agopian
e9b3dfb7d5
cleanup EGL extensions strings and entry-points
...
- move all the code related to EGL extensions in one place
- add missing extension strings:
EGL_KHR_lock_surface
EGL_KHR_reusable_sync
- add public extensions strings and entry-points
EGL_ANDROID_wait_sync
EGL_ANDROID_presentation_time
- add missing entry-points for EGL_KHR_reusable_sync
Change-Id: Ifd98966b549e8efd8ef5385eba0efde8c4cbc77b
2013-03-28 14:17:54 -07:00
Jamie Gennis
cbf4cf0eb3
am f7f29c8f
: atrace: add support for app tracing
...
* commit 'f7f29c8f9d56dc908e501ae789e418a9974b6bce':
atrace: add support for app tracing
2013-03-28 14:06:12 -07:00
Jamie Gennis
f7f29c8f9d
atrace: add support for app tracing
...
This change adds support for the -a command line argument to atrace. This
argument sets the comma separated list of application names (i.e.
/proc/self/cmdline values) for which to enable application-level tracing.
Change-Id: I812d57c4cdc581943247229413f09b7e1adc10d0
2013-03-28 13:53:45 -07:00
Jesse Hall
13c62dad56
am c9a4e2f7
: am 4194b389
: am 0b6c4157
: Merge "frameworks/native/opengl: Fix build with gcc 4.8"
...
* commit 'c9a4e2f7dc6cc0843d1b029a9860f4786bb6dbd8':
frameworks/native/opengl: Fix build with gcc 4.8
2013-03-28 13:23:40 -07:00
Jesse Hall
c9a4e2f7dc
am 4194b389
: am 0b6c4157
: Merge "frameworks/native/opengl: Fix build with gcc 4.8"
...
* commit '4194b3898df867a5c4377de49ddc72ad3e51122b':
frameworks/native/opengl: Fix build with gcc 4.8
2013-03-28 13:22:34 -07:00
Jesse Hall
4194b3898d
am 0b6c4157
: Merge "frameworks/native/opengl: Fix build with gcc 4.8"
...
* commit '0b6c41571b636cc9b47005fa971db19430cedc09':
frameworks/native/opengl: Fix build with gcc 4.8
2013-03-28 13:21:05 -07:00
Jesse Hall
0b6c41571b
Merge "frameworks/native/opengl: Fix build with gcc 4.8"
2013-03-28 19:28:36 +00:00
Jesse Hall
b1196e6356
Remove unused clz.cpp
...
Change-Id: Ieed91a45ba0e865a0d47d84effe9439aaab4371f
2013-03-28 12:27:01 -07:00
Duane Sand
46b4253b76
[MIPS] Add MIPS architecture support to opengl framework
...
Change-Id: Id7704d35bed14d96a85dc1f29db0566cd03872b5
2013-03-28 12:09:36 -07:00
Jamie Gennis
3fbced6ace
am 9794f903
: Merge "atrace: fix tracing on user builds" into jb-mr2-dev
...
* commit '9794f90368550dba8693a30c61c4bea5c4fb2993':
atrace: fix tracing on user builds
2013-03-28 11:17:05 -07:00
Jamie Gennis
9794f90368
Merge "atrace: fix tracing on user builds" into jb-mr2-dev
2013-03-28 18:14:14 +00:00
Jamie Gennis
6f6f3f710b
atrace: fix tracing on user builds
...
Change-Id: Idef15d514f0bd1e117362c6a06a2ea24314feb7f
2013-03-27 15:50:30 -07:00
Bernhard Rosenkränzer
c80fae6e85
frameworks/native/opengl: Fix build with gcc 4.8
...
In gcc 4.8, the warning for unused parameters (such as JNIEnv* pointers
in JNI functions that don't need it) is enabled by default - causing
-Werror to break the build.
Change-Id: Ib91721f2cb9912b79c2ac19b4210b1309b08304f
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
2013-03-27 14:06:39 +01:00
Mathias Agopian
4fbb8191d8
am caa81f0e
: Merge "make sure to unlock the screenshot\'s buffer on destruction" into jb-mr2-dev
...
* commit 'caa81f0ed8a4471c210956d0343458b3bca922de':
make sure to unlock the screenshot's buffer on destruction
2013-03-26 18:32:39 -07:00
Mathias Agopian
caa81f0ed8
Merge "make sure to unlock the screenshot's buffer on destruction" into jb-mr2-dev
2013-03-27 01:30:36 +00:00
Mathias Agopian
8000d0694b
make sure to unlock the screenshot's buffer on destruction
...
this fixes a memory leak on various devices
Bug: 8475134
Change-Id: I25924674c803a0cb22371a95c60664c36acb0340
2013-03-26 18:15:35 -07:00
Keun-young Park
adb6aa130a
am 9dd8d897
: am 1cd763f1
: am cd91024c
: Merge "[MIPS] Avoid unaligned load/store for 64-bit doubles."
...
* commit '9dd8d897d350897eb04e60987bb59b846ea0f154':
[MIPS] Avoid unaligned load/store for 64-bit doubles.
2013-03-26 11:46:40 -07:00
Keun-young Park
9dd8d897d3
am 1cd763f1
: am cd91024c
: Merge "[MIPS] Avoid unaligned load/store for 64-bit doubles."
...
* commit '1cd763f123b9f1a2772ddff15ace81ec07b7660c':
[MIPS] Avoid unaligned load/store for 64-bit doubles.
2013-03-26 11:45:01 -07:00
Keun-young Park
1cd763f123
am cd91024c
: Merge "[MIPS] Avoid unaligned load/store for 64-bit doubles."
...
* commit 'cd91024ca16db96daa697e22f7a088b416a424e3':
[MIPS] Avoid unaligned load/store for 64-bit doubles.
2013-03-26 11:43:05 -07:00
The Android Open Source Project
6a77fb589c
Reconcile with jb-mr2-release - do not merge
...
Change-Id: I5556f655c440622963e3d1f89e6c8ac2bf45d53f
2013-03-26 10:49:32 -07:00
Keun-young Park
cd91024ca1
Merge "[MIPS] Avoid unaligned load/store for 64-bit doubles."
2013-03-26 17:47:19 +00:00
The Android Automerger
77e908100f
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-03-26 05:55:48 -07:00
Geremy Condra
2c5a58ee65
am 437bdbba
: Merge "Add seinfo parsing to PackageManagerService." into jb-mr2-dev
...
* commit '437bdbbaec76099b8b4582aa9f965e60b3f3cdb6':
Add seinfo parsing to PackageManagerService.
2013-03-26 01:41:04 +00:00
Geremy Condra
437bdbbaec
Merge "Add seinfo parsing to PackageManagerService." into jb-mr2-dev
2013-03-26 01:39:22 +00:00
Robert Craig
4d3fd4e998
Add seinfo parsing to PackageManagerService.
...
This patch set allows the PMS to parse the
mac_permissions.xml file which contains the
seinfo values. Each package that is installed
on the device will be assigned an seinfo value
based on policy. This seinfo value will help label
the app process and data directory. Modifications
include adjustments to ApplicationInfo.java
to store the seinfo tag per package as well as
adjustments to installd to communicate the seinfo
tag to libselinux.
Change-Id: I61ad1ea12fb6a9a6d0b108ec163bc4bf4c954b58
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
2013-03-25 17:37:51 -07:00
Jeff Sharkey
fde7677a83
am d7cde428
: Merge "Bugreport broadcasts are only useful to owners." into jb-mr2-dev
...
* commit 'd7cde4285c2a4b69632ea50eb785544430b9769e':
Bugreport broadcasts are only useful to owners.
2013-03-26 00:22:05 +00:00
Jeff Sharkey
d7cde4285c
Merge "Bugreport broadcasts are only useful to owners." into jb-mr2-dev
2013-03-26 00:18:37 +00:00
Jeff Sharkey
aaaa57bf89
Bugreport broadcasts are only useful to owners.
...
Bug: 8415156
Change-Id: Ia73969262abe9f715f038dad934651d7e5d65c87
2013-03-25 17:15:57 -07:00
Jesse Hall
854c638ed9
am 5a557a61
: Merge "Fix virtual displays for HWC<=1.1" into jb-mr2-dev
...
* commit '5a557a61d6a5cd2d82dcd961b1d72b5621eb014d':
Fix virtual displays for HWC<=1.1
2013-03-25 22:39:00 +00:00
Jesse Hall
8d7fab0365
am 78d2a07f
: Merge changes I98927540,I95c71e8d into jb-mr2-dev
...
* commit '78d2a07f7aa598ce724664b1819db073eb0706ae':
Fix dump when virtual display exists
Isolate knowledge that fb target == output buffer
2013-03-25 22:38:59 +00:00
Jesse Hall
5a557a61d6
Merge "Fix virtual displays for HWC<=1.1" into jb-mr2-dev
2013-03-25 22:37:04 +00:00
Jesse Hall
78d2a07f7a
Merge changes I98927540,I95c71e8d into jb-mr2-dev
...
* changes:
Fix dump when virtual display exists
Isolate knowledge that fb target == output buffer
2013-03-25 22:36:38 +00:00
The Android Automerger
11d2958be3
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-03-25 05:56:07 -07:00
Dianne Hackborn
f8bf40780b
am 0046d961
: Implement #8323587 , #8323342 , #8323590 : new features.
...
* commit '0046d9614a57fe4f4e49692570810d424b1f4fe4':
Implement #8323587 , #8323342 , #8323590 : new features.
2013-03-23 01:23:43 +00:00
Dianne Hackborn
0046d9614a
Implement #8323587 , #8323342 , #8323590 : new features.
...
8323587: Add feature for supporting app widgets
8323342: Add feature for replacing the home screen
8323590: Add feature for supporting input methods
The app widget service looks for the app widget feature
and refuses to work if it doesn't exist. I didn't do
this for the input method service because some devices
will probably want to still make use of that mechanism
without supporting third party input methods.
Change-Id: Ia358ccc6059d43f163d74810c7cbe9568a67ede9
2013-03-22 17:24:57 -07:00
Jesse Hall
46a4cd12a7
am afaf14b9
: Use descriptive aliases instead of HWC_NUM_DISPLAY_TYPES
...
* commit 'afaf14b9fbfe8943d845e2f01e8a401ad7a4d854':
Use descriptive aliases instead of HWC_NUM_DISPLAY_TYPES
2013-03-22 22:36:56 +00:00
Jesse Hall
501553a055
am 13f01cbd
: Pass sp<Fence>s around instead of file descriptors
...
* commit '13f01cbdbd34779a234bc674df79e23672fd5c0b':
Pass sp<Fence>s around instead of file descriptors
2013-03-22 22:36:55 +00:00
Jesse Hall
ffe1f19ca9
Fix virtual displays for HWC<=1.1
...
If we're using a HWC that doesn't support virtual displays, or we have
more virtual displays than HWC supports concurrently, the
VirtualDisplaySurface should simply be a passthrough from source
(GLES) to sink.
This change also tries to distinguish between display types and HWC
display IDs a little better, though there's more to do here. Probably
needs a higher-level rethink; it's too error-prone now.
Bug: 8446838
Change-Id: I708d2cf262ec30177042304f174ca5b8da701df1
2013-03-22 15:27:58 -07:00