Mathias Agopian
a7121cf44b
Merge "get rid of Surface::getISurfaceTexture()"
2013-02-21 23:23:21 +00:00
Ed Heyl
b2b7356645
Merge remote-tracking branch 'goog/jb-mr2-release'
2013-02-20 13:47:29 -08:00
Mathias Agopian
cf0b8c85fb
get rid of Surface::getISurfaceTexture()
...
this was there just for legacy reasons.
Change-Id: I0a48d6e04d7efa65033f9f10c91bba557f16ae8b
2013-02-19 18:24:40 -08:00
Eino-Ville Talvala
e88a85e0d0
Fixes to native app ops services
...
Bug: 8181262
Change-Id: I3d3f20453f6c6f2756c988363c5b5453ef309cb6
2013-02-19 18:10:05 -08:00
The Android Automerger
3359cc00bf
merge in jb-mr2-release history after reset to master
2013-02-19 09:51:24 -08:00
Mathias Agopian
c4905eb49d
fix build: SurfaceTextureClient to Surface rename
...
Change-Id: I0041e6f49bc637bc52161c83f0bd44101246f480
2013-02-15 16:34:04 -08:00
Mathias Agopian
f25c5086cf
fix build: SurfaceTextureClient to Surface rename
...
Change-Id: I54d68241f1080eef640aefe71f33912ad79345ef
2013-02-15 14:59:09 -08:00
Mathias Agopian
b7daa0dade
fix build: SurfaceTextureClient to Surface rename
...
Change-Id: Ibcf98337940f9195bcff7b5e8bddb6e912e65163
2013-02-15 14:48:52 -08:00
Mathias Agopian
e3c697fb92
Refactoring: Rename SurfaceTextureClient to Surface
...
Change-Id: Ibed34175ae273608393aaa5f0a7df207dc40d709
2013-02-14 19:19:05 -08:00
Mathias Agopian
82052cff2c
Merge "remove access ANDROID_VIEW_SURFACE_JNI_ID"
2013-02-14 20:28:24 +00:00
Mathias Agopian
9a86704c22
Merge "get rid of Surface identity and token"
2013-02-14 20:24:37 +00:00
Elliott Hughes
bbb7322c36
am 45b0e435
: Merge "Simplify OpenGL TLS access on ARM."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '45b0e4350d3404bd194edc569e36ecca017c3d76':
Simplify OpenGL TLS access on ARM.
2013-02-14 11:42:06 -08:00
Elliott Hughes
45b0e4350d
Merge "Simplify OpenGL TLS access on ARM."
2013-02-14 18:31:20 +00:00
The Android Automerger
a911f33cc8
merge in jb-mr2-release history after reset to master
2013-02-14 05:55:53 -08:00
Elliott Hughes
288870ebc3
Simplify OpenGL TLS access on ARM.
...
bionic now assumes the TLS register is available, so OpenGL can too.
Change-Id: If2b56a4c08de9f887759b78f70022026a181dc47
2013-02-13 17:30:54 -08:00
Alex Ray
36ebf51a1b
atrace: add HAL tag
...
Change-Id: Idfd4f2075e8cd82833ef06d4487423c62b59fe11
2013-02-13 15:30:31 -08:00
Mathias Agopian
6d9b9dfd55
remove access ANDROID_VIEW_SURFACE_JNI_ID
...
Change-Id: I0ef474ed9be2cd26fa520ef871ffcf21a25e4994
2013-02-13 15:27:08 -08:00
Mathias Agopian
ac9fa427d4
get rid of Surface identity and token
...
we use the IBinder instead.
Change-Id: I4aa0b58869ba43f19980013620051e5a261b062d
2013-02-13 15:27:08 -08:00
Jamie Gennis
b997f6ef0f
Merge changes I50831d4e,I5360aebe
...
* changes:
flatland: remove an unneeded #include
libgui: disallow NULL Fence pointers
2013-02-13 23:22:04 +00:00
The Android Automerger
507b234e9b
merge in jb-mr2-release history after reset to master
2013-02-13 05:55:55 -08:00
Jamie Gennis
c52e16cbf9
flatland: remove an unneeded #include
...
Change-Id: I50831d4efd543664ff7df7aaef35d842aebf1bd6
2013-02-12 18:15:38 -08:00
Jamie Gennis
1df8c34585
libgui: disallow NULL Fence pointers
...
This change eliminates the uses of a NULL sp<Fence> indicating that no waiting
is required. Instead we use a non-NULL but invalid Fence object for which the
wait methods will return immediately.
Bug: 7892871
Change-Id: I5360aebe3090422ef6920d56c99fc4eedc642e48
2013-02-12 18:15:38 -08:00
Dianne Hackborn
c8a1e10fd2
Merge "Implement issue #6646859 : 4K!!!! 4K!!!! 4K!!!!"
2013-02-12 23:54:28 +00:00
Dianne Hackborn
6303d06ece
Implement issue #6646859 : 4K!!!! 4K!!!! 4K!!!!
...
Change-Id: I1bb630c58d0d41446b726de1b9d2c3875fcbbceb
2013-02-12 15:36:31 -08:00
Dianne Hackborn
6f965e02d0
Merge "App ops: new native access API."
2013-02-12 23:29:05 +00:00
Dianne Hackborn
5da5ca520c
App ops: new native access API.
...
This is to help implementation of bug #8181262 and maybe
bug #8181261
Note the current code has not yet been tested; it is only
known to compile at this point.
Change-Id: I489674c96d0d3fc0ddacc92611931a19a9ee5230
2013-02-12 15:13:37 -08:00
The Android Automerger
1c5c60c370
merge in jb-mr2-release history after reset to master
2013-02-12 07:10:56 -08:00
Jesse Hall
2b6694f5f0
Force a specific locale for sorting
...
Avoids irrelevant output differences based on the user's locale. The
current output files were generated with a C or POSIX locale, and sort
differently under en_US.UTF-8.
Change-Id: I0dd85475e9ee2d58e7fa9fe2a4f86ad5c8142e00
2013-02-11 16:12:48 -08:00
Jamie Gennis
351c294173
Merge changes I8bded1ea,I7478293e
...
* changes:
SurfaceFlinger: add win anim frame time tracking
SurfaceFlinger: remove a driver bug workaround
2013-02-11 19:48:18 +00:00
The Android Automerger
b5d7409bdb
merge in jb-mr2-release history after reset to master
2013-02-11 07:11:15 -08:00
Arve Hjønnevåg
b7c1ebc3fb
Merge "Do not use su to run the df command in bugreports"
2013-02-09 01:41:09 +00:00
Ken Sumrall
8f75fa7bcf
Do not use su to run the df command in bugreports
...
User builds do not have su, so when the bugreport attempts to report
disk free space, the command fails and nothing is reported. However,
the df command does not need to be run as root to report free space,
so just run the command directly.
Change-Id: Ic7deb696f293e772ddf28eacfe16e4250af9a9f3
2013-02-08 17:35:58 -08:00
James Dong
9921d49a44
Merge "Adds some OpenMAX 1.1.2 IL extension headers."
2013-02-09 00:47:00 +00:00
Jamie Gennis
4b0eba949c
SurfaceFlinger: add win anim frame time tracking
...
This change makes the 'dumpsys SurfaceFlinger --latency' command with no extra
args dump the frame timestamp data for the most recent frames that
SurfaceFlinger generated that included window animation transaction changes.
Change-Id: I8bded1ea08a4cddefef0aa955401052bb9107c90
2013-02-08 13:32:21 -08:00
Mathias Agopian
4527b91960
only disable hwc when alpha < 1.0
...
Bug: 8149181
Change-Id: Ib3c7a44f04871e020adceeae16d002141ac758d4
2013-02-07 16:48:03 -08:00
Mathias Agopian
5fe58b8ba6
only disable hwc when alpha < 1.0
...
Bug: 8149181
Change-Id: Ib3c7a44f04871e020adceeae16d002141ac758d4
2013-02-07 16:22:50 -08:00
Kunter Gultekin
203f89a75a
Adds some OpenMAX 1.1.2 IL extension headers.
...
Includes index and video extension headers
in order to support vpx specific parameters
and enable vpx encoder.
Note that existing (seemingly modified) version
of OMX_Video.h semantically conflicts with
official OMX_VideoExt.h because former includes
OMX_Video_CodingVPX as OMX_VIDEO_CODINGTYPE
whereas official extension headers denote
it as OMX_VIDEO_CodingVP8 within
OMX_VIDEO_CODINGEXTTYPE.
Change-Id: Ibab9663fcbc9c406a2cfb4bf79fe21e3b01a6e66
Signed-off-by: Kunter Gultekin <kuntergultekin@google.com>
2013-02-07 12:16:05 -08:00
The Android Automerger
1c09c92f2b
merge in jb-mr2-release history after reset to master
2013-02-06 07:10:52 -08:00
Mathias Agopian
9f8386e111
Add support for plane-alpha in HWC
...
Change-Id: I218e7dd5f23de535aabce61e993002ab6cb46cdd
2013-02-05 14:46:32 -08:00
Jesse Hall
6cf6ba69f0
Merge "Remove unused HWCLayer::setPerFrameDefaultState()"
2013-02-05 16:02:51 +00:00
Jamie Gennis
33c544c4d3
SurfaceFlinger: remove a driver bug workaround
...
Change-Id: I7478293e87899d6e467db8c2f9e295935c8b1d4e
2013-02-04 14:43:07 -08:00
The Android Automerger
ed123976ee
merge in jb-mr2-release history after reset to master
2013-02-04 07:10:46 -08:00
Nick Kralevich
c4fd05b172
Revert "try to fix win_sdk build."
...
A better change was checked into system/core. See commit
941daef629bd571032851edf7ae1dce24266640e
This reverts commit fa99d30ec7
.
2013-02-02 18:09:15 -08:00
Nick Kralevich
2b7b349b56
Merge "try to fix win_sdk build."
2013-02-02 00:09:59 +00:00
Nick Kralevich
fa99d30ec7
try to fix win_sdk build.
...
Change-Id: I55e78e339874a6d6a3381c2550556b65c7ec1ca0
2013-02-01 16:09:23 -08:00
Michael Wright
cf89c76ee0
Merge "Add keycodes for brightness up/down"
2013-02-01 22:36:07 +00:00
Jesse Hall
519191670e
am 873ab60e
: am 75b83e4d
: Merge "Gfx-3d: fix GetProcAddress in egl extention"
...
# By luliuhui
# Via Android Git Automerger (1) and others
* commit '873ab60e94811488caea1906eb98133329a3e28f':
Gfx-3d: fix GetProcAddress in egl extention
2013-02-01 14:26:21 -08:00
Jesse Hall
873ab60e94
am 75b83e4d
: Merge "Gfx-3d: fix GetProcAddress in egl extention"
...
# By luliuhui
# Via Gerrit Code Review (1) and Shuo Gao (1)
* commit '75b83e4dc7d8055a70e590f868f7307fdaf656a7':
Gfx-3d: fix GetProcAddress in egl extention
2013-02-01 12:37:25 -08:00
Jesse Hall
75b83e4dc7
Merge "Gfx-3d: fix GetProcAddress in egl extention"
2013-02-01 19:33:16 +00:00
Michael Wright
e85650d603
Add keycodes for brightness up/down
...
Change-Id: I8ed56b510c46f372df0fc71e1735c72058efc677
2013-01-31 15:14:54 -08:00