OSDN Git Service
John Spurlock [Thu, 3 Apr 2014 20:39:17 +0000 (16:39 -0400)]
Add ACONFIGURATION_UI_MODE_TYPE_WATCH to configuation enum.
Bug:
13395758
Change-Id: Iecdae299bfd030f86145d02fa7860374b5a40a74
Jeff Tinker [Tue, 1 Apr 2014 21:54:35 +0000 (21:54 +0000)]
Merge "Support CAST V2 Authentication in MediaDrm" into klp-modular-dev
Jeff Tinker [Tue, 4 Mar 2014 21:23:56 +0000 (13:23 -0800)]
Support CAST V2 Authentication in MediaDrm
Update frameworks to enable support for CAST
V2 Authentication in the DRM Plugin.
Change-Id: Ic38f0e1484b1388dd87f4591c74984cb724d50e2
related-to-bug:
12702350
Michael Wright [Fri, 28 Mar 2014 19:33:35 +0000 (19:33 +0000)]
Merge "Generate ACTION_CANCEL on joystick disconnect. DO NOT MERGE" into klp-modular-dev
Xia Wang [Tue, 25 Mar 2014 03:46:32 +0000 (03:46 +0000)]
am
9c7db080: Build the benchmark test to /data/local/tmp/ for automated test
* commit '
9c7db08049e1d36c2f60dd703f27c432bc8cfbc5':
Build the benchmark test to /data/local/tmp/ for automated test
Michael Wright [Wed, 19 Mar 2014 19:06:10 +0000 (12:06 -0700)]
Generate ACTION_CANCEL on joystick disconnect. DO NOT MERGE
Bug:
11480300
Change-Id: I5a4096970c9e588d134f05dd0eb3a9c91c836b2f
Xia Wang [Thu, 27 Feb 2014 02:04:50 +0000 (18:04 -0800)]
Build the benchmark test to /data/local/tmp/ for automated test
Change-Id: I27a5ee24636ff9752a35dbab793821f6b7a79221
(cherry picked from commit
b7925f1364b56708e072884a5ae9dba2d32b58e6)
Marco Nelissen [Thu, 20 Mar 2014 20:57:13 +0000 (20:57 +0000)]
am
897fe45c: am
23c2fcbb: (-s ours) am
c0af9caf: am
b14d72bc: am
d070009e: am
df6774c9: am
7c1cdbdd: am
e23f8b8f: am
1f70863d: am
37b44969: Add support for writing byte arrays to parcels
* commit '
897fe45cf7addc975fc7f9751c88ac53d9b9a778':
Add support for writing byte arrays to parcels
Marco Nelissen [Thu, 20 Mar 2014 20:48:45 +0000 (20:48 +0000)]
am
23c2fcbb: (-s ours) am
c0af9caf: am
b14d72bc: am
d070009e: am
df6774c9: am
7c1cdbdd: am
e23f8b8f: am
1f70863d: am
37b44969: Add support for writing byte arrays to parcels
* commit '
23c2fcbbf4be87580e64132150aa554b764425c2':
Add support for writing byte arrays to parcels
Marco Nelissen [Thu, 20 Mar 2014 20:26:08 +0000 (13:26 -0700)]
am
c0af9caf: am
b14d72bc: am
d070009e: am
df6774c9: am
7c1cdbdd: am
e23f8b8f: am
1f70863d: am
37b44969: Add support for writing byte arrays to parcels
* commit '
c0af9cafba1217e2585777964730c70e40957dcd':
Add support for writing byte arrays to parcels
Marco Nelissen [Thu, 20 Mar 2014 20:13:23 +0000 (13:13 -0700)]
am
b14d72bc: am
d070009e: am
df6774c9: am
7c1cdbdd: am
e23f8b8f: am
1f70863d: am
37b44969: Add support for writing byte arrays to parcels
* commit '
b14d72bce04e990639305890b2aca3ccad5b3ebb':
Add support for writing byte arrays to parcels
Marco Nelissen [Thu, 20 Mar 2014 18:11:18 +0000 (11:11 -0700)]
am
d070009e: am
df6774c9: am
7c1cdbdd: am
e23f8b8f: am
1f70863d: am
37b44969: Add support for writing byte arrays to parcels
* commit '
d070009ecdb9e8c58ce5d1540d5bcba5587a0448':
Add support for writing byte arrays to parcels
Marco Nelissen [Thu, 20 Mar 2014 18:06:54 +0000 (11:06 -0700)]
am
df6774c9: am
7c1cdbdd: am
e23f8b8f: am
1f70863d: am
37b44969: Add support for writing byte arrays to parcels
* commit '
df6774c9a3c1460554208925f38dde08953b6d0b':
Add support for writing byte arrays to parcels
Marco Nelissen [Thu, 20 Mar 2014 17:55:05 +0000 (10:55 -0700)]
am
7c1cdbdd: am
e23f8b8f: am
1f70863d: am
37b44969: Add support for writing byte arrays to parcels
* commit '
7c1cdbdd68c4f809dc5616654740ea98a275892d':
Add support for writing byte arrays to parcels
Marco Nelissen [Thu, 20 Mar 2014 17:48:35 +0000 (10:48 -0700)]
am
e23f8b8f: am
1f70863d: am
37b44969: Add support for writing byte arrays to parcels
* commit '
e23f8b8f0bf32e79c1d0f9183c064ab61354c452':
Add support for writing byte arrays to parcels
Marco Nelissen [Thu, 20 Mar 2014 17:33:12 +0000 (10:33 -0700)]
am
1f70863d: am
37b44969: Add support for writing byte arrays to parcels
* commit '
1f70863d13668dc97047df15cce547ebc8435ff2':
Add support for writing byte arrays to parcels
Marco Nelissen [Thu, 20 Mar 2014 17:04:42 +0000 (10:04 -0700)]
am
37b44969: Add support for writing byte arrays to parcels
* commit '
37b44969c0ca1d00e213da685dfbb2807f2bab30':
Add support for writing byte arrays to parcels
Kenny Root [Mon, 17 Mar 2014 21:28:34 +0000 (21:28 +0000)]
am
5b61ad2c: Check the padded size of the read byte array
* commit '
5b61ad2cda8ec8ab634ce02f388bb2d3c5ab048d':
Check the padded size of the read byte array
Kenny Root [Mon, 17 Mar 2014 20:18:16 +0000 (13:18 -0700)]
Check the padded size of the read byte array
Bug:
13509200
Change-Id: Id93894fcc617ec1cd4ce66921c6e1f1c3cf40b09
Adam Lesinski [Mon, 17 Mar 2014 19:50:56 +0000 (19:50 +0000)]
Merge "Add device admin to wearables for API8 Compat" into klp-modular-dev
Adam Lesinski [Mon, 17 Mar 2014 19:50:30 +0000 (19:50 +0000)]
Merge "Remove accessibility as an optional feature" into klp-modular-dev
Adam Lesinski [Mon, 17 Mar 2014 19:17:29 +0000 (12:17 -0700)]
Add device admin to wearables for API8 Compat
Bug:
13386441
Change-Id: I8814976db791bb1f2e60b6a9fc49afdd5f360414
Adam Lesinski [Mon, 17 Mar 2014 19:14:26 +0000 (12:14 -0700)]
Remove accessibility as an optional feature
Bug:
13439904
Change-Id: Icc6b84d05a24cbfdaa121929e7c7c77c0f7eed17
Marco Nelissen [Thu, 13 Mar 2014 21:17:40 +0000 (14:17 -0700)]
Add support for writing byte arrays to parcels
b/
13418320
Cherrypicked from
f0190bff38b6c29abbfc4a877442f71fc3d7dad8
https://googleplex-android-review.git.corp.google.com/#/c/433320/
Change-Id: I2285df9e9d3dc8a6a54055b13b352b81660bf45d
Marco Nelissen [Fri, 14 Mar 2014 22:55:54 +0000 (22:55 +0000)]
am
f0190bff: Add support for writing byte arrays to parcels
* commit '
f0190bff38b6c29abbfc4a877442f71fc3d7dad8':
Add support for writing byte arrays to parcels
Marco Nelissen [Thu, 13 Mar 2014 21:17:40 +0000 (14:17 -0700)]
Add support for writing byte arrays to parcels
b/
13418320
Change-Id: I2285df9e9d3dc8a6a54055b13b352b81660bf45d
RoboErik [Thu, 19 Dec 2013 19:54:29 +0000 (11:54 -0800)]
b/
12068020 add nonce to InputDeviceDescriptor. Do not merge
This is a cherry-pick of https://googleplex-android-review.git.corp.google.com/#/c/401795/
Adds a nonce field to allow generation of unique descriptors for
input devices.
Change-Id: Ie82bfb728bea95792b3b138dd3974f8b0aff63e0
Michael Wright [Sat, 19 Oct 2013 00:53:50 +0000 (17:53 -0700)]
Add MAX_CONTROLLER_LEDS constant. DO NOT MERGE
Change-Id: Ie6dbce926280c748f39e3c54d2ed4accbdcf9e59
Jeff Brown [Fri, 7 Mar 2014 21:57:59 +0000 (13:57 -0800)]
Declare KEYCODE_SLEEP and KEYCODE_WAKEUP.
Bug:
12938999
Change-Id: I544661b3887332998d703b7b2df9e56c23ab48c4
Aravind Akella [Thu, 6 Mar 2014 22:16:15 +0000 (22:16 +0000)]
am
19d64819: Bug fix for SensorFusion data rate.
* commit '
19d648195673b106152610e3787c95886946460f':
Bug fix for SensorFusion data rate.
Aravind Akella [Fri, 6 Dec 2013 00:24:59 +0000 (16:24 -0800)]
Bug fix for SensorFusion data rate.
SensorFusion is always returning data at the slowest possible sampling rate (5 Hz). batch() is getting called twice, first time with the requested rate and second time with the slowest rate (which overwrites the requested rate). Fix batch call in SensorFusion::activate()
Bug:
12064319
Change-Id: If62f3e514233f69810336fd22b136b4395b667d3
(cherry picked from commit
88509090387eeb400771a786171866710cca230c)
Aravind Akella [Thu, 6 Mar 2014 02:24:29 +0000 (02:24 +0000)]
am
ffac23b2: am
4b84704b: Ignore flush complete events when recording last value for a sensor.
* commit '
ffac23b210a96e769fd79ae912b44a185e7d69bd':
Ignore flush complete events when recording last value for a sensor.
Aravind Akella [Thu, 6 Mar 2014 02:18:29 +0000 (02:18 +0000)]
am
4b84704b: Ignore flush complete events when recording last value for a sensor.
* commit '
4b84704b97300eff3ebfab85652e64d54149d205':
Ignore flush complete events when recording last value for a sensor.
Aravind Akella [Tue, 4 Mar 2014 03:02:46 +0000 (19:02 -0800)]
Ignore flush complete events when recording last value for a sensor.
Bug:
11822806
Change-Id: I1402d6684ed71ed413aef6a7be3aad945b331ec2
Michael Wright [Wed, 5 Mar 2014 00:51:43 +0000 (00:51 +0000)]
Merge "Parse LED mappings in keylayout files. DO NOT MERGE" into klp-modular-dev
Michael Wright [Fri, 18 Oct 2013 00:35:53 +0000 (17:35 -0700)]
Parse LED mappings in keylayout files. DO NOT MERGE
Change-Id: I2b34939cc0df256e6b872502ea93f2884b4c8334
Simon Wilson [Fri, 28 Feb 2014 22:30:39 +0000 (14:30 -0800)]
Enable OMAP4 SGX workaround for OMAP3 too
Change-Id: I04308d8b7435b4adf1811f75f48f9e8a07a8c8a6
Arve Hjønnevåg [Thu, 20 Feb 2014 00:04:44 +0000 (00:04 +0000)]
am
d06f6b00: am
67903293: Fix "Binder: Make sure binder objects do not overlap" to work old binder kernel interface
* commit '
d06f6b001484c28a6ede3f1ad83d23dcb9ad3ccf':
Fix "Binder: Make sure binder objects do not overlap" to work old binder kernel interface
Arve Hjønnevåg [Thu, 20 Feb 2014 00:00:49 +0000 (00:00 +0000)]
am
67903293: Fix "Binder: Make sure binder objects do not overlap" to work old binder kernel interface
* commit '
6790329358d1c84af2fe9ba093bcfc1c6176e758':
Fix "Binder: Make sure binder objects do not overlap" to work old binder kernel interface
Arve Hjønnevåg [Wed, 19 Feb 2014 23:35:52 +0000 (15:35 -0800)]
Fix "Binder: Make sure binder objects do not overlap" to work old binder kernel interface
DO NOT MERGE into any branch that uses the new interface
Change-Id: Id54308a89327e69a389ac5916c052ad97f57cb28
Arve Hjønnevåg [Wed, 19 Feb 2014 21:47:35 +0000 (21:47 +0000)]
am
d437364e: am
f50b9eaa: Binder: Make sure binder objects do not overlap
* commit '
d437364ec156e07c5fbe3fa27a7cd55e5450e9f6':
Binder: Make sure binder objects do not overlap
Arve Hjønnevåg [Wed, 19 Feb 2014 21:45:25 +0000 (21:45 +0000)]
am
f50b9eaa: Binder: Make sure binder objects do not overlap
* commit '
f50b9eaaeeaeae16981f11b05d3f3a6fb0dea30d':
Binder: Make sure binder objects do not overlap
Andy McFadden [Thu, 30 Jan 2014 01:17:11 +0000 (17:17 -0800)]
Allow "opaque" flag to be updated. DO NOT MERGE
Moves the "opaque layer" from Layer to Layer::State. This allows
it to be updated as part of a transaction.
Bug
12387406
Change-Id: I0a114ce6adf77cd12fb08f96e0691b76c475768d
Arve Hjønnevåg [Fri, 14 Feb 2014 03:22:08 +0000 (19:22 -0800)]
Binder: Make sure binder objects do not overlap
Fixes crashing part of bug
11355082.
The driver still leaks references.
Change-Id: Ibc6a63b151c1fc1f7666237f25255ba781e02071
Jeff Brown [Tue, 11 Feb 2014 22:28:48 +0000 (14:28 -0800)]
Add method to apply offset to PointerCoords. (DO NOT MERGE)
Change-Id: I3dc2ba22b026e5b8e1c3d90f7366ec09a59ce6b6
Adam Lesinski [Wed, 5 Feb 2014 02:03:52 +0000 (18:03 -0800)]
Add new software features
Wearable devices are much more stripped down than
handheld and tablet devices. There are system
services that must not be present on wearable
devices. Those services have their own feature
xml files that get copied to the system image
as needed. They are included by default in the
handheld and tablet core feature files in order
to maintain previous behavior.
Wearable devices should always copy the
data/etc/wearable_core_hardware.xml file and
whatever other files that represent required
services (eg. data/etc/android.software.print.xml).
Change-Id: I410442d45854fe54cba1131ce488a5a459ac580a
Changwan Ryu [Mon, 28 Oct 2013 02:32:47 +0000 (11:32 +0900)]
[DO NOT MERGE] Extend OpenMAX IL definitions to support AC3
OpenMAX IL does not have generic support for AC3, but IL 1.1.2 and above
supports component extension APIs, which enable us to add our own constants
and definitions.
Change-Id: Iecee4f8bb3112b0720ceae9192017e12d3fe97e3
Aravind Akella [Fri, 6 Dec 2013 00:24:59 +0000 (16:24 -0800)]
Bug fix for SensorFusion data rate.
SensorFusion is always returning data at the slowest possible sampling rate (5 Hz). batch() is getting called twice, first time with the requested rate and second time with the slowest rate (which overwrites the requested rate). Fix batch call in SensorFusion::activate()
Bug:
12064319
Change-Id: If62f3e514233f69810336fd22b136b4395b667d3
Jesse Hall [Tue, 28 Jan 2014 18:24:10 +0000 (18:24 +0000)]
am
f65ebc3b: am
f5bcb391: Merge "SurfaceFlinger: mFbProducerSlot initailization"
* commit '
f65ebc3be4d3a2e4c71c401d0e53f2ad5798be2a':
SurfaceFlinger: mFbProducerSlot initailization
Jesse Hall [Tue, 28 Jan 2014 18:22:35 +0000 (18:22 +0000)]
am
f5bcb391: Merge "SurfaceFlinger: mFbProducerSlot initailization"
* commit '
f5bcb391c5a4282fa5fe14856faf1423a2bc44c5':
SurfaceFlinger: mFbProducerSlot initailization
Jesse Hall [Tue, 28 Jan 2014 18:17:46 +0000 (18:17 +0000)]
Merge "SurfaceFlinger: mFbProducerSlot initailization"
mayank parshar [Thu, 23 Jan 2014 09:38:31 +0000 (15:08 +0530)]
SurfaceFlinger: mFbProducerSlot initailization
b/
12487813
SurfaceFlinger crash is observed during simulation of
Secondary display
Note: change
14e8b01a761180250671f3d6494532d8bd04fa8e
removed the initialization leading to the crash when
simulating secondary display. Restore the initialization
to solve the problem.
Change-Id: Iae5845fb82735e01de5cc0dc582d13c27e3c614f
Signed-off-by: mayank parshar <mayankp@broadcom.com>
Signed-off-by: Pierre Couillaud <pierre@broadcom.com>
Colin Cross [Tue, 28 Jan 2014 02:29:37 +0000 (02:29 +0000)]
am
689a7f30: am
851b2cb1: Merge "Make libEGL build cleanly under 64-bit"
* commit '
689a7f30ccd2e57eaadecedbe30690e2a44ce23a':
Make libEGL build cleanly under 64-bit
Colin Cross [Tue, 28 Jan 2014 02:27:41 +0000 (02:27 +0000)]
am
851b2cb1: Merge "Make libEGL build cleanly under 64-bit"
* commit '
851b2cb18c329e0d19f9f56f68425b714007a274':
Make libEGL build cleanly under 64-bit
Colin Cross [Tue, 28 Jan 2014 02:22:11 +0000 (02:22 +0000)]
Merge "Make libEGL build cleanly under 64-bit"
Dan Stoza [Fri, 17 Jan 2014 19:38:34 +0000 (11:38 -0800)]
Make libEGL build cleanly under 64-bit
Change-Id: I255dfb70b166b7469d59352b1acfc7aececa07de
Colin Cross [Tue, 28 Jan 2014 01:02:49 +0000 (01:02 +0000)]
am
a21ba585: am
55f0668f: Merge "frameworks/native: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH"
* commit '
a21ba5856b6d3bdfcef183e09aa658e69ddb4786':
frameworks/native: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH
Colin Cross [Tue, 28 Jan 2014 00:59:40 +0000 (00:59 +0000)]
am
55f0668f: Merge "frameworks/native: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH"
* commit '
55f0668ffd6fd7889e027b3072bf173a7ee48f08':
frameworks/native: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH
Colin Cross [Tue, 28 Jan 2014 00:48:31 +0000 (00:48 +0000)]
Merge "frameworks/native: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH"
Colin Cross [Sat, 25 Jan 2014 05:00:32 +0000 (21:00 -0800)]
frameworks/native: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH
LOCAL_MODULE_PATH doesn't work for multiarch builds, replace it
with LOCAL_MODULE_RELATIVE_PATH.
Change-Id: I4e4ceec61d026bbe74ba604554c06104bde42e5e
Jesse Hall [Sun, 26 Jan 2014 16:47:45 +0000 (16:47 +0000)]
am
8c303f7e: am
fcf9c1ba: Merge "SurfaceFlinger: mFbFence initialization"
* commit '
8c303f7e64b3de7748922e6f951d9e82bc96badd':
SurfaceFlinger: mFbFence initialization
Jesse Hall [Sun, 26 Jan 2014 16:45:40 +0000 (08:45 -0800)]
am
fcf9c1ba: Merge "SurfaceFlinger: mFbFence initialization"
* commit '
fcf9c1bafb251c186191b9d066ed00d0b59b962a':
SurfaceFlinger: mFbFence initialization
Jesse Hall [Sun, 26 Jan 2014 08:15:15 +0000 (08:15 +0000)]
Merge "SurfaceFlinger: mFbFence initialization"
mayank parshar [Fri, 10 Jan 2014 04:57:45 +0000 (10:27 +0530)]
SurfaceFlinger: mFbFence initialization
MobC00383030
b/
12487813
SurfaceFlinger crash is observed while connecting
to Wi-Fi display.
Note: change
14e8b01a761180250671f3d6494532d8bd04fa8e
removed the initialization leading to the crash when
running through the HWC composition path. Restore the
initialization to solve the problem.
Change-Id: I581defc7135ac512080c0da06a62b1dae7d218c4
Signed-off-by: mayank parshar <mayankp@broadcom.com>
Signed-off-by: Pierre Couillaud <pierre@broadcom.com>
Colin Cross [Sat, 25 Jan 2014 00:44:54 +0000 (00:44 +0000)]
am
e3aeefd1: am
af29b77a: Merge "libGLES_android: fix 64-bit compile errors"
* commit '
e3aeefd1f8a5ac0e4b2106fc1cf190ad4f75078c':
libGLES_android: fix 64-bit compile errors
Colin Cross [Sat, 25 Jan 2014 00:42:36 +0000 (16:42 -0800)]
am
af29b77a: Merge "libGLES_android: fix 64-bit compile errors"
* commit '
af29b77ab7dab5a1b5af27e7f7eeeb14584c101c':
libGLES_android: fix 64-bit compile errors
Colin Cross [Sat, 25 Jan 2014 00:38:15 +0000 (00:38 +0000)]
Merge "libGLES_android: fix 64-bit compile errors"
Colin Cross [Fri, 24 Jan 2014 22:35:39 +0000 (14:35 -0800)]
libGLES_android: fix 64-bit compile errors
Fix size of vertex_t on 64-bit architectures
Fix __get_tls casts, the TLS area is a void**
Cast through uintptr_t to store integers in a pointer
Use %zu to print size_t
Change-Id: I91079ec76025237e6d2081784c5348518b0ce122
Jesse Hall [Fri, 3 Jan 2014 18:31:54 +0000 (18:31 +0000)]
am
e5f7bf74: am
b6c21004: Merge "Implement per-display EGLConfig and configless EGLContext"
* commit '
e5f7bf7471b21226c9a6b875e9e8f2fb2cba72e2':
Implement per-display EGLConfig and configless EGLContext
Jesse Hall [Fri, 3 Jan 2014 18:31:53 +0000 (18:31 +0000)]
am
6c7dcfa9: am
662d3134: Merge "Move EGLConfig selection to RenderEngine"
* commit '
6c7dcfa956847a9f061fd1b2baa9dc43585599af':
Move EGLConfig selection to RenderEngine
Jesse Hall [Fri, 3 Jan 2014 18:30:11 +0000 (10:30 -0800)]
am
b6c21004: Merge "Implement per-display EGLConfig and configless EGLContext"
* commit '
b6c2100458bd4dda880ec24dc7d1f39825d5243d':
Implement per-display EGLConfig and configless EGLContext
Jesse Hall [Fri, 3 Jan 2014 18:30:10 +0000 (10:30 -0800)]
am
662d3134: Merge "Move EGLConfig selection to RenderEngine"
* commit '
662d3134cb3fe3f18a0a6bfbc24368c2291c8e19':
Move EGLConfig selection to RenderEngine
Jesse Hall [Fri, 3 Jan 2014 18:25:07 +0000 (18:25 +0000)]
Merge "Implement per-display EGLConfig and configless EGLContext"
Jesse Hall [Fri, 3 Jan 2014 18:24:30 +0000 (18:24 +0000)]
Merge "Move EGLConfig selection to RenderEngine"
Jesse Hall [Tue, 24 Dec 2013 05:02:15 +0000 (21:02 -0800)]
Implement per-display EGLConfig and configless EGLContext
Bug:
12230666
Change-Id: Icca608b108cbdcab9cf01a9236d8cdbda000a836
Signed-off-by: Jesse Hall <jessehall@google.com>
Jesse Hall [Tue, 24 Dec 2013 04:44:38 +0000 (20:44 -0800)]
Move EGLConfig selection to RenderEngine
Bug:
12230666
Change-Id: I8d1111a7e0fd9d9e2525e6a80da8ce46d7dd085d
Signed-off-by: Jesse Hall <jessehall@google.com>
Brian Carlstrom [Thu, 19 Dec 2013 07:25:24 +0000 (07:25 +0000)]
am
c1bf6fa9: am
7fea2361: Merge "Track Looper decoupling from ALooper"
* commit '
c1bf6fa9495b21f25e7ab1a491b918df71be6e1a':
Track Looper decoupling from ALooper
Brian Carlstrom [Thu, 19 Dec 2013 07:21:51 +0000 (23:21 -0800)]
am
7fea2361: Merge "Track Looper decoupling from ALooper"
* commit '
7fea23613a8bcfae2d6f13234c3f0d7c9c3ef570':
Track Looper decoupling from ALooper
Brian Carlstrom [Thu, 19 Dec 2013 07:13:03 +0000 (07:13 +0000)]
Merge "Track Looper decoupling from ALooper"
Nick Kralevich [Tue, 17 Dec 2013 23:12:20 +0000 (23:12 +0000)]
am
e7394ba8: am
c02c35fb: Merge "restorecon /data/media when re-creating it for multi-user upgrade."
* commit '
e7394ba8bd9cd90a0fb72f6c50522a41cd7877fd':
restorecon /data/media when re-creating it for multi-user upgrade.
Nick Kralevich [Tue, 17 Dec 2013 23:08:30 +0000 (15:08 -0800)]
am
c02c35fb: Merge "restorecon /data/media when re-creating it for multi-user upgrade."
* commit '
c02c35fbdc90acbb6483fddd9a8822a16a63689d':
restorecon /data/media when re-creating it for multi-user upgrade.
Nick Kralevich [Tue, 17 Dec 2013 23:02:36 +0000 (23:02 +0000)]
Merge "restorecon /data/media when re-creating it for multi-user upgrade."
Stephen Smalley [Tue, 17 Dec 2013 21:04:20 +0000 (16:04 -0500)]
restorecon /data/media when re-creating it for multi-user upgrade.
Change-Id: I112c61863f2104d1962697c54cff25106e9b48a0
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
Brian Carlstrom [Fri, 13 Dec 2013 07:13:18 +0000 (23:13 -0800)]
Track Looper decoupling from ALooper
Change-Id: I612f0de7002e24948a4cbbea7b416b4fbb3929aa
Todd Poynor [Fri, 22 Nov 2013 23:44:22 +0000 (15:44 -0800)]
dumpstate: dump console-ramoops instead of last_kmsg if present
Change-Id: I41a922b33f0b6b4e8e150a92e46032501a165e33
The Android Open Source Project [Fri, 6 Dec 2013 01:26:03 +0000 (17:26 -0800)]
The Android Open Source Project [Thu, 5 Dec 2013 20:38:18 +0000 (12:38 -0800)]
Jesse Hall [Tue, 3 Dec 2013 05:19:56 +0000 (21:19 -0800)]
am
708602cc: Merge "DispSync: remove delay when enabling vsync events"
* commit '
708602ccaad0f6e896c4bd4457503614b9ee81d0':
DispSync: remove delay when enabling vsync events
Jesse Hall [Tue, 3 Dec 2013 05:12:31 +0000 (05:12 +0000)]
Merge "DispSync: remove delay when enabling vsync events"
Jamie Gennis [Tue, 29 Oct 2013 20:36:12 +0000 (13:36 -0700)]
DispSync: remove delay when enabling vsync events
This change fixes a bug that caused an extra frame of latency when enabling
vsync event callbacks in DispSync. The bug was related to the logic that
prevents the two events from firing with very little time between them due to
updates to the vsync model.
Bug:
11479720
Change-Id: Ie7eaff9e92ffb7b7b6cb4d3d4402c96cbd29af7e
Nick Kralevich [Wed, 27 Nov 2013 21:16:46 +0000 (13:16 -0800)]
am
bef08b8d: Merge "Handle policy reloads within installd rather than restarting it."
* commit '
bef08b8d1b30976ff273fc9041bc8d934f52fea9':
Handle policy reloads within installd rather than restarting it.
Nick Kralevich [Wed, 27 Nov 2013 21:09:12 +0000 (21:09 +0000)]
Merge "Handle policy reloads within installd rather than restarting it."
Dima Zavin [Sat, 23 Nov 2013 20:36:54 +0000 (12:36 -0800)]
am
63b62e8c: am
66ad04bc: Merge "Remove incompatible ashmem.h"
* commit '
63b62e8cd48176abbfddb6bd67c138ae447f6ac7':
Remove incompatible ashmem.h
Dima Zavin [Sat, 23 Nov 2013 04:45:07 +0000 (20:45 -0800)]
am
66ad04bc: Merge "Remove incompatible ashmem.h"
* commit '
66ad04bc039c73763c55c8d3aad282378e05d257':
Remove incompatible ashmem.h
Dima Zavin [Sat, 23 Nov 2013 04:41:17 +0000 (04:41 +0000)]
Merge "Remove incompatible ashmem.h"
The Android Open Source Project [Sat, 23 Nov 2013 01:41:41 +0000 (17:41 -0800)]
The Android Open Source Project [Fri, 22 Nov 2013 19:20:20 +0000 (11:20 -0800)]
Merge commit '
afd0debe4bdf47dc0f968282ca1261842bb65d60' into HEAD
Change-Id: Ic9aed2c57bdfeb250ce2dd7f0e9289ba5b6e936a
Elliott Hughes [Fri, 22 Nov 2013 02:43:51 +0000 (18:43 -0800)]
am
f2f74ca6: Merge "Remove references to obsolete pmem functionality."
* commit '
f2f74ca65f34ae0cae6f0cca40f1c18aa771739d':
Remove references to obsolete pmem functionality.
Elliott Hughes [Thu, 21 Nov 2013 20:42:32 +0000 (20:42 +0000)]
Merge "Remove references to obsolete pmem functionality."
Elliott Hughes [Thu, 21 Nov 2013 20:22:39 +0000 (12:22 -0800)]
Remove references to obsolete pmem functionality.
Change-Id: I5d3befd075e51614e6801115388a0a9f32fbb6ea
OSDN Git Service
