OSDN Git Service
Tim Kilbourn [Mon, 14 Apr 2014 22:37:20 +0000 (15:37 -0700)]
Add KEYCODE_PAIRING.
Used for initiating a peripheral pairing mode.
Change-Id: I7e8439d27491ccc72d045cabf5751a35b9113aa7
Narayan Kamath [Fri, 16 May 2014 12:13:39 +0000 (12:13 +0000)]
am
f8c66b4b: am
cfba3bf1: am
c9fcaf37: Merge "Change InputMessage.motion.pointerSize to a uint32_t."
* commit '
f8c66b4bee9ab0203b83ea3a6df8f49fad443d88':
Change InputMessage.motion.pointerSize to a uint32_t.
Narayan Kamath [Fri, 16 May 2014 12:10:21 +0000 (12:10 +0000)]
am
cfba3bf1: am
c9fcaf37: Merge "Change InputMessage.motion.pointerSize to a uint32_t."
* commit '
cfba3bf1606dfdb1daf1be1c19176180660ae19d':
Change InputMessage.motion.pointerSize to a uint32_t.
Narayan Kamath [Fri, 16 May 2014 12:08:06 +0000 (12:08 +0000)]
am
c9fcaf37: Merge "Change InputMessage.motion.pointerSize to a uint32_t."
* commit '
c9fcaf3751af078ad730913304431197e4d1ae80':
Change InputMessage.motion.pointerSize to a uint32_t.
Narayan Kamath [Fri, 16 May 2014 12:06:10 +0000 (12:06 +0000)]
Merge "Change InputMessage.motion.pointerSize to a uint32_t."
Narayan Kamath [Fri, 2 May 2014 16:53:33 +0000 (17:53 +0100)]
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
bc6001b026069714177526eb1120b0011d6f2a51)
Change-Id: I28e87050478920a54132efbbb8138076ebad1409
Todd Poynor [Thu, 8 May 2014 23:04:22 +0000 (16:04 -0700)]
BatteryProperty: Add property ENERGY_COUNTER and 64-bit integer properties
Also fixup comments to match recent changes in BatteryManager.
Change-Id: I6f40924f9e66d564ad1175f9650e2bfd2ad39a3a
Vinod Krishnan [Fri, 16 May 2014 02:45:59 +0000 (02:45 +0000)]
am
bd0f9153: am
7e6c5336: Merge "Adding a portrait and landscape file" into klp-modular-dev
* commit '
bd0f91537be0e506a92687d6084a2659cf34399c':
Adding a portrait and landscape file
Vinod Krishnan [Fri, 16 May 2014 02:44:10 +0000 (02:44 +0000)]
am
7e6c5336: Merge "Adding a portrait and landscape file" into klp-modular-dev
* commit '
7e6c53366d916e11fd6237c9456c394ff6a1cb1f':
Adding a portrait and landscape file
Vinod Krishnan [Fri, 16 May 2014 02:41:08 +0000 (02:41 +0000)]
Merge "Adding a portrait and landscape file" into klp-modular-dev
Vinod Krishnan [Thu, 15 May 2014 22:44:16 +0000 (15:44 -0700)]
Adding a portrait and landscape file
- Some wearable devices do not support landscape
- CTS tests were expecting some behavior which would not work since
it was not able to switch from portrait to landscape.
- Creating 2 files and then each of the devices will include that
particular feature that it supports.
Change-Id: If0e3151e23264a49f4964e1c643b33a90b78c114
Vinod Krishnan [Fri, 16 May 2014 01:47:33 +0000 (01:47 +0000)]
am
b017932e: am
035839c6: Adding Feature for HRM
* commit '
b017932e4a659f637085e37e09e3aa20849d62b8':
Adding Feature for HRM
Vinod Krishnan [Fri, 16 May 2014 01:44:21 +0000 (01:44 +0000)]
am
035839c6: Adding Feature for HRM
* commit '
035839c6c291e831c51eea1e9d8b54f9e2382707':
Adding Feature for HRM
Andy Hung [Thu, 15 May 2014 03:21:00 +0000 (03:21 +0000)]
Merge "Allow OMX pointer types to be forced to 32 bits"
Nick Kralevich [Tue, 13 May 2014 20:41:41 +0000 (20:41 +0000)]
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.
Nick Kralevich [Tue, 13 May 2014 20:38:20 +0000 (20:38 +0000)]
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.
Nick Kralevich [Tue, 13 May 2014 20:35:38 +0000 (20:35 +0000)]
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.
Nick Kralevich [Tue, 13 May 2014 20:32:19 +0000 (20:32 +0000)]
Merge "Ensure that app lib symlinks are correctly labeled when created."
Stephen Smalley [Tue, 13 May 2014 16:53:07 +0000 (12:53 -0400)]
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>
Vinod Krishnan [Wed, 7 May 2014 05:01:37 +0000 (22:01 -0700)]
Adding Feature for HRM
Change-Id: Iaec58df9c27753ce2c39c6bbe3735f1894684cb5
Aravind Akella [Tue, 13 May 2014 00:54:50 +0000 (00:54 +0000)]
am
47d871b2: am
d35e3af0: Set default values for FifoMaxEventCount and ReservedEventCount.
* commit '
47d871b2795f714499a34ffe85b67f8577883f7b':
Set default values for FifoMaxEventCount and ReservedEventCount.
Aravind Akella [Tue, 13 May 2014 00:50:40 +0000 (00:50 +0000)]
am
d35e3af0: Set default values for FifoMaxEventCount and ReservedEventCount.
* commit '
d35e3af04d4b7e850a3b87b2211d1a3993f9b76f':
Set default values for FifoMaxEventCount and ReservedEventCount.
Aravind Akella [Tue, 13 May 2014 00:14:56 +0000 (17:14 -0700)]
Set default values for FifoMaxEventCount and ReservedEventCount.
Change-Id: I4f610c2912ffe1697d1ffb99c556d1c88578466e
Etienne Le Grand [Mon, 12 May 2014 19:38:13 +0000 (19:38 +0000)]
Merge "Add wake gesture in Sensor.cpp"
Greg Hackmann [Mon, 12 May 2014 18:18:47 +0000 (18:18 +0000)]
am
38c9e132: am
c1ffd351: am
bd20e551: Merge "Use asynchronous lock/unlock API"
* commit '
38c9e1327a5b24267c3dab5293bc9d7ada6e9fc9':
Use asynchronous lock/unlock API
Greg Hackmann [Mon, 12 May 2014 18:12:34 +0000 (18:12 +0000)]
am
c1ffd351: am
bd20e551: Merge "Use asynchronous lock/unlock API"
* commit '
c1ffd351bc44483369271c11dd4c6391bba8c64c':
Use asynchronous lock/unlock API
Greg Hackmann [Mon, 12 May 2014 18:08:13 +0000 (18:08 +0000)]
am
bd20e551: Merge "Use asynchronous lock/unlock API"
* commit '
bd20e551f64234142e1146f9fa4b2dcebbd72122':
Use asynchronous lock/unlock API
Greg Hackmann [Mon, 12 May 2014 18:01:59 +0000 (18:01 +0000)]
Merge "Use asynchronous lock/unlock API"
Francis Hart [Tue, 1 Apr 2014 12:30:53 +0000 (15:30 +0300)]
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
Greg Hackmann [Fri, 9 May 2014 22:00:04 +0000 (22:00 +0000)]
am
9493d492: am
9eb142e3: am
a9d49f99: Merge "Revert "Use asynchronous lock/unlock API""
* commit '
9493d4924a59f14b698389386337a9c07a7ea3c4':
Revert "Use asynchronous lock/unlock API"
Greg Hackmann [Fri, 9 May 2014 21:54:48 +0000 (21:54 +0000)]
am
4b46776f: am
8a6cd189: am
f60564a1: Merge "Use asynchronous lock/unlock API"
* commit '
4b46776ff88c5a365700b88e8b2b04e1b2c77e6e':
Use asynchronous lock/unlock API
Greg Hackmann [Fri, 9 May 2014 21:51:51 +0000 (21:51 +0000)]
am
9eb142e3: am
a9d49f99: Merge "Revert "Use asynchronous lock/unlock API""
* commit '
9eb142e34a5bc11508c0bd6f60ad3933c60aa530':
Revert "Use asynchronous lock/unlock API"
Greg Hackmann [Fri, 9 May 2014 21:46:44 +0000 (21:46 +0000)]
am
a9d49f99: Merge "Revert "Use asynchronous lock/unlock API""
* commit '
a9d49f99e69d8fc0e60b492b131322c96f47a232':
Revert "Use asynchronous lock/unlock API"
Greg Hackmann [Fri, 9 May 2014 21:39:07 +0000 (21:39 +0000)]
Merge "Revert "Use asynchronous lock/unlock API""
Greg Hackmann [Fri, 9 May 2014 21:36:48 +0000 (21:36 +0000)]
Revert "Use asynchronous lock/unlock API"
This reverts commit
378ef07760eda717367d9429428c42d54d54d9a7.
Change-Id: I1de5ab973b5383633e75924fe90ac3ca8216c36a
Greg Hackmann [Fri, 9 May 2014 21:13:16 +0000 (21:13 +0000)]
am
8a6cd189: am
f60564a1: Merge "Use asynchronous lock/unlock API"
* commit '
8a6cd189034ec4709a66e581b41deba56c028291':
Use asynchronous lock/unlock API
Greg Hackmann [Fri, 9 May 2014 21:08:39 +0000 (21:08 +0000)]
am
f60564a1: Merge "Use asynchronous lock/unlock API"
* commit '
f60564a13e917877c76c99294194a621d872076b':
Use asynchronous lock/unlock API
Greg Hackmann [Fri, 9 May 2014 21:02:20 +0000 (21:02 +0000)]
Merge "Use asynchronous lock/unlock API"
Andy McFadden [Fri, 9 May 2014 18:00:54 +0000 (18:00 +0000)]
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"
Andy McFadden [Fri, 9 May 2014 17:57:12 +0000 (17:57 +0000)]
am
b6601961: Merge "DO NOT MERGE Add "dumpsys SurfaceFlinger --dispsync"" into klp-modular-dev
* commit '
b66019615da8750588f1233a77b9c686b0a248c3':
DO NOT MERGE Add "dumpsys SurfaceFlinger --dispsync"
Andy McFadden [Fri, 9 May 2014 17:54:29 +0000 (17:54 +0000)]
Merge "DO NOT MERGE Add "dumpsys SurfaceFlinger --dispsync"" into klp-modular-dev
Andy McFadden [Fri, 9 May 2014 17:49:32 +0000 (17:49 +0000)]
Merge "Add "dumpsys SurfaceFlinger --dispsync""
Andy McFadden [Thu, 8 May 2014 21:53:26 +0000 (14:53 -0700)]
DO NOT MERGE Add "dumpsys SurfaceFlinger --dispsync"
Dumps the current DispSync state.
Bug
14651879
(this is a near-cherrypick of Ide4e6dbd58b117bc1a6b97b57d10cd92ec86dc84)
Change-Id: I6e6c8452ede5c2d5098db1b884d28226e77d9a03
Eino-Ville Talvala [Fri, 9 May 2014 15:55:44 +0000 (15:55 +0000)]
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.
Eino-Ville Talvala [Fri, 9 May 2014 15:48:02 +0000 (15:48 +0000)]
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.
Andy McFadden [Thu, 8 May 2014 21:53:26 +0000 (14:53 -0700)]
Add "dumpsys SurfaceFlinger --dispsync"
Dumps the current DispSync state.
Bug
14651879
Change-Id: Ide4e6dbd58b117bc1a6b97b57d10cd92ec86dc84
Andy McFadden [Thu, 8 May 2014 23:10:31 +0000 (23:10 +0000)]
Merge "Add mutex"
Andy McFadden [Thu, 8 May 2014 21:56:50 +0000 (14:56 -0700)]
Add mutex
Change-Id: I81072031e74a5cca8384e4e8bce4babf2187d8bb
Eino-Ville Talvala [Thu, 8 May 2014 18:43:53 +0000 (11:43 -0700)]
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
Eino-Ville Talvala [Thu, 8 May 2014 21:33:54 +0000 (21:33 +0000)]
Merge "Add standard android.hardware.camera.external permission file."
Eino-Ville Talvala [Thu, 8 May 2014 18:43:53 +0000 (11:43 -0700)]
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
Ying Wang [Thu, 8 May 2014 18:23:58 +0000 (18:23 +0000)]
am
114d71ce: am
214b4a61: am
8155ce81: Merge "Remove unused LOCAL_LDLIBS."
* commit '
114d71ce7c6ec1ce0327c812a42966c4258b4a46':
Remove unused LOCAL_LDLIBS.
Etienne Le Grand [Thu, 8 May 2014 02:49:05 +0000 (19:49 -0700)]
Add wake gesture in Sensor.cpp
Change-Id: Ifb1744acffc2d57da43112fb9966261e8246d6de
Ying Wang [Wed, 7 May 2014 23:01:19 +0000 (23:01 +0000)]
am
214b4a61: am
8155ce81: Merge "Remove unused LOCAL_LDLIBS."
* commit '
214b4a61ac3fa63e35c79157d3acf0d8b692b3ac':
Remove unused LOCAL_LDLIBS.
Ying Wang [Wed, 7 May 2014 22:54:27 +0000 (22:54 +0000)]
am
8155ce81: Merge "Remove unused LOCAL_LDLIBS."
* commit '
8155ce81d4b150e6e453d9443f9fea4cc2c546d2':
Remove unused LOCAL_LDLIBS.
Ying Wang [Wed, 7 May 2014 22:48:40 +0000 (22:48 +0000)]
Merge "Remove unused LOCAL_LDLIBS."
Ying Wang [Wed, 7 May 2014 22:26:38 +0000 (15:26 -0700)]
Remove unused LOCAL_LDLIBS.
Change-Id: I62904c410a66f256da8253764577acae18f964f8
Andy Hung [Fri, 2 May 2014 01:58:55 +0000 (18:58 -0700)]
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>
Narayan Kamath [Wed, 7 May 2014 08:16:43 +0000 (08:16 +0000)]
Merge "Fix InputEvent_test."
Dan Stoza [Tue, 6 May 2014 21:08:16 +0000 (21:08 +0000)]
Merge "Enable changing display configuration"
Narayan Kamath [Tue, 6 May 2014 10:31:37 +0000 (11:31 +0100)]
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
38dcdff3087f01 which moved this
code over to using BitSet.
Change-Id: I63a72abe7ce14720b0bf26e5f6d651bb42452f79
Narayan Kamath [Tue, 6 May 2014 10:00:56 +0000 (10:00 +0000)]
Merge "Change InputMessage.motion.pointerSize to a uint32_t."
Rachad [Tue, 6 May 2014 00:39:09 +0000 (00:39 +0000)]
Merge "HEVC Support Added HEVC enums and structures to OMX header files"
Dan Stoza [Fri, 2 May 2014 22:26:25 +0000 (15:26 -0700)]
Enable changing display configuration
This allows querying and switching display device configurations
through the ISurfaceComposer/SurfaceComposerClient interface.
Bug:
14320401
Change-Id: I8c22165698950e5da32204c1c4da92122f91a715
Jesse Hall [Mon, 5 May 2014 22:53:55 +0000 (22:53 +0000)]
am
9fdfa60a: am
424b093a: am
ef923fcf: Merge "fix GraphicBuffer::flatten crash issue when handle is null"
* commit '
9fdfa60aaf477cc944013b637a2a35d357d4340f':
fix GraphicBuffer::flatten crash issue when handle is null
Jesse Hall [Mon, 5 May 2014 22:51:27 +0000 (22:51 +0000)]
am
424b093a: am
ef923fcf: Merge "fix GraphicBuffer::flatten crash issue when handle is null"
* commit '
424b093a58c9f428081da991afa347183bf07847':
fix GraphicBuffer::flatten crash issue when handle is null
Jesse Hall [Mon, 5 May 2014 22:48:50 +0000 (22:48 +0000)]
am
ef923fcf: Merge "fix GraphicBuffer::flatten crash issue when handle is null"
* commit '
ef923fcfd3db9ca1d7df48273cf9a6258aaf15c2':
fix GraphicBuffer::flatten crash issue when handle is null
Jesse Hall [Mon, 5 May 2014 22:45:49 +0000 (22:45 +0000)]
Merge "fix GraphicBuffer::flatten crash issue when handle is null"
Rachad [Fri, 2 May 2014 01:42:43 +0000 (18:42 -0700)]
HEVC Support
Added HEVC enums and structures to OMX header files
Change-Id: If4135c6df86df51098fc7a979543975ed70b0641
Jesse Hall [Mon, 5 May 2014 17:33:01 +0000 (17:33 +0000)]
am
57fdbbda: am
4314ccd1: am
70278fbf: Merge "Add error message for hints when exceptions occur during binder transactions."
* commit '
57fdbbda2c475d2abdd828177f942ddb6d164bef':
Add error message for hints when exceptions occur during binder transactions.
Jesse Hall [Mon, 5 May 2014 17:30:19 +0000 (17:30 +0000)]
am
4314ccd1: am
70278fbf: Merge "Add error message for hints when exceptions occur during binder transactions."
* commit '
4314ccd1ba9fe773b0fc91f0a08dc536ebce8dfe':
Add error message for hints when exceptions occur during binder transactions.
Jesse Hall [Mon, 5 May 2014 17:27:46 +0000 (17:27 +0000)]
am
70278fbf: Merge "Add error message for hints when exceptions occur during binder transactions."
* commit '
70278fbfe012c1fce3e63a41ffb9feaf1e53a64a':
Add error message for hints when exceptions occur during binder transactions.
Jesse Hall [Mon, 5 May 2014 17:26:00 +0000 (17:26 +0000)]
Merge "Add error message for hints when exceptions occur during binder transactions."
Francis Hart [Tue, 1 Apr 2014 12:30:53 +0000 (15:30 +0300)]
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: I77daa1beb197b63b1c2f281b8414ac4ae4b5b03c
Andy McFadden [Fri, 2 May 2014 17:59:22 +0000 (17:59 +0000)]
Merge "Improve SurfaceFlinger PTS estimation"
Andy McFadden [Fri, 25 Apr 2014 23:58:34 +0000 (16:58 -0700)]
Improve SurfaceFlinger PTS estimation
Get the next refresh time from DispSync instead of guessing based
on the current time.
Change-Id: I8dc72a3217bfd4e9b4c905034194d1a298cad69a
Narayan Kamath [Fri, 2 May 2014 16:53:33 +0000 (17:53 +0100)]
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.
Change-Id: I66bb8b8d8664763e7dcbd489686051f563d5e1dc
Jesse Hall [Fri, 2 May 2014 16:50:40 +0000 (16:50 +0000)]
Merge "Handle failed requestBuffer after successful dequeueBuffer"
Adam Lesinski [Thu, 1 May 2014 21:37:35 +0000 (21:37 +0000)]
am
1f9f945c: am
19f7cd5c: Merge "Remove some features from wearables" into klp-modular-dev
* commit '
1f9f945c8d66aab510df82a931c2328b3f6a2acd':
Remove some features from wearables
Adam Lesinski [Thu, 1 May 2014 21:33:56 +0000 (21:33 +0000)]
am
19f7cd5c: Merge "Remove some features from wearables" into klp-modular-dev
* commit '
19f7cd5c635b295e3e15ca2129a1f24fe9df98ec':
Remove some features from wearables
Adam Lesinski [Thu, 1 May 2014 21:30:42 +0000 (21:30 +0000)]
Merge "Remove some features from wearables" into klp-modular-dev
Adam Lesinski [Wed, 23 Apr 2014 20:19:53 +0000 (13:19 -0700)]
Remove some features from wearables
It was incorrectly assumed that these devices must require
a device admin, camera, and network location.
Change-Id: I51942ece6c0b9f824bfc3ee82917a2496ae81788
Ruchi Kandoi [Thu, 24 Apr 2014 23:42:35 +0000 (16:42 -0700)]
SurfaceFlinger: Adds the functionality to reduce refresh rate to half of
the default.
Feature added for the low power mode.
Change-Id: I2849e5ea335c0d2509fea1c315392bce7f20451d
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
Jesse Hall [Tue, 29 Apr 2014 23:14:14 +0000 (16:14 -0700)]
Handle failed requestBuffer after successful dequeueBuffer
If the virtual display consumer disconnects after the
VirtualDisplaySurface dequeues a buffer but before it requests it, the
request will fail. Previously the error was ignored, and the caller
would get a success result but a NULL buffer. Now the dequeued buffer
is cancelled and the error propagated to the caller.
Bug:
14140551
Change-Id: I91547885c2cf6063dc7a8f02d97f2df282cdde2c
Narayan Kamath [Thu, 1 May 2014 14:31:14 +0000 (14:31 +0000)]
am
fc4e3788: am
44df726a: am
cb079c89: Merge "Add instruction-set arguments to installd commands."
* commit '
fc4e37887707588d18297188dd6922224901b8d0':
Add instruction-set arguments to installd commands.
Narayan Kamath [Thu, 1 May 2014 14:05:10 +0000 (14:05 +0000)]
am
44df726a: am
cb079c89: Merge "Add instruction-set arguments to installd commands."
* commit '
44df726a6cf4fe1119e146c9a18c78966a6305d3':
Add instruction-set arguments to installd commands.
Narayan Kamath [Thu, 1 May 2014 14:00:54 +0000 (14:00 +0000)]
am
cb079c89: Merge "Add instruction-set arguments to installd commands."
* commit '
cb079c899ac9d9c5ec90840249821f58c817406c':
Add instruction-set arguments to installd commands.
Narayan Kamath [Thu, 1 May 2014 13:57:12 +0000 (13:57 +0000)]
Merge "Add instruction-set arguments to installd commands."
Narayan Kamath [Fri, 11 Apr 2014 12:17:00 +0000 (13:17 +0100)]
Add instruction-set arguments to installd commands.
The instruction-set is used to construct the dalvik cache
path and is also passed down to dex2oat.
(cherry picked from commit
791781bfb8cdcdf90e32968159603e2fe5098d94)
Change-Id: I43396b16f6eaecacf0fb7d052526fc5a239167ac
Nick Vaccaro [Wed, 30 Apr 2014 23:35:03 +0000 (23:35 +0000)]
am
45fcfb48: am
85453ecc: dumpstate: increase poll timeout waiting for SIGQUIT logging
* commit '
45fcfb48ef9e65747e7a3f35e1a4da232f6e161a':
dumpstate: increase poll timeout waiting for SIGQUIT logging
Nick Vaccaro [Wed, 30 Apr 2014 20:35:15 +0000 (20:35 +0000)]
am
85453ecc: dumpstate: increase poll timeout waiting for SIGQUIT logging
* commit '
85453ecc90a94564e586f0f97c9ec2c0cf831501':
dumpstate: increase poll timeout waiting for SIGQUIT logging
Nick Vaccaro [Wed, 30 Apr 2014 18:19:23 +0000 (11:19 -0700)]
dumpstate: increase poll timeout waiting for SIGQUIT logging
Increased the maximum time dumpstate will wait for SIGQUIT process
to finish dumping its thread stacks to the logfile to 5 seconds.
Bug:
14057177
Change-Id: I0b43004512855d202f2fe0ea7b0e934e77a3a070
Bill Yi [Wed, 30 Apr 2014 12:17:24 +0000 (12:17 +0000)]
Narayan Kamath [Fri, 11 Apr 2014 12:17:00 +0000 (13:17 +0100)]
Add instruction-set arguments to installd commands.
The instruction-set is used to construct the dalvik cache
path and is also passed down to dex2oat.
Change-Id: Ie480841b3e917dabe23ad4d5f4a0b08990500a51
Bill Yi [Wed, 30 Apr 2014 00:58:53 +0000 (00:58 +0000)]
Conley Owens [Wed, 30 Apr 2014 00:09:36 +0000 (00:09 +0000)]
Merge "Add TYPE_MAGNIFICATION_OVERLAY to isTrustedOverlay"
Michael Wright [Tue, 29 Apr 2014 22:31:17 +0000 (22:31 +0000)]
Merge "Move key attribute information out of native."
Bill Yi [Tue, 29 Apr 2014 18:34:19 +0000 (11:34 -0700)]
Jun Jiang [Tue, 29 Apr 2014 06:22:10 +0000 (14:22 +0800)]
Add error message for hints when exceptions occur during binder transactions.
It can help to detect some kind of error, such as why GraphicBuffer::flatten
will crash when handle is null.
Change-Id: I703cd035b96edb7afb324cf24d8230d4e55f4f52
Signed-off-by: Jun Jiang <jun.a.jiang@intel.com>
Jun Jiang [Tue, 29 Apr 2014 06:15:36 +0000 (14:15 +0800)]
fix GraphicBuffer::flatten crash issue when handle is null
Change-Id: I0d3727e4366cac355791e52cb7790bf8f3c51527
Signed-off-by: Jun Jiang <jun.a.jiang@intel.com>