summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* marlin/eas: Fixing foreground/schedtune.boost pathSrinath Sridharan2016-04-251-1/+1
| | | | | BUG: 28378389 Change-Id: Iea0bdf33de2ae2b9abc37460a9100d5044699c7d
* Merge "Move servicemanager into system-background cpuset." into nyc-devMartijn Coenen2016-04-251-0/+1
|\ | | | | | | | | | | | | | | | | am: 62b6bc7 * commit '62b6bc7c8c5e5016f575955dab147f70f8b8cc0a': Move servicemanager into system-background cpuset. Change-Id: I34e86702dfe9474198dad382779d07f079ebdbdf
| * Merge "Move servicemanager into system-background cpuset." into nyc-devMartijn Coenen2016-04-251-0/+1
| |\
| | * Move servicemanager into system-background cpuset.Martijn Coenen2016-04-151-0/+1
| | | | | | | | | | | | | | | Bug: 24949295 Change-Id: I9149c43edf79d9acbc5af4b3dc1eae59c695a86a
* | | libvulkan: Reset window before creating swapchainJesse Hall2016-04-222-9/+43
|\| | | | | | | | | | | | | | | | | | | | | | | | | | am: 3d1c82a * commit '3d1c82a750046f055951242bf27909ad7d9cdf52': libvulkan: Reset window before creating swapchain Change-Id: I2e47f48172f05ec0c7c4cb1bf28cb9520acae2bc
| * | libvulkan: Reset window before creating swapchainJesse Hall2016-04-222-9/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using one window for two consecutive swapchains, some of the settings from the first swapchain were affecting how many buffers we thought we needed for the second, eventually leading us to attempt to dequeue more buffers than we actually could. Bug: 28075694 Change-Id: I7d2cabc2365986dfcfe8a03d16bb71ca1616f144
* | | Merge changes Ifeba21da,Ie7982790,I02bb34b7 into nyc-devChia-I Wu2016-04-212-18/+26
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 2ee735c97c * commit '2ee735c97c760cec76c1385f1896b822ff45cba5': vulkan: silence a warning when layers are enabled vulkan: fix "vkinfo -validate" vulkan: fix vkinfo with layer extensions Change-Id: Ic77864485608dd907cbea0871b714dab4c4e44c9
| * | Merge changes Ifeba21da,Ie7982790,I02bb34b7 into nyc-devChia-I Wu2016-04-212-18/+26
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | * changes: vulkan: silence a warning when layers are enabled vulkan: fix "vkinfo -validate" vulkan: fix vkinfo with layer extensions
| | * | vulkan: silence a warning when layers are enabledChia-I Wu2016-04-211-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Layers always do vkGetInstanceProcAddr(VK_NULL_HANDLE, "vkCreateDevice") and we should not log an error. Change-Id: Ifeba21da73d982775edc4e6a91ce0f0f5eab191d
| | * | vulkan: fix "vkinfo -validate"Chia-I Wu2016-04-211-8/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Some layers were renamed/merged. Bug: 28317797 Change-Id: Ie7982790502ad1bed3234b26129cff9e06667365
| | * | vulkan: fix vkinfo with layer extensionsChia-I Wu2016-04-211-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | vkinfo enable layers only when options.validate is true. We should use layer extensions, such as VK_EXT_debug_report, only when layers are enabled. Bug: 28317797 Change-Id: I02bb34b728f3f3072111444194ee97065e38e401
* | | | Merge "BQ: Replace items from back of queue" into nyc-devPablo Ceballos2016-04-212-13/+14
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 9461b93f7e * commit '9461b93f7e46e71dd43b021084012ec337a5cee3': BQ: Replace items from back of queue Change-Id: I26d1020b3335e1662801a69e9626a36a24044d76
| * | | Merge "BQ: Replace items from back of queue" into nyc-devPablo Ceballos2016-04-212-13/+14
| |\ \ \ | | |/ / | |/| |
| | * | BQ: Replace items from back of queuePablo Ceballos2016-04-202-13/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's possible to have one or more non-droppable items in the queue ahead of a droppable item. In that case we want to replace the droppable one at the end of the queue. By changing the policy to always replace the last item in the queue (if it's droppable) we ensure that there will never be more than one droppable item in the queue and that it will always be the last one. Bug 27129258 Change-Id: I9a6234fe12a0095ccb93ceb9cdb74616944900b0
* | | | vknulldrv: Use a default allocator when none providedJesse Hall2016-04-201-4/+55
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: d3b1450e66 * commit 'd3b1450e6606cacff0d2c6e0ff6e45f1420ad5ee': vknulldrv: Use a default allocator when none provided Change-Id: Ia6284f0d68114dc8f3e6ec5257ba4de05d0b71d6
| * | | vknulldrv: Use a default allocator when none providedJesse Hall2016-04-201-4/+55
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | The loader used to always provide an allocator, even if the app didn't. It no longer does that, so the null driver must be prepared to provide its own default allocator. Fixes bug 28303142 Change-Id: I6ab946913dc4edaf2a0b07ab9ae8c43be69b3ed6
* | | Merge "remove compass from default wearable_core_hardware.xml" into cw-e-dev ↵Andriy Naborskyy2016-04-201-1/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 86d5272 am: 8cae361 am: 151cc4a * commit '151cc4a91a92447a78a964bf1164b50ac8921f65': remove compass from default wearable_core_hardware.xml Change-Id: I8bccf9e0315cef64470949645f8e1f327ca2bfef
| * | Merge "remove compass from default wearable_core_hardware.xml" into cw-e-dev ↵Andriy Naborskyy2016-04-201-1/+2
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 86d5272 am: 8cae361 * commit '8cae361cd12eba8e79938598d5e76820fc3a8a09': remove compass from default wearable_core_hardware.xml Change-Id: Ia9c99fa7c739abf7963258d39710645629e0502e
| | * \ Merge "remove compass from default wearable_core_hardware.xml" into cw-e-devAndriy Naborskyy2016-04-201-1/+2
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 86d5272 * commit '86d5272389ec8077765684f2b89e99c623833850': remove compass from default wearable_core_hardware.xml Change-Id: Idc888dee9bbf8521285a131577952bd4d48dc9c7
| | | * \ Merge "remove compass from default wearable_core_hardware.xml" into cw-e-devAndriy Naborskyy2016-04-201-1/+2
| | | |\ \
| | | | * | remove compass from default wearable_core_hardware.xmlAndriy Naborskyy2016-04-131-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The compass is not a required Android Wear sensor. BUG: 22854370 Change-Id: Ibe3cb1a80bab59cee294a34aa3331fb92a5ca0d6
* | | | | | Merge "BQ: Avoid unnecessary calls to consumer listener" into nyc-devPablo Ceballos2016-04-202-1/+15
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 72b5975 * commit '72b59753f90df64b3dd86fa6a166b24c8b64b985': BQ: Avoid unnecessary calls to consumer listener Change-Id: Ia255fad9ae1d3f68488891b92731a46efdc0baab
| * | | | | Merge "BQ: Avoid unnecessary calls to consumer listener" into nyc-devPablo Ceballos2016-04-202-1/+15
| |\ \ \ \ \
| | * | | | | BQ: Avoid unnecessary calls to consumer listenerPablo Ceballos2016-04-192-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Try to avoid unnecessary calls to the consumer listener's onBuffersReleased() since they can potentially deadlock. Bug 28254168 Change-Id: Ib064e5ebe1403a1028589342b3c33e6f40bb54a9
* | | | | | | Merge "libgui: Add getLastQueuedBuffer to BufferQueue" into nyc-devDan Stoza2016-04-2013-1/+169
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 4908a01 * commit '4908a010f63c7d0a6d9a1f4b67c3453a116d1556': libgui: Add getLastQueuedBuffer to BufferQueue Change-Id: I0ec082bd8d8413043dd0f4b6a9ec2c84581a585b
| * | | | | | Merge "libgui: Add getLastQueuedBuffer to BufferQueue" into nyc-devJesse Hall2016-04-2013-1/+169
| |\ \ \ \ \ \
| | * | | | | | libgui: Add getLastQueuedBuffer to BufferQueueDan Stoza2016-04-1913-1/+169
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds the ability to get the last buffer queued to a BufferQueue plus its acquire fence. Bug: 27708453 Change-Id: Iee39475740b40c854a5f46178b2934fd930e61b8
* | | | | | | | Merge "DispSync: Actually wait forever" into nyc-devDan Stoza2016-04-191-6/+10
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 8a56bb7 * commit '8a56bb70c736245e875635d3093d70a51394dea5': DispSync: Actually wait forever Change-Id: I9e0a1c2420b6d8924f148d2acac92cffe7f5acec
| * | | | | | | Merge "DispSync: Actually wait forever" into nyc-devDan Stoza2016-04-191-6/+10
| |\ \ \ \ \ \ \
| | * | | | | | | DispSync: Actually wait foreverDan Stoza2016-04-191-6/+10
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When computeNextEventTimeLocked returns INT64_MAX (because there are currently no listeners), wait until the condition variable is signaled instead of waiting for a long timeout. Since the condition variable timeout is specified using CLOCK_REALTIME behind the scenes, we can receive false wakeups in the presence of large system clock changes. Bug: 28152577 Change-Id: I88dbab5d5d0776cb25dea76a4574db055b308fd1
* | | | | | | | Merge "vulkan: replace std::shared_ptr by android::sp" into nyc-devChia-I Wu2016-04-192-94/+6
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: ef6f4f0 * commit 'ef6f4f0b3beb7979628851217222faf3ef35a6c2': vulkan: replace std::shared_ptr by android::sp Change-Id: I4f2c9cf212fc90d6086bce07af6b75a9d98494e1
| * | | | | | | Merge "vulkan: replace std::shared_ptr by android::sp" into nyc-devChia-I Wu2016-04-192-94/+6
| |\ \ \ \ \ \ \
| | * | | | | | | vulkan: replace std::shared_ptr by android::spChia-I Wu2016-04-192-94/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With the change, we do not handle exceptions anymore. Remove -fexceptions. Bug: 26732452 Change-Id: I2782f9b522cb25f158515fcf90312013e672225b
* | | | | | | | | Merge "DispSync: Don\'t resync if HW vsync is unavailable" into nyc-devDan Stoza2016-04-192-4/+6
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 15732be * commit '15732be8aaa961a8eeb50a2cd3db76981ff2e83f': DispSync: Don't resync if HW vsync is unavailable Change-Id: Ifc1ece90ebafe3d984e089b6aeffa9fd03c3fcef
| * | | | | | | | Merge "DispSync: Don't resync if HW vsync is unavailable" into nyc-devDan Stoza2016-04-192-4/+6
| |\ \ \ \ \ \ \ \
| | * | | | | | | | DispSync: Don't resync if HW vsync is unavailableDan Stoza2016-04-192-4/+6
| | | |/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't attempt to resync to hardware vsync if it's not available (if the display is blanked), which should prevent unusual sequences of commands (enable vsync, then unblank) to hardware composer. Bug: 28177844 Change-Id: I9d6046fb0a346830e98829fd250642f0809d7e31
* | | | | | | | | Merge "SF: Fix camera orientation on virtual displays" into nyc-devPablo Ceballos2016-04-193-10/+39
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 55b29f2 * commit '55b29f2ec5d62a13eb374501ebc4691eadd3997a': SF: Fix camera orientation on virtual displays Change-Id: Id2a9b2b48d11de2097ee29a000338e94f9d663d0
| * | | | | | | | Merge "SF: Fix camera orientation on virtual displays" into nyc-devPablo Ceballos2016-04-193-10/+39
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | SF: Fix camera orientation on virtual displaysPablo Ceballos2016-04-183-10/+39
| | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Camera uses NATIVE_WINDOW_TRANSFORM_INVERSE_DISPLAY to make the camera preview always look upright on the device display. This commit changes the behavior of this flag slightly. Instead of applying the inverse transform of the current display when compositing, apply the inverse transform of the primary display to all displays. This assumes that the camera orientation is tied to the primary display. Bug 2628180 Change-Id: I0da22423490a93fe943fd59e6c122aa6aaf30b11
* | | | | | | | Merge "Revert "Revert "DispSync: Always resync after inactivity""" into nyc-devTim Murray2016-04-197-65/+204
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 6328134 * commit '6328134d8f3969e5cf345bec84b2c6455afc6a34': Revert "Revert "DispSync: Always resync after inactivity"" Change-Id: Ibfeff32f7d151606e0380354c1c498124b87acda
| * | | | | | | Merge "Revert "Revert "DispSync: Always resync after inactivity""" into nyc-devTim Murray2016-04-197-65/+204
| |\ \ \ \ \ \ \
| | * | | | | | | Revert "Revert "DispSync: Always resync after inactivity""Tim Murray2016-04-197-65/+204
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 67264e930992e43ef3351b04692d4ca59cbb01ad. We've fixed the kernel issues this exposed. bug 28198793 Change-Id: Ie895cc0a815094cce4bee3b2bf45800ee1e2fdc3
* | | | | | | | | Look EGL extension matches beyond partial matchKalle Raita2016-04-181-3/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 7804aa2 * commit '7804aa25c1288002269d4bd29f535cad8b55f365': Look EGL extension matches beyond partial match Change-Id: Ib1e00ebc4e5548d35b5fd6cb9a7f496046288550
| * | | | | | | | Look EGL extension matches beyond partial matchKalle Raita2016-04-181-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 28198559 Change-Id: I8d483d04e855b62432e1da786629890d09ae9d00
* | | | | | | | | Merge "Consistent creation/destruction of user data." into nyc-devJeff Sharkey2016-04-185-54/+36
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 82784bb * commit '82784bbeb8668c18f8cdbafaac3faab5d296e9ac': Consistent creation/destruction of user data. Change-Id: Idb0b24fe8d908717b7d06715680609bf63da4bd5
| * | | | | | | | Merge "Consistent creation/destruction of user data." into nyc-devJeff Sharkey2016-04-185-54/+36
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Consistent creation/destruction of user data.Jeff Sharkey2016-04-155-54/+36
| | | |_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Preparing and destroying users currently needs to be split across installd, system_server, and vold, since no single party has all the required SELinux permissions. Start passing down flags so we only prepare/destroy storage areas that have keys currently installed. Add delete_dir_contents_and_dir() argument to ignore ENOENT, since all we care about is the directory being gone. Bug: 27896918 Change-Id: Ia1cccc9b35e6ff09e3ca50effeab676157b856e8
* | | | | | | | | Merge "Add new MotionEvent flag for partially obscured windows." into ↵Michael Wright2016-04-185-3/+61
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mnc-dev am: 58dc18a am: ab4b3c3 am: 2352674 am: c846278 am: 455f288 * commit '455f288a7db0e94be6a5c5277c8f09eb1b1ffd13': Add new MotionEvent flag for partially obscured windows. Change-Id: I13aeb4c3673b534e33dd6eb7d37f1a1520b0a301
| * | | | | | | | Merge "Add new MotionEvent flag for partially obscured windows." into ↵Michael Wright2016-04-185-3/+61
| |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mnc-dev am: 58dc18a am: ab4b3c3 am: 2352674 am: c846278 * commit 'c846278141c94385a2c931a1df80ed3ffcc8e7c2': Add new MotionEvent flag for partially obscured windows. Change-Id: Ia0940c0440b94922fde7a93ef5d95df59aed3c3e
| | * | | | | | | Merge "Add new MotionEvent flag for partially obscured windows." into ↵Michael Wright2016-04-185-3/+61
| | |\ \ \ \ \ \ \ | | | | |_|_|_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mnc-dev am: 58dc18a am: ab4b3c3 am: 2352674 * commit '23526744e686a97487ac17bf344cf6932532c9d2': Add new MotionEvent flag for partially obscured windows. Change-Id: I383a125570663a744d8091860612f948cbf180fd