Svetoslav
cf8684b206
Merge "Adding render stats APIs to UiAutomation (framework native)."
2014-04-10 19:32:44 +00:00
Svetoslav
d85084b2b6
Adding render stats APIs to UiAutomation (framework native).
...
bug:12927198
Change-Id: Ibb1c07f7d89e11281e5c1f27f412a29ac6f9c4ab
2014-04-10 12:32:19 -07:00
Wonsik Kim
4cd47b2e0e
Merge "Fix sideband stream issues"
2014-04-10 00:35:24 +00:00
Nick Kralevich
db1d823b4c
am 236ed6d3
: am 82fb5809
: Merge "restorecon the profile directory."
...
* commit '236ed6d3d376b12573cca6878d3b5013371f5bc8':
restorecon the profile directory.
2014-04-09 19:49:43 +00:00
Nick Kralevich
236ed6d3d3
am 82fb5809
: Merge "restorecon the profile directory."
...
* commit '82fb58095524c833b0470c4b236aa8a70acf2a0f':
restorecon the profile directory.
2014-04-09 19:46:14 +00:00
Nick Kralevich
82fb580955
Merge "restorecon the profile directory."
2014-04-09 19:41:26 +00:00
Stephen Smalley
a240733137
restorecon the profile directory.
...
This is required so that it will be assigned the correct SELinux
security context on first creation by installd.
Bug: 13927667
Change-Id: I4857d031f9e7e60d48b8c72fcb22a81b3a2ebaaa
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2014-04-09 19:08:20 +00:00
John Reck
10f91bbf7d
Merge "Temporarily turn on callstack logging"
2014-04-09 17:06:06 +00:00
John Reck
db4488565a
Temporarily turn on callstack logging
...
Bug: 13745587
Temporarily turn on callstack logging for gl_no_context() to
try and track down font cache corruption
Change-Id: I657ee85e811746441c5ce0ffe5adbfb3fb011d4c
2014-04-08 15:05:54 -07:00
Dan Stoza
fb9bf8725d
Merge "BufferQueue: Remove Bn version of create*"
2014-04-08 20:25:54 +00:00
Dan Stoza
b3d0bdf0db
BufferQueue: Remove Bn version of create*
...
It turns out that there's no reason to have both I* and Bn* versions
of the createBufferQueue method, so I removed the Bn* version.
Change-Id: I66aeb09e10458ae540ddf1f38d2d0154ea8f315b
2014-04-07 17:00:26 -07:00
Dan Stoza
5603a2fbbd
Remove deprecated BufferQueue constructor
...
Bug: 13415624
Change-Id: I153b5470b21832cebe3c617d28a4ab9c9bf3b362
2014-04-07 13:41:37 -07:00
Andy McFadden
fc9aeb8590
am 4215f434
: am 6dbcebd0
: Merge "Always release a buffer" into klp-modular-dev
...
* commit '4215f434187d518bf8c9807c9a18a7e0b617f7d2':
Always release a buffer
2014-04-07 16:58:48 +00:00
Andy McFadden
4215f43418
am 6dbcebd0
: Merge "Always release a buffer" into klp-modular-dev
...
* commit '6dbcebd0430e026fd5d99ba4b4f005bfaa9b8e2b':
Always release a buffer
2014-04-07 16:52:13 +00:00
Andy McFadden
6dbcebd043
Merge "Always release a buffer" into klp-modular-dev
2014-04-07 16:46:37 +00:00
Wonsik Kim
afe3081e0e
Fix sideband stream issues
...
- Notify a listener when sideband stream is set
- Mark a layer as visible when sideband stream is set, even though
no buffer is queued.
Change-Id: I9652bf530f2b5ce331533ec1bb3b10a815ca191c
2014-04-07 15:59:22 +09:00
Etienne Le Grand
2e1f4b5212
am 75b33203
: am 4369a4eb
: Revert "Add stringType and requiredPermission to sensors, effectively adding permission checking for sensors"
...
* commit '75b332037f6197acb239bfbbf2ac09adb31e9971':
Revert "Add stringType and requiredPermission to sensors, effectively adding permission checking for sensors"
2014-04-05 17:05:44 +00:00
Etienne Le Grand
75b332037f
am 4369a4eb
: Revert "Add stringType and requiredPermission to sensors, effectively adding permission checking for sensors"
...
* commit '4369a4ebd5ae7567e7075bc82830b83178099ed5':
Revert "Add stringType and requiredPermission to sensors, effectively adding permission checking for sensors"
2014-04-05 09:06:00 +00:00
Etienne Le Grand
30d6fd6b28
Revert "Add stringType and requiredPermission to sensors, effectively adding permission checking for sensors"
...
This reverts commit c57a019e11
.
Change-Id: I3540565bc3e56a32cf3b176a29216cf68bb763b2
(cherry picked from commit 4369a4ebd5
)
2014-04-05 06:13:41 +00:00
Etienne Le Grand
4369a4ebd5
Revert "Add stringType and requiredPermission to sensors, effectively adding permission checking for sensors"
...
This reverts commit c57a019e11
.
Change-Id: I3540565bc3e56a32cf3b176a29216cf68bb763b2
2014-04-05 05:02:22 +00:00
Etienne Le Grand
33458f72e1
am 00f4dde1
: am c57a019e
: Add stringType and requiredPermission to sensors, effectively adding permission checking for sensors
...
* commit '00f4dde1aa88576811bca79bc8242e1fc1edb333':
Add stringType and requiredPermission to sensors, effectively adding permission checking for sensors
2014-04-05 03:53:51 +00:00
Etienne Le Grand
00f4dde1aa
am c57a019e
: Add stringType and requiredPermission to sensors, effectively adding permission checking for sensors
...
* commit 'c57a019e117117c5a76c772970b26cd0f5db8c6a':
Add stringType and requiredPermission to sensors, effectively adding permission checking for sensors
2014-04-05 01:52:28 +00:00
Ruchi Kandoi
4098f03d5c
Revert "SurfaceFlinger: send VSYNC power hints to IPowerManager"
...
This reverts commit d469a1c328
.
2014-04-04 18:09:30 -07:00
Etienne Le Grand
c57a019e11
Add stringType and requiredPermission to sensors, effectively adding permission checking for sensors
...
Change-Id: If0f3dbdb5d2e9378e1fed4614baee4e750d0c850
2014-04-04 16:31:09 -07:00
Andy McFadden
87a6784780
Always release a buffer
...
In GLConsumer's updateAndReleaseLocked(), we must release either
the previously-acquired buffer or the newly-acquired buffer.
Bug 13755224
Change-Id: I96adc255400ed008ba6e6ac1725ab3514c7cc8ba
2014-04-04 15:37:08 -07:00
Ruchi Kandoi
d469a1c328
SurfaceFlinger: send VSYNC power hints to IPowerManager
...
VSYNC power hints are now sent via binder to IPowerManager.
SurfaceFlinger no longer loads a second copy of the PowerHAL.
VSYNC power hints are sent in batches and not on per frame basis.
Change-Id: Icc2eee5df56135bd24dc244a84e7c12dd5511fec
2014-04-04 20:22:31 +00:00
John Spurlock
9ae71b0060
am 17251cd4
: am ad98ad04
: Add ACONFIGURATION_UI_MODE_TYPE_WATCH to configuation enum.
...
* commit '17251cd445cf80cfb6085a1b0b317cd85ad5be00':
Add ACONFIGURATION_UI_MODE_TYPE_WATCH to configuation enum.
2014-04-04 19:34:07 +00:00
John Spurlock
17251cd445
am ad98ad04
: Add ACONFIGURATION_UI_MODE_TYPE_WATCH to configuation enum.
...
* commit 'ad98ad0493625578f19c727576d02725b82f927c':
Add ACONFIGURATION_UI_MODE_TYPE_WATCH to configuation enum.
2014-04-04 19:28:07 +00:00
Mark Salyzyn
cece164b23
native gui: 64-bit compile issues
...
Change-Id: I45f605ff3759fb7ae9f0a6425d557d195f93281e
2014-04-04 10:15:54 -07:00
Adam Connors
d12a9d27b3
Merge "Add android.software.managedprofiles feature flag."
2014-04-04 14:40:56 +00:00
Greg Hackmann
786e26a886
am 3b1cb037
: am 27f8840f
: Merge "make struct Event layout consistent on 32/64-bit"
...
* commit '3b1cb037eea56dba0d134c6858f8ddc0f9743ff8':
make struct Event layout consistent on 32/64-bit
2014-04-04 01:53:51 +00:00
Greg Hackmann
3b1cb037ee
am 27f8840f
: Merge "make struct Event layout consistent on 32/64-bit"
...
* commit '27f8840f228abfe5e2458a261ce5403871495a54':
make struct Event layout consistent on 32/64-bit
2014-04-04 00:08:11 +00:00
John Spurlock
ad98ad0493
Add ACONFIGURATION_UI_MODE_TYPE_WATCH to configuation enum.
...
Bug:13395758
Change-Id: Iecdae299bfd030f86145d02fa7860374b5a40a74
2014-04-03 16:39:17 -04:00
Dianne Hackborn
f74865eb52
Update to follow interface change.
...
Change-Id: I3ef37a32144e79b481af1b12c89531f3757689ef
2014-04-03 12:06:48 -07:00
Glenn Kasten
18b94aa848
am fb3bbd1d
: am d2f76332
: Merge "AArch64: Correction to OMX_U32 and OMX_S32"
...
* commit 'fb3bbd1df323c24dc10c095f29ee8010fc3d1df0':
AArch64: Correction to OMX_U32 and OMX_S32
2014-04-03 17:22:56 +00:00
Glenn Kasten
fb3bbd1df3
am d2f76332
: Merge "AArch64: Correction to OMX_U32 and OMX_S32"
...
* commit 'd2f7633277dd13ac269adb51c4e7a85746e6c599':
AArch64: Correction to OMX_U32 and OMX_S32
2014-04-03 17:14:50 +00:00
Greg Hackmann
27f8840f22
Merge "make struct Event layout consistent on 32/64-bit"
2014-04-03 17:07:09 +00:00
Glenn Kasten
d2f7633277
Merge "AArch64: Correction to OMX_U32 and OMX_S32"
2014-04-03 17:00:59 +00:00
Narayan Kamath
7f4fe6e586
am d09b2acd
: am 033bdd72
: Merge "Remove global variables from ProcessState."
...
* commit 'd09b2acdc8ca706c65984956e61c0bb333cee992':
Remove global variables from ProcessState.
2014-04-03 16:56:29 +00:00
Narayan Kamath
d09b2acdc8
am 033bdd72
: Merge "Remove global variables from ProcessState."
...
* commit '033bdd72f9f32f4bd3d282750bdc0dcfbb469959':
Remove global variables from ProcessState.
2014-04-03 14:11:31 +00:00
Narayan Kamath
033bdd72f9
Merge "Remove global variables from ProcessState."
2014-04-03 13:59:28 +00:00
Narayan Kamath
162ea0e9e8
Remove global variables from ProcessState.
...
These weren't really being used and they make it
very hard to reason about who looks at command line
arguments.
Processes started via app_process (this includes all
zygote forks and the system_server) can get information
about command line arguments from the AndroidRuntime
class, which is available via a call to
AndroidRuntime::getRuntime.
bug: 13647418
Change-Id: I6f92680c3619a68c6d4b0995db4cdc9adc788e36
2014-04-03 12:29:44 +00:00
Michael Wright
149a45c840
Merge "Misc. buttons aren't gamepad keys."
2014-04-02 23:01:21 +00:00
Michael Wright
0516ed85c8
Misc. buttons aren't gamepad keys.
...
BUTTON_[1-9] are intended to be misc. buttons so the kernel will
assign them to non-gamepad devices. As such, we shouldn't treat them
as belonging to gamepads at all.
Bug: 13432364
Change-Id: Ida52ec45dadb53df1a9d36ac3ab212a2d2b56359
2014-04-02 15:59:11 -07:00
Ruchi Kandoi
ca13fa7dd4
PowerManager: add powerHint binder method
...
Change-Id: Ide1d50bb1580698b25296fbfc1cc63c3b21a00bc
2014-04-02 21:24:01 +00:00
Marcus Oakland
849de60c1e
AArch64: Correction to OMX_U32 and OMX_S32
...
The types of OMX_U32 and OMX_S32 were appropriate to a 32-bit system
but were not appropriate to a 64-bit system. They have been changed to
make them portable between the two systems. With this change and a
change to frameworks/av/media/libstagefright/foundation/AString.cpp,
the android.media.cts.DecoderTest#testFlush CTS test passes.
Change-Id: I8e16c7169f54599c23fea71585b531e48541c78a
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
2014-04-02 11:20:01 -07:00
Glenn Kasten
e6ef753ef6
am fc1544d5
: am 17b5ca1e
: Merge "opengl: fix UAL conformity"
...
* commit 'fc1544d52d1232ccdf57a05704a013bad784f8f6':
opengl: fix UAL conformity
2014-04-02 16:27:10 +00:00
Glenn Kasten
fc1544d52d
am 17b5ca1e
: Merge "opengl: fix UAL conformity"
...
* commit '17b5ca1e665a1bbe17387b36fcce8f6b52513d5e':
opengl: fix UAL conformity
2014-04-02 16:24:06 +00:00
Glenn Kasten
17b5ca1e66
Merge "opengl: fix UAL conformity"
2014-04-02 16:15:59 +00:00
Wonsik Kim
9cfa49c954
Merge "Declare ownership of native_handle_t object"
2014-04-02 06:13:57 +00:00