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
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
Jesse Hall
48bc05b56d
Fix dump when virtual display exists
...
SurfaceFlinger::getLayerSortedByZForHwcDisplay only worked for builtin
displays.
Bug: 8384764
Change-Id: I989275407fb2f06d166a6e70321c3211e27e562e
2013-03-22 15:27:58 -07:00
Jesse Hall
851cfe8342
Isolate knowledge that fb target == output buffer
...
HWComposer didn't allow the virtual display output buffer to be set
directly, instead it always used the framebuffer target buffer.
DisplayDevice was only providing the framebuffer release fence to
DisplaySurfaces after a commit.
This change fixes both of these, so both HWComposer and DisplayDevice
should continue to work if VirtualDisplaySurface changes to use
separate framebuffer and output buffers. It's also more correct since
VirtualDisplaySurface uses the correct release fence when queueing the
buffer to the sink.
Bug: 8384764
Change-Id: I95c71e8d4f67705e23f122259ec8dd5dbce70dcf
2013-03-22 15:27:57 -07:00
Jesse Hall
afaf14b9fb
Use descriptive aliases instead of HWC_NUM_DISPLAY_TYPES
...
Bug: 8384764
Change-Id: Ia2563fab19dbc6e4a95bed03445e609334841cca
2013-03-22 09:56:58 -07:00
Jesse Hall
13f01cbdbd
Pass sp<Fence>s around instead of file descriptors
...
Change-Id: Iac70584a2207940730e8f803a543e4e9a4000c47
2013-03-22 09:56:58 -07:00
Jesse Hall
f09e6ea0e7
am 8d8c7597
: Merge "Release virtual display buffer immediately after HWC set" into jb-mr2-dev
...
* commit '8d8c75976171d194ca8f94727b22e3bf7676b9dd':
Release virtual display buffer immediately after HWC set
2013-03-22 16:54:12 +00:00
Jesse Hall
8d8c759761
Merge "Release virtual display buffer immediately after HWC set" into jb-mr2-dev
2013-03-22 16:51:32 +00:00
Mathias Agopian
d59a1da80e
am ed985574
: make sure screenshot are in a format supported by Bitmap.java
...
* commit 'ed985574148a938bc3af24442eead313cc62521c':
make sure screenshot are in a format supported by Bitmap.java
2013-03-22 07:32:17 +00:00
Mathias Agopian
ed98557414
make sure screenshot are in a format supported by Bitmap.java
...
Change-Id: I0fb9cc4088f9c1fd27e6c017b0a7c5617adb4660
2013-03-22 00:24:39 -07:00
Mathias Agopian
dbbf209e66
am 7133f863
: Merge "improved CallStack a bit" into jb-mr2-dev
...
* commit '7133f8638e105548f6cca66a0ba9a6951993b7de':
improved CallStack a bit
2013-03-22 04:33:20 +00:00
Mathias Agopian
30e5376bfd
am 50210b9a
: fix a typo that broke all screenshots
...
* commit '50210b9a8d19cb90fc283d8d99e46cd34ac17d2e':
fix a typo that broke all screenshots
2013-03-22 04:33:20 +00:00
Mathias Agopian
7133f8638e
Merge "improved CallStack a bit" into jb-mr2-dev
2013-03-22 04:15:33 +00:00
Mathias Agopian
50210b9a8d
fix a typo that broke all screenshots
...
Bug: 8450197
Change-Id: I5b986cc0ff9c5e689d06a51ba68ab537d03d1f3d
2013-03-21 21:14:10 -07:00
Mathias Agopian
5a120411f0
am 0188eeff
: Merge "only use glReadPixels() when needed when taking screenshots" into jb-mr2-dev
...
* commit '0188eeff1fecc3813ddb236be3e2b7a9ad156482':
only use glReadPixels() when needed when taking screenshots
2013-03-22 00:18:27 +00:00
Mathias Agopian
0188eeff1f
Merge "only use glReadPixels() when needed when taking screenshots" into jb-mr2-dev
2013-03-22 00:16:01 +00:00
Mathias Agopian
cab25d680e
improved CallStack a bit
...
- added a ctor that updates and dumps the stack immediately
- added a "logtag" parameter to dump()
Change-Id: Ie51c256071d282591752243bdb4f68cf9ff8829d
2013-03-21 17:12:40 -07:00
Mathias Agopian
d839908ecf
am 504e1f26
: Merge "initialize planeAlpha (to 0xFF) for the FB_TARGET" into jb-mr2-dev
...
* commit '504e1f2638f6a5d7ad7ce66a89eaaaba15b452db':
initialize planeAlpha (to 0xFF) for the FB_TARGET
2013-03-22 00:02:53 +00:00
Mathias Agopian
504e1f2638
Merge "initialize planeAlpha (to 0xFF) for the FB_TARGET" into jb-mr2-dev
2013-03-21 23:58:39 +00:00