Vinod Krishnan
57ec0ec10d
am b017932e: am 035839c6: Adding Feature for HRM
...
* commit 'b017932e4a659f637085e37e09e3aa20849d62b8':
Adding Feature for HRM
2014-05-16 01:47:33 +00:00
Vinod Krishnan
b017932e4a
am 035839c6: Adding Feature for HRM
...
* commit '035839c6c291e831c51eea1e9d8b54f9e2382707':
Adding Feature for HRM
2014-05-16 01:44:21 +00:00
Andy Hung
574b641173
Merge "Allow OMX pointer types to be forced to 32 bits"
2014-05-15 03:21:01 +00:00
Nick Kralevich
2f9a3e73bf
am 449e0dbe: am fc1b9fa3: am b66ee6c3: Merge "Ensure that app lib symlinks are correctly labeled when created."
...
* commit '449e0dbe94126553c96cece21da54b40a6880f11':
Ensure that app lib symlinks are correctly labeled when created.
2014-05-13 20:41:41 +00:00
Nick Kralevich
449e0dbe94
am fc1b9fa3: am b66ee6c3: Merge "Ensure that app lib symlinks are correctly labeled when created."
...
* commit 'fc1b9fa3178d1452629d75e2afa1a9d72f03fc1c':
Ensure that app lib symlinks are correctly labeled when created.
2014-05-13 20:38:20 +00:00
Nick Kralevich
fc1b9fa317
am b66ee6c3: Merge "Ensure that app lib symlinks are correctly labeled when created."
...
* commit 'b66ee6c32d87961d5b9f0be97b5fdccb928fd453':
Ensure that app lib symlinks are correctly labeled when created.
2014-05-13 20:35:38 +00:00
Nick Kralevich
b66ee6c32d
Merge "Ensure that app lib symlinks are correctly labeled when created."
2014-05-13 20:32:19 +00:00
Stephen Smalley
3a98389263
Ensure that app lib symlinks are correctly labeled when created.
...
At present, the app lib symlinks are created before setting
the package directory security context, and therefore default
to system_data_file. Upon a later restorecon_recursive,
they are relabeled to the same type as the package directory,
e.g. app_data_file. Avoid this inconsistency by setting the
package directory security context before creating the symlink
so that it inherits the same security context.
Change-Id: I1ee6ccd8a2aa63a4d2efda67f313c97932235911
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2014-05-13 12:59:40 -04:00
Vinod Krishnan
035839c6c2
Adding Feature for HRM
...
Change-Id: Iaec58df9c27753ce2c39c6bbe3735f1894684cb5
2014-05-12 18:05:38 -07: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
Greg Hackmann
bd20e551f6
Merge "Use asynchronous lock/unlock API"
2014-05-12 18:02:00 +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
Andy McFadden
9f708e1094
am 39cde06a: (-s ours) am b6601961: Merge "DO NOT MERGE Add "dumpsys SurfaceFlinger --dispsync"" into klp-modular-dev
...
* commit '39cde06aee5bc9338b1ed26513233cb54e9b446d':
DO NOT MERGE Add "dumpsys SurfaceFlinger --dispsync"
2014-05-09 18:00:54 +00:00
Andy McFadden
39cde06aee
am b6601961: Merge "DO NOT MERGE Add "dumpsys SurfaceFlinger --dispsync"" into klp-modular-dev
...
* commit 'b66019615da8750588f1233a77b9c686b0a248c3':
DO NOT MERGE Add "dumpsys SurfaceFlinger --dispsync"
2014-05-09 17:57:12 +00:00
Andy McFadden
b66019615d
Merge "DO NOT MERGE Add "dumpsys SurfaceFlinger --dispsync"" into klp-modular-dev
2014-05-09 17:54:29 +00:00
Andy McFadden
a7f75c0dfb
Merge "Add "dumpsys SurfaceFlinger --dispsync""
2014-05-09 17:49:33 +00:00
Andy McFadden
232f5bc675
DO NOT MERGE Add "dumpsys SurfaceFlinger --dispsync"
...
Dumps the current DispSync state.
Bug 14651879
(this is a near-cherrypick of Ide4e6dbd58b117bc1a6b97b57d10cd92ec86dc84)
Change-Id: I6e6c8452ede5c2d5098db1b884d28226e77d9a03
2014-05-09 10:49:11 -07:00
Eino-Ville Talvala
fc4c0933ae
am 127b798f: (-s ours) am 0b42423c: DO NOT MERGE: Add standard android.hardware.camera.external permission file.
...
* commit '127b798ff9bd6a76c3a5a8816b59a92586e355d3':
DO NOT MERGE: Add standard android.hardware.camera.external permission file.
2014-05-09 15:55:44 +00:00
Eino-Ville Talvala
127b798ff9
am 0b42423c: DO NOT MERGE: Add standard android.hardware.camera.external permission file.
...
* commit '0b42423c59a12674d954079a9eb1f58a55fc55a6':
DO NOT MERGE: Add standard android.hardware.camera.external permission file.
2014-05-09 15:48:02 +00:00
Andy McFadden
c751e92c56
Add "dumpsys SurfaceFlinger --dispsync"
...
Dumps the current DispSync state.
Bug 14651879
Change-Id: Ide4e6dbd58b117bc1a6b97b57d10cd92ec86dc84
2014-05-08 16:14:41 -07:00
Andy McFadden
d0ed571be0
Merge "Add mutex"
2014-05-08 23:10:31 +00:00
Andy McFadden
150ecd8c1b
Add mutex
...
Change-Id: I81072031e74a5cca8384e4e8bce4babf2187d8bb
2014-05-08 14:56:50 -07:00
Eino-Ville Talvala
0b42423c59
DO NOT MERGE: Add standard android.hardware.camera.external permission file.
...
Any device that lists the android.hardware.camera.external feature
must also list android.hardware.camera.any feature.
Change-Id: I7accd27501e66e99a8addaeed890df709208fd13
2014-05-08 21:48:57 +00:00
Eino-Ville Talvala
8090e6ae32
Merge "Add standard android.hardware.camera.external permission file."
2014-05-08 21:33:54 +00:00
Eino-Ville Talvala
72b9113d26
Add standard android.hardware.camera.external permission file.
...
Any device that lists the android.hardware.camera.external feature
must also list android.hardware.camera.any feature.
Change-Id: I7accd27501e66e99a8addaeed890df709208fd13
2014-05-08 11:43:53 -07: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
8155ce81d4
Merge "Remove unused LOCAL_LDLIBS."
2014-05-07 22:48:40 +00:00
Ying Wang
4a793fe952
Remove unused LOCAL_LDLIBS.
...
Change-Id: I62904c410a66f256da8253764577acae18f964f8
2014-05-07 15:26:38 -07:00
Andy Hung
abec6ad341
Allow OMX pointer types to be forced to 32 bits
...
Enabled by #define. Is used for 64 bit compilation to
force structs to use 32 bit pointer values for eventual
IPC to 32 bit OMX codecs.
May change later if we support 64 bit OMX codecs.
Change-Id: I0d12f86774f6f7ce9c39c8abea5d51988a7eef11
Signed-off-by: Andy Hung <hunga@google.com>
2014-05-07 11:12:34 -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