Michael Wright
25be048729
Merge "Fix warning in logging string interpolation"
2014-06-10 03:12:19 +00:00
Michael Wright
d0a4a6234f
Fix warning in logging string interpolation
...
Change-Id: I86623083f68664d31ea277958837a4c2985037b4
2014-06-09 19:03:32 -07:00
Mark Salyzyn
8f515ce1c5
libgui: 64 bit compile issues (part deux)
...
- nsecs_t printed with PRId64
- int64_t/uint64_t print issues
- some size_t printing issues.
- missing argument to BQ_LOGV
Change-Id: I493f2b578e801dc38c44f8c536faa45266720402
2014-06-09 15:42:26 -07:00
Narayan Kamath
87947be618
Merge "Fix mips build for libbinder."
2014-06-04 14:32:59 +00:00
Narayan Kamath
2c68d380c9
Fix mips build for libbinder.
...
Mips specific code was using an uninitialized variable.
Change-Id: I445043c76ebfa420b26376ade60f8068b4ea0b11
2014-06-04 15:05:13 +01:00
Mark Salyzyn
b09b936d8e
am f0a24759
: am a28750ee
: Merge "binder: Turn on -Werror"
...
* commit 'f0a2475905786d5457e7af838ac714acbfdafa4f':
binder: Turn on -Werror
2014-06-03 20:54:48 +00:00
Mark Salyzyn
f0a2475905
am a28750ee
: Merge "binder: Turn on -Werror"
...
* commit 'a28750eec38c848230adfeef28725b29cc36a9da':
binder: Turn on -Werror
2014-06-03 20:48:35 +00:00
Mark Salyzyn
d4ecccfd20
binder: Turn on -Werror
...
Change-Id: I0ee785927a7ae5f731b02176b0b781b87c22a24e
2014-06-03 11:11:45 -07:00
Narayan Kamath
db1972bd8e
am 26063a91
: am f1dd859b
: Merge "x86_64: Align uint64_t/int64_t structure member to 8 bytes"
...
* commit '26063a9155ddd18d858cea7fac7c1ddf71e1bcb7':
x86_64: Align uint64_t/int64_t structure member to 8 bytes
2014-06-03 13:58:40 +00:00
Narayan Kamath
26063a9155
am f1dd859b
: Merge "x86_64: Align uint64_t/int64_t structure member to 8 bytes"
...
* commit 'f1dd859baa114995bcbcfb7119e939d0b4f45ed5':
x86_64: Align uint64_t/int64_t structure member to 8 bytes
2014-06-03 13:29:00 +00:00
Narayan Kamath
f1dd859baa
Merge "x86_64: Align uint64_t/int64_t structure member to 8 bytes"
2014-06-03 10:06:55 +00:00
Mark Salyzyn
edcf7f4d3a
binder: rm utils/Debug.h as unutilized
...
Change-Id: I52eb8b64b71cec7ffd4560e902daf358fda98b4a
2014-05-30 16:51:18 +00:00
Fengwei Yin
83e0e425c6
x86_64: Align uint64_t/int64_t structure member to 8 bytes
...
To make sure the stature which pass between 32/64bit process have
same memory layout for 32/64bit.
Signed-off-by: Fengwei Yin <fengwei.yin@intel.com>
Co-Authored-by: Narayan Kamath <narayan@google.com> (Unit test only.)
Change-Id: I1bc2d12cce41ec0bc484adcaf968f274bec75c12
2014-05-30 14:13:29 +01:00
Mark Salyzyn
b8b3c536f4
am ea3f1da9
: am 1ce5ecbe
: am 63645c69
: Merge "binder: rm utils/Debug.h"
...
* commit 'ea3f1da9013b33ecf3f3f8771393c1754a9aec59':
binder: rm utils/Debug.h
2014-05-29 21:09:57 +00:00
Mark Salyzyn
ea3f1da901
am 1ce5ecbe
: am 63645c69
: Merge "binder: rm utils/Debug.h"
...
* commit '1ce5ecbe3286380f5ff7ace289369ed006e9b40a':
binder: rm utils/Debug.h
2014-05-29 21:06:36 +00:00
Mark Salyzyn
1ce5ecbe32
am 63645c69
: Merge "binder: rm utils/Debug.h"
...
* commit '63645c69e03cf3862c52cfde6cbd5f5143ccd38a':
binder: rm utils/Debug.h
2014-05-29 20:29:32 +00:00
Mark Salyzyn
317ff37cf7
binder: rm utils/Debug.h
...
Change-Id: I16931919a26c16a0d701771c93fa7fe1c6f60ef8
2014-05-29 13:10:03 -07:00
Dan Stoza
3d5c8a98c1
Merge "SurfaceFlinger: Add sourceCrop to screenshot"
2014-05-28 18:31:40 +00:00
Aravind Akella
d9441e4c27
Surface maxDelay and isWakeUpSensor flag in Sensor.java.
...
Change-Id: Idd1e9045190beeca87b086b272e8cbf0bed05bae
2014-05-23 18:58:01 -07:00
Dan Stoza
c18790018b
SurfaceFlinger: Add sourceCrop to screenshot
...
Adds a sourceCrop Rect parameter to screenshot commands, which allows
clients to capture only a portion of the screen instead of the whole
screen.
Bug: 15137922
Change-Id: I629447573cd34ffb96334cde7ba02490b9ea06d8
2014-05-23 09:19:03 -07:00
Narayan Kamath
f8c66b4bee
am cfba3bf1
: am c9fcaf37
: Merge "Change InputMessage.motion.pointerSize to a uint32_t."
...
* commit 'cfba3bf1606dfdb1daf1be1c19176180660ae19d':
Change InputMessage.motion.pointerSize to a uint32_t.
2014-05-16 12:10:21 +00:00
Narayan Kamath
cfba3bf160
am c9fcaf37
: Merge "Change InputMessage.motion.pointerSize to a uint32_t."
...
* commit 'c9fcaf3751af078ad730913304431197e4d1ae80':
Change InputMessage.motion.pointerSize to a uint32_t.
2014-05-16 12:08:06 +00:00
Narayan Kamath
ed5fd384b7
Change InputMessage.motion.pointerSize to a uint32_t.
...
This ensures it's the same size in both 32 and 64 bit
processes and also brings it in line with struct
MotionEntry.
(cherry-picked from bc6001b026
)
Change-Id: I28e87050478920a54132efbbb8138076ebad1409
2014-05-16 12:53:16 +01:00
Aravind Akella
d763fc7822
am 47d871b2
: am d35e3af0
: Set default values for FifoMaxEventCount and ReservedEventCount.
...
* commit '47d871b2795f714499a34ffe85b67f8577883f7b':
Set default values for FifoMaxEventCount and ReservedEventCount.
2014-05-13 00:54:50 +00:00
Aravind Akella
47d871b279
am d35e3af0
: Set default values for FifoMaxEventCount and ReservedEventCount.
...
* commit 'd35e3af04d4b7e850a3b87b2211d1a3993f9b76f':
Set default values for FifoMaxEventCount and ReservedEventCount.
2014-05-13 00:50:40 +00:00
Aravind Akella
d35e3af04d
Set default values for FifoMaxEventCount and ReservedEventCount.
...
Change-Id: I4f610c2912ffe1697d1ffb99c556d1c88578466e
2014-05-12 17:15:59 -07:00
Etienne Le Grand
f63cbbf0e4
Merge "Add wake gesture in Sensor.cpp"
2014-05-12 19:38:13 +00:00
Greg Hackmann
f974bffb36
am 38c9e132
: am c1ffd351
: am bd20e551
: Merge "Use asynchronous lock/unlock API"
...
* commit '38c9e1327a5b24267c3dab5293bc9d7ada6e9fc9':
Use asynchronous lock/unlock API
2014-05-12 18:18:47 +00:00
Greg Hackmann
38c9e1327a
am c1ffd351
: am bd20e551
: Merge "Use asynchronous lock/unlock API"
...
* commit 'c1ffd351bc44483369271c11dd4c6391bba8c64c':
Use asynchronous lock/unlock API
2014-05-12 18:12:34 +00:00
Greg Hackmann
c1ffd351bc
am bd20e551
: Merge "Use asynchronous lock/unlock API"
...
* commit 'bd20e551f64234142e1146f9fa4b2dcebbd72122':
Use asynchronous lock/unlock API
2014-05-12 18:08:13 +00:00
Francis Hart
8f3960179c
Use asynchronous lock/unlock API
...
The gralloc API now provides a way for using lock/unlock with the Android
explicit synchronisation concept. This changes updates the GraphicBuffer class
to also expose this functionality, and updates the Surface class to make use of
in line with the dequeueBuffer/queueBuffer mechanism.
This new behaviour is dependent on GRALLOC_MODULE_API_VERSION_0_3. If the local
gralloc module does not support this then the existing synchronous lock/unlock
mechanism will be used.
Change-Id: I8c3fd9592e0c5400ac9be84450f55a77cc0bbdc5
2014-05-12 09:13:03 -07:00
Greg Hackmann
2f3dca149a
am 9493d492
: am 9eb142e3
: am a9d49f99
: Merge "Revert "Use asynchronous lock/unlock API""
...
* commit '9493d4924a59f14b698389386337a9c07a7ea3c4':
Revert "Use asynchronous lock/unlock API"
2014-05-09 22:00:04 +00:00
Greg Hackmann
02528cf6aa
am 4b46776f
: am 8a6cd189
: am f60564a1
: Merge "Use asynchronous lock/unlock API"
...
* commit '4b46776ff88c5a365700b88e8b2b04e1b2c77e6e':
Use asynchronous lock/unlock API
2014-05-09 21:54:48 +00:00
Greg Hackmann
9493d4924a
am 9eb142e3
: am a9d49f99
: Merge "Revert "Use asynchronous lock/unlock API""
...
* commit '9eb142e34a5bc11508c0bd6f60ad3933c60aa530':
Revert "Use asynchronous lock/unlock API"
2014-05-09 21:51:51 +00:00
Greg Hackmann
9eb142e34a
am a9d49f99
: Merge "Revert "Use asynchronous lock/unlock API""
...
* commit 'a9d49f99e69d8fc0e60b492b131322c96f47a232':
Revert "Use asynchronous lock/unlock API"
2014-05-09 21:46:44 +00:00
Greg Hackmann
a9d49f99e6
Merge "Revert "Use asynchronous lock/unlock API""
2014-05-09 21:39:07 +00:00
Greg Hackmann
53ec72523a
Revert "Use asynchronous lock/unlock API"
...
This reverts commit 378ef07760
.
Change-Id: I1de5ab973b5383633e75924fe90ac3ca8216c36a
2014-05-09 21:36:48 +00:00
Greg Hackmann
4b46776ff8
am 8a6cd189
: am f60564a1
: Merge "Use asynchronous lock/unlock API"
...
* commit '8a6cd189034ec4709a66e581b41deba56c028291':
Use asynchronous lock/unlock API
2014-05-09 21:13:16 +00:00
Greg Hackmann
8a6cd18903
am f60564a1
: Merge "Use asynchronous lock/unlock API"
...
* commit 'f60564a13e917877c76c99294194a621d872076b':
Use asynchronous lock/unlock API
2014-05-09 21:08:39 +00:00
Greg Hackmann
f60564a13e
Merge "Use asynchronous lock/unlock API"
2014-05-09 21:02:21 +00:00
Ying Wang
f736f2f5da
am 114d71ce
: am 214b4a61
: am 8155ce81
: Merge "Remove unused LOCAL_LDLIBS."
...
* commit '114d71ce7c6ec1ce0327c812a42966c4258b4a46':
Remove unused LOCAL_LDLIBS.
2014-05-08 18:23:58 +00:00
Etienne Le Grand
e284a90f50
Add wake gesture in Sensor.cpp
...
Change-Id: Ifb1744acffc2d57da43112fb9966261e8246d6de
2014-05-07 19:49:05 -07:00
Ying Wang
114d71ce7c
am 214b4a61
: am 8155ce81
: Merge "Remove unused LOCAL_LDLIBS."
...
* commit '214b4a61ac3fa63e35c79157d3acf0d8b692b3ac':
Remove unused LOCAL_LDLIBS.
2014-05-07 23:01:19 +00:00
Ying Wang
214b4a61ac
am 8155ce81
: Merge "Remove unused LOCAL_LDLIBS."
...
* commit '8155ce81d4b150e6e453d9443f9fea4cc2c546d2':
Remove unused LOCAL_LDLIBS.
2014-05-07 22:54:27 +00:00
Ying Wang
4a793fe952
Remove unused LOCAL_LDLIBS.
...
Change-Id: I62904c410a66f256da8253764577acae18f964f8
2014-05-07 15:26:38 -07:00
Narayan Kamath
c6e0c64632
Merge "Fix InputEvent_test."
2014-05-07 08:16:44 +00:00
Dan Stoza
dd02391756
Merge "Enable changing display configuration"
2014-05-06 21:08:16 +00:00
Narayan Kamath
b8290c2642
Fix InputEvent_test.
...
Axis 0 sets the MSB and Axis 63 sets the LSB, and not
the other way round like the test expects.
This was broken by commit 38dcdff308
which moved this
code over to using BitSet.
Change-Id: I63a72abe7ce14720b0bf26e5f6d651bb42452f79
2014-05-06 11:42:16 +01:00
Narayan Kamath
4522f5749d
Merge "Change InputMessage.motion.pointerSize to a uint32_t."
2014-05-06 10:00:57 +00:00
Dan Stoza
7f7da32569
Enable changing display configuration
...
This allows querying and switching display device configurations
through the ISurfaceComposer/SurfaceComposerClient interface.
Bug: 14320401
Change-Id: I8c22165698950e5da32204c1c4da92122f91a715
2014-05-05 16:45:26 -07:00