OSDN Git Service
Jesse Hall [Sat, 21 May 2016 21:33:42 +0000 (21:33 +0000)]
Merge "Ensure memory ordering around libagl and EGL refcount operations" into nyc-dev am:
bac438bbb6 am:
069b893273
am:
bb707e74c1
* commit '
bb707e74c1350a6e6515d16fac5f9fee041fab55':
Ensure memory ordering around libagl and EGL refcount operations
Change-Id: Id725db1be0e5b070762278b3ebd57ba72fe6c613
Jesse Hall [Sat, 21 May 2016 21:30:30 +0000 (21:30 +0000)]
Merge "Ensure memory ordering around libagl and EGL refcount operations" into nyc-dev am:
bac438bbb6
am:
069b893273
* commit '
069b893273524911a23f2b4ae8bd3508551abe5c':
Ensure memory ordering around libagl and EGL refcount operations
Change-Id: I031625a0ae0ea39840ca78c74a2e1619cf3958dc
Jesse Hall [Sat, 21 May 2016 21:27:47 +0000 (21:27 +0000)]
Merge "Ensure memory ordering around libagl and EGL refcount operations" into nyc-dev
am:
bac438bbb6
* commit '
bac438bbb682b09b618f47f2e36628a464afc8ea':
Ensure memory ordering around libagl and EGL refcount operations
Change-Id: Ie2643fd243a9aa66080457d318a35550c502fd67
Jesse Hall [Sat, 21 May 2016 21:21:42 +0000 (21:21 +0000)]
Merge "Ensure memory ordering around libagl and EGL refcount operations" into nyc-dev
Jesse Hall [Fri, 20 May 2016 17:47:07 +0000 (10:47 -0700)]
Ensure memory ordering around libagl and EGL refcount operations
The android_atomic_inc/android_atomic_dec functions don't impose
sufficient memory ordering. Using them for object refcounting could
allow an object to be destroyed prior to writes by a different thread
being visible.
Bug:
28820690
Change-Id: Ie018091035174255a22ebc52852528cdaec2d648
Jesse Hall [Fri, 20 May 2016 22:02:16 +0000 (22:02 +0000)]
vulkan: Update vulkan.h to 1.0.13 am:
2676338dd6 am:
17347b2749
am:
05942c0793
* commit '
05942c0793782b086c563b9c8543de7531ba5195':
Change-Id: I84359c71c065584ee688f3f1bfe379be6f811205
Jesse Hall [Fri, 20 May 2016 22:02:15 +0000 (22:02 +0000)]
vulkan: Update vulkan.h to 1.0.13 am:
2676338dd6 am:
ba01df4adf
am:
5270f67f34
* commit '
5270f67f343bf34f113e013eee49bff2e9f5be4e':
vulkan: Update vulkan.h to 1.0.13
Change-Id: I0d7db17319ecfaac58a6bc2ed6f507c0353a1399
Jesse Hall [Fri, 20 May 2016 21:59:54 +0000 (21:59 +0000)]
vulkan: Update vulkan.h to 1.0.13 am:
2676338dd6
am:
17347b2749
* commit '
17347b2749a32bcb4348c0c518d075a2cd3248a7':
Change-Id: Ia72bef1c913ab0b5c7b5cd492fee688c5b4878d5
Jesse Hall [Fri, 20 May 2016 21:59:35 +0000 (21:59 +0000)]
vulkan: Update vulkan.h to 1.0.13 am:
2676338dd6
am:
ba01df4adf
* commit '
ba01df4adf84d0c7f382034d165c35c80dd24934':
vulkan: Update vulkan.h to 1.0.13
Change-Id: I2c0bef1717ee1b0b9e12d04ae58ece0dbecfabad
Jesse Hall [Fri, 20 May 2016 21:57:19 +0000 (21:57 +0000)]
vulkan: Update vulkan.h to 1.0.13
am:
2676338dd6
* commit '
2676338dd692b7d1e1c276d82e6b0492db53ab2e':
vulkan: Update vulkan.h to 1.0.13
Change-Id: I7dce6307edb8d04a5706da465b5de8457d7d236a
Jesse Hall [Fri, 20 May 2016 21:56:59 +0000 (21:56 +0000)]
vulkan: Update vulkan.h to 1.0.13
am:
2676338dd6
* commit '
2676338dd692b7d1e1c276d82e6b0492db53ab2e':
vulkan: Update vulkan.h to 1.0.13
Change-Id: I25fd0770f0ff6d45851ea924bf86adbd0d1ecb50
Chih-Hung Hsieh [Fri, 20 May 2016 21:49:14 +0000 (21:49 +0000)]
Merge "Fix misc-macro-parentheses warnings in libs/gui." am:
3f5fc8aa6a am:
5abf78e6b8 am:
3495475bfd
am:
556993f4ff
* commit '
556993f4ffce1f4fe961fb85868a391a960cebb6':
Fix misc-macro-parentheses warnings in libs/gui.
Change-Id: I0f3187bbe31b78fd79ad7e0a9adaada9fd92c179
Chih-hung Hsieh [Fri, 20 May 2016 21:49:13 +0000 (21:49 +0000)]
Merge "Fix misc-macro-parentheses warnings in sensorservice and CHECK_INTERFACE." am:
bb261bf41a am:
dea1b6820d am:
22c661db12
am:
40063530eb
* commit '
40063530eb9ac8a6e87bc17d617586c45e89b9bb':
Fix misc-macro-parentheses warnings in sensorservice and CHECK_INTERFACE.
Change-Id: Id2a32c37264ea6dd879e852f0b6df737852fb3e2
Chih-hung Hsieh [Fri, 20 May 2016 21:49:12 +0000 (21:49 +0000)]
Merge "Fix misc-macro-parentheses warnings in test macros." am:
23d433c576 am:
eb209a41f1 am:
ce244b8788
am:
38c213c736
* commit '
38c213c736230e0e685b3d6d5377d54fac66ce2c':
Fix misc-macro-parentheses warnings in test macros.
Change-Id: I2f5d1823c50613b6e02cfb419d59d39d96be4586
Chih-Hung Hsieh [Fri, 20 May 2016 21:49:11 +0000 (21:49 +0000)]
resolve merge conflicts of
e375c68 to nyc-dev-plus-aosp am:
44d93a063c
am:
889709302b
* commit '
889709302b5c93d8955407a6943a5720c4c7c45f':
Fix misc-macro-parentheses warnings in opengl.
Change-Id: If4d9e6039f2459ff0913e465c88e232090cdf348
Chih-Hung Hsieh [Fri, 20 May 2016 21:46:58 +0000 (21:46 +0000)]
Merge "Fix misc-macro-parentheses warnings in libs/gui." am:
3f5fc8aa6a am:
5abf78e6b8
am:
3495475bfd
* commit '
3495475bfd55f469db9a85475b6b9036dfca9079':
Fix misc-macro-parentheses warnings in libs/gui.
Change-Id: Ib39778e0fd6c3389ebdc96eed914b531c7faf59f
Chih-Hung Hsieh [Fri, 20 May 2016 21:46:57 +0000 (21:46 +0000)]
Merge "Fix misc-macro-parentheses warnings in sensorservice and CHECK_INTERFACE." am:
bb261bf41a am:
dea1b6820d
am:
22c661db12
* commit '
22c661db1291af40928a691f5bf5dad4d077e573':
Fix misc-macro-parentheses warnings in sensorservice and CHECK_INTERFACE.
Change-Id: I94fbd78476c0ce3f5cf86fefc849602edd26f179
Chih-Hung Hsieh [Fri, 20 May 2016 21:46:57 +0000 (21:46 +0000)]
Merge "Fix misc-macro-parentheses warnings in test macros." am:
23d433c576 am:
eb209a41f1
am:
ce244b8788
* commit '
ce244b87888fa2ba5e2414801159b70848ec9673':
Fix misc-macro-parentheses warnings in test macros.
Change-Id: I452f36981fee2eca395763adca572d9b1199f950
Chih-Hung Hsieh [Fri, 20 May 2016 21:46:56 +0000 (21:46 +0000)]
resolve merge conflicts of
e375c68 to nyc-dev-plus-aosp
am:
44d93a063c
* commit '
44d93a063c34db90712f158c37d9329709282b5f':
Fix misc-macro-parentheses warnings in opengl.
Change-Id: Id1f9c8c8111d614e941331bf3a7ecb89713ca139
Chih-Hung Hsieh [Fri, 20 May 2016 21:44:05 +0000 (21:44 +0000)]
Merge "Fix misc-macro-parentheses warnings in libs/gui." am:
3f5fc8aa6a
am:
5abf78e6b8
* commit '
5abf78e6b849595b2e937563a5570375b2287bd8':
Fix misc-macro-parentheses warnings in libs/gui.
Change-Id: Ica1eb1e2fcd63b70e470d3d5527c9789a11fbcbe
Chih-hung Hsieh [Fri, 20 May 2016 21:44:05 +0000 (21:44 +0000)]
Merge "Fix misc-macro-parentheses warnings in sensorservice and CHECK_INTERFACE." am:
bb261bf41a
am:
dea1b6820d
* commit '
dea1b6820d0370914061ee6d147c2fab0c1bfd6c':
Fix misc-macro-parentheses warnings in sensorservice and CHECK_INTERFACE.
Change-Id: Icf533c544905be12e7a28fce4523f32a0b3bedb0
Chih-hung Hsieh [Fri, 20 May 2016 21:44:04 +0000 (21:44 +0000)]
Merge "Fix misc-macro-parentheses warnings in test macros." am:
23d433c576
am:
eb209a41f1
* commit '
eb209a41f14a30ceccbd52ee254181e36a8a318a':
Fix misc-macro-parentheses warnings in test macros.
Change-Id: Ia7f58971d3c828fa0bed800585cec3ca446ca655
Chih-Hung Hsieh [Fri, 20 May 2016 21:41:50 +0000 (14:41 -0700)]
resolve merge conflicts of
e375c68 to nyc-dev-plus-aosp
Change-Id: Ic6b535f7b078b674603c2df6d4ff66b29ff54c26
Chih-Hung Hsieh [Fri, 20 May 2016 20:47:28 +0000 (20:47 +0000)]
Merge "Fix misc-macro-parentheses warnings in libs/gui."
am:
3f5fc8aa6a
* commit '
3f5fc8aa6a09f09378a4ab98d2c505830a34b8a1':
Fix misc-macro-parentheses warnings in libs/gui.
Change-Id: Ia0305eda4d192465ac3993a85dc12cc4749f57a8
Chih-Hung Hsieh [Fri, 20 May 2016 20:47:26 +0000 (20:47 +0000)]
Merge "Fix misc-macro-parentheses warnings in sensorservice and CHECK_INTERFACE."
am:
bb261bf41a
* commit '
bb261bf41ae6dedfea53c896170af72dc5b7f84a':
Fix misc-macro-parentheses warnings in sensorservice and CHECK_INTERFACE.
Change-Id: I41a08c5bccc187f766ac896f11e788219440f2d7
Chih-Hung Hsieh [Fri, 20 May 2016 20:47:25 +0000 (20:47 +0000)]
Merge "Fix misc-macro-parentheses warnings in test macros."
am:
23d433c576
* commit '
23d433c5769553ba4becdf093ba9fd5d1d8640ea':
Fix misc-macro-parentheses warnings in test macros.
Change-Id: I4bd7da1675d19a08d83a553e9f980aa34c8577ac
Chih-Hung Hsieh [Fri, 20 May 2016 20:47:23 +0000 (20:47 +0000)]
Merge "Fix misc-macro-parentheses warnings in opengl."
am:
b09e70ce56
* commit '
b09e70ce56f13c319a2936d47207e0322935059f':
Fix misc-macro-parentheses warnings in opengl.
Change-Id: I6778f23285bfa0115e0222f03b52ef4f871cc2f7
Treehugger Robot [Fri, 20 May 2016 20:43:38 +0000 (20:43 +0000)]
Merge "Fix misc-macro-parentheses warnings in libs/gui."
Chih-hung Hsieh [Fri, 20 May 2016 20:40:52 +0000 (20:40 +0000)]
Merge "Fix misc-macro-parentheses warnings in sensorservice and CHECK_INTERFACE."
Chih-hung Hsieh [Fri, 20 May 2016 20:40:27 +0000 (20:40 +0000)]
Merge "Fix misc-macro-parentheses warnings in test macros."
Chih-hung Hsieh [Fri, 20 May 2016 20:40:09 +0000 (20:40 +0000)]
Merge "Fix misc-macro-parentheses warnings in opengl."
Chih-Hung Hsieh [Fri, 20 May 2016 18:46:52 +0000 (11:46 -0700)]
Fix misc-macro-parentheses warnings in libs/gui.
Bug:
28705665
Change-Id: I9fcebd23e0bcf89c41cb3cbc31cae00c8e623dbd
Chih-Hung Hsieh [Fri, 20 May 2016 18:40:04 +0000 (11:40 -0700)]
Fix misc-macro-parentheses warnings in sensorservice and CHECK_INTERFACE.
Bug:
28705665
Change-Id: I53ed01b67054327ad55a7e83143cc82283573fe1
Chih-Hung Hsieh [Fri, 20 May 2016 18:33:26 +0000 (11:33 -0700)]
Fix misc-macro-parentheses warnings in test macros.
Bug:
28705665
Change-Id: I6e64ccdae5869b66a3caa09d8f32b2fcc9c1b2b9
Chih-Hung Hsieh [Fri, 20 May 2016 18:27:11 +0000 (11:27 -0700)]
Fix misc-macro-parentheses warnings in opengl.
Bug:
28705665
Change-Id: I761d310f0dff182c288cdbb5371272f4833aa282
Felipe Leme [Fri, 20 May 2016 18:24:37 +0000 (11:24 -0700)]
Discard empty tombstones on zipped bugreport.
Change-Id: I0717e21c4a0ad66c78690e3620cfdcf2b1bbcd59
Fixes:
27146385
Jesse Hall [Fri, 20 May 2016 14:13:52 +0000 (07:13 -0700)]
vulkan: Update vulkan.h to 1.0.13
vulkan.h and vk_platform.h imported from
github.com:KhronosGroup/Vulkan-Docs @
2656f459333b3a1dc63619a9ebd83490eea22e93
Updated vulkan.api to reflect the changes in vulkan.h. There were no
changes to any of the code we generate. I didn't update the
vulkan_h.tmpl, since we're not currently using it and it was already
out of date.
Bug:
28878216
Change-Id: I71676683148fae7ad8799bd39386a931319aa395
Jesse Hall [Fri, 20 May 2016 14:12:05 +0000 (14:12 +0000)]
Merge "Merge "libvulkan: Don\'t try to load compressed/unaligned libraries from APK" into nyc-dev am:
b59de7fa32 am:
ee1988dbb0" into nyc-mr1-dev-plus-aosp
am:
5418d77183
* commit '
5418d771835c120ea12e25bc5e298623425002e1':
Change-Id: Idee8e0425364045d74999d99faaa2dafe0eaecf7
Jesse Hall [Fri, 20 May 2016 14:12:03 +0000 (14:12 +0000)]
Merge "libvulkan: Don\'t try to load compressed/unaligned libraries from APK" into nyc-dev am:
b59de7fa32 am:
f2e886c2a7
am:
30c5d2cf71
* commit '
30c5d2cf713030c9cbc66a020472f976d5ae4aab':
libvulkan: Don't try to load compressed/unaligned libraries from APK
Change-Id: Ia9857ac00c69cebd9ac50c1545c7d24accd60f13
Android Build Merger (Role) [Fri, 20 May 2016 14:09:37 +0000 (14:09 +0000)]
Merge "Merge "libvulkan: Don\'t try to load compressed/unaligned libraries from APK" into nyc-dev am:
b59de7fa32 am:
ee1988dbb0" into nyc-mr1-dev-plus-aosp
Jesse Hall [Fri, 20 May 2016 14:09:18 +0000 (14:09 +0000)]
Merge "libvulkan: Don\'t try to load compressed/unaligned libraries from APK" into nyc-dev am:
b59de7fa32
am:
f2e886c2a7
* commit '
f2e886c2a7851659feb192c97e508a7952426997':
libvulkan: Don't try to load compressed/unaligned libraries from APK
Change-Id: Ie36e867080b9988c6760d11fdd5a250a91bac3ec
Jesse Hall [Fri, 20 May 2016 14:09:18 +0000 (14:09 +0000)]
Merge "libvulkan: Don\'t try to load compressed/unaligned libraries from APK" into nyc-dev am:
b59de7fa32
am:
ee1988dbb0
* commit '
ee1988dbb0acae6c89c805f06825590756728e5d':
libvulkan: Don't try to load compressed/unaligned libraries from APK
Change-Id: I60cd16daa51cc3b87da86d37bc10f550f0afd337
Jesse Hall [Fri, 20 May 2016 14:06:32 +0000 (14:06 +0000)]
Merge "libvulkan: Don\'t try to load compressed/unaligned libraries from APK" into nyc-dev
am:
b59de7fa32
* commit '
b59de7fa32b0bcaf52d00290d075d8e9c8f2dd2b':
libvulkan: Don't try to load compressed/unaligned libraries from APK
Change-Id: Iac2f75ce638a8bb14ffe258d6e5e8e18e0701a46
Jesse Hall [Fri, 20 May 2016 14:06:31 +0000 (14:06 +0000)]
Merge "libvulkan: Don\'t try to load compressed/unaligned libraries from APK" into nyc-dev
am:
b59de7fa32
* commit '
b59de7fa32b0bcaf52d00290d075d8e9c8f2dd2b':
libvulkan: Don't try to load compressed/unaligned libraries from APK
Change-Id: I046e14ca7462635672f12f9388123c2ec6dea826
Jesse Hall [Fri, 20 May 2016 13:58:01 +0000 (13:58 +0000)]
Merge "libvulkan: Don't try to load compressed/unaligned libraries from APK" into nyc-dev
Wei Liu [Fri, 20 May 2016 05:47:41 +0000 (05:47 +0000)]
Merge "Fix the DUMPSYS skip. am:
34222565fc am:
04bb08da3c" into nyc-mr1-dev-plus-aosp
am:
ef5cefbfc4
* commit '
ef5cefbfc4a695924c69c213ac4d19ec4802cae4':
Change-Id: I619448499b204443c0fa03ee72ab90a94d4b78b3
Wei Liu [Fri, 20 May 2016 05:47:40 +0000 (05:47 +0000)]
Fix the DUMPSYS skip. am:
34222565fc am:
361329f32c
am:
139ba8961a
* commit '
139ba8961a0e99060a4c8e26c258819235d94610':
Fix the DUMPSYS skip.
Change-Id: I360824c1fecf412c5733b862bf078902853b4649
Android Build Merger (Role) [Fri, 20 May 2016 05:45:11 +0000 (05:45 +0000)]
Merge "Fix the DUMPSYS skip. am:
34222565fc am:
04bb08da3c" into nyc-mr1-dev-plus-aosp
Wei Liu [Fri, 20 May 2016 05:44:58 +0000 (05:44 +0000)]
Fix the DUMPSYS skip. am:
34222565fc
am:
04bb08da3c
* commit '
04bb08da3c14bc24ccda7cb76ab146a1a7f80a43':
Fix the DUMPSYS skip.
Change-Id: Iff57e6aa53fcaa4ad2331b34d84d029d02c0c686
Wei Liu [Fri, 20 May 2016 05:44:57 +0000 (05:44 +0000)]
Fix the DUMPSYS skip. am:
34222565fc
am:
361329f32c
* commit '
361329f32ce8b3d202116ff7b8da42b1738d6aa7':
Fix the DUMPSYS skip.
Change-Id: I3f2d3d4b820a8c668420dee1accfa30429ffaa21
Wei Liu [Fri, 20 May 2016 05:42:01 +0000 (05:42 +0000)]
Fix the DUMPSYS skip.
am:
34222565fc
* commit '
34222565fc9cf167d8ebe6068a9695f4b0b0f1b0':
Fix the DUMPSYS skip.
Change-Id: Iaf70874e0a63a40b68b121ef75698e5225fd8b3c
Wei Liu [Fri, 20 May 2016 05:42:01 +0000 (05:42 +0000)]
Fix the DUMPSYS skip.
am:
34222565fc
* commit '
34222565fc9cf167d8ebe6068a9695f4b0b0f1b0':
Fix the DUMPSYS skip.
Change-Id: I0ea7926024cec428785687582a81326a750ca669
Wei Liu [Thu, 19 May 2016 20:59:01 +0000 (13:59 -0700)]
Fix the DUMPSYS skip.
b/
28869921
Change-Id: Idc108b2d3cfd237f459467a3c399a0ba5e248d24
Jesse Hall [Thu, 19 May 2016 17:58:35 +0000 (10:58 -0700)]
libvulkan: Don't try to load compressed/unaligned libraries from APK
Bug:
28825642
Change-Id: I46ea3a54010cccf9e23696a4aff52a42a31d92b1
Chia-I Wu [Wed, 18 May 2016 23:17:05 +0000 (23:17 +0000)]
Merge "vulkan: fix double dlopen for layer libraries" into nyc-dev am:
79994146e1 am:
61c022eb77
am:
e9eb77c71f
* commit '
e9eb77c71f94e84891f1afc20a256582db237f76':
Change-Id: I870982c874c40e16ce3d76b26b0d83e767bbaa73
Chia-I Wu [Wed, 18 May 2016 23:17:05 +0000 (23:17 +0000)]
Merge "vulkan: fix double dlopen for layer libraries" into nyc-dev am:
79994146e1 am:
0e92ae1333
am:
761f286c79
* commit '
761f286c79439623d628561706582191c232f056':
vulkan: fix double dlopen for layer libraries
Change-Id: I3fc04fd338c3ea51ee2bbec0e494835f2a127f98
Chia-I Wu [Wed, 18 May 2016 23:14:25 +0000 (23:14 +0000)]
Merge "vulkan: fix double dlopen for layer libraries" into nyc-dev am:
79994146e1
am:
61c022eb77
* commit '
61c022eb77db1ef1a626869305a9c3f091554564':
Change-Id: Ib22e8f41ccd1a71b592047673105d769f99b7f96
Chia-I Wu [Wed, 18 May 2016 23:09:10 +0000 (23:09 +0000)]
Merge "vulkan: fix double dlopen for layer libraries" into nyc-dev am:
79994146e1
am:
0e92ae1333
* commit '
0e92ae13336119ef986ee7659b81c1d66c3741cf':
vulkan: fix double dlopen for layer libraries
Change-Id: Icb8992324855d2a48f86f90ba1fdbaa8b686147a
Chia-I Wu [Wed, 18 May 2016 23:05:22 +0000 (23:05 +0000)]
Merge "vulkan: fix double dlopen for layer libraries" into nyc-dev
am:
79994146e1
* commit '
79994146e18fefe37550111c5703c6a6859644d6':
vulkan: fix double dlopen for layer libraries
Change-Id: If4e42ce9d3ead2a746ab54def62ed334e7e57010
Chia-I Wu [Wed, 18 May 2016 23:04:58 +0000 (23:04 +0000)]
Merge "vulkan: fix double dlopen for layer libraries" into nyc-dev
am:
79994146e1
* commit '
79994146e18fefe37550111c5703c6a6859644d6':
vulkan: fix double dlopen for layer libraries
Change-Id: If944e79c9babd2a2e63b65f0f39f6c771deb6ceb
Chia-I Wu [Wed, 18 May 2016 22:47:45 +0000 (22:47 +0000)]
Merge "vulkan: fix double dlopen for layer libraries" into nyc-dev
Felipe Leme [Wed, 18 May 2016 21:35:07 +0000 (21:35 +0000)]
Merge "Make bugreport_dir a common variable." into nyc-mr1-dev am:
c096c45af5
am:
95fa1fe171
* commit '
95fa1fe17157bbf5559fc19a67e759c66578eebe':
Make bugreport_dir a common variable.
Change-Id: Ia64bd464260753eeaa987855cc5f1714fc043d12
Felipe Leme [Wed, 18 May 2016 21:32:27 +0000 (21:32 +0000)]
Merge "Make bugreport_dir a common variable." into nyc-mr1-dev
am:
c096c45af5
* commit '
c096c45af5623b44f98ca0c490b5ab2722ec9d7a':
Make bugreport_dir a common variable.
Change-Id: I61e7fb16df390935ab41b2caceacc3ac4d56c83d
TreeHugger Robot [Wed, 18 May 2016 21:22:26 +0000 (21:22 +0000)]
Merge "Make bugreport_dir a common variable." into nyc-mr1-dev
Mike Stroyan [Wed, 18 May 2016 18:36:49 +0000 (18:36 +0000)]
Merge "Preserve parameters to getProcAddress functions" into nyc-dev am:
accafc69f5 am:
5e0cfd484a
am:
6d2969f8b5
* commit '
6d2969f8b53f5afb6734edec3c8b0d86e67f8eab':
Change-Id: Ia45da89fe2495855aa6237788ac2c7a8b73e3c66
Pablo Ceballos [Wed, 18 May 2016 18:36:48 +0000 (18:36 +0000)]
Merge "SF: Fix arbitrary rotation with inverse display transform" into nyc-dev am:
885ac76b90 am:
19e51855bd
am:
0aab534460
* commit '
0aab534460a198ec97d4711d5cf3ca4cdc9b68a0':
Change-Id: I438911abd2077b6189bcf2a7ef73ed66e74efbe0
Dan Stoza [Wed, 18 May 2016 18:36:47 +0000 (18:36 +0000)]
HWC2: Set composition type before setting buffer am:
0f67b3f01f am:
7af047d29c
am:
7b49e0edae
* commit '
7b49e0edae2292bbe4bff0fd6520676c35c276fd':
Change-Id: Ibfde83c6cca5dac22d428e21d690439511628985
Mike Stroyan [Wed, 18 May 2016 18:28:56 +0000 (18:28 +0000)]
Merge "Preserve parameters to getProcAddress functions" into nyc-dev am:
accafc69f5
am:
5e0cfd484a
* commit '
5e0cfd484a03957513ce35506d20575e3cba3493':
Change-Id: Ia32485a279474c61bd72cfc9c38b99ac93b0a942
Pablo Ceballos [Wed, 18 May 2016 18:28:55 +0000 (18:28 +0000)]
Merge "SF: Fix arbitrary rotation with inverse display transform" into nyc-dev am:
885ac76b90
am:
19e51855bd
* commit '
19e51855bd884981b01f5d6d0958d7e391c5d352':
Change-Id: I6ba362462d83f85b00fe8209b4f4e0e13b52c770
Dan Stoza [Wed, 18 May 2016 18:28:54 +0000 (18:28 +0000)]
HWC2: Set composition type before setting buffer am:
0f67b3f01f
am:
7af047d29c
* commit '
7af047d29cf823a83142b91113de0933f15eeaec':
Change-Id: I93fa60a3040811b3b8039fd620162be21f8ca609
Mike Stroyan [Wed, 18 May 2016 18:27:39 +0000 (18:27 +0000)]
Merge "Preserve parameters to getProcAddress functions" into nyc-dev am:
accafc69f5 am:
722d6d7193
am:
fbae0fd1a6
* commit '
fbae0fd1a69b4bab0d5cc123e4227a42c8dd0718':
Preserve parameters to getProcAddress functions
Change-Id: Ib16d206a91fbd7b282b96afd20ff414948a99ed5
Pablo Ceballos [Wed, 18 May 2016 18:27:38 +0000 (18:27 +0000)]
Merge "SF: Fix arbitrary rotation with inverse display transform" into nyc-dev am:
885ac76b90 am:
d3e7cc010b
am:
e88a886de3
* commit '
e88a886de313ff115575b2213b98c8adc5f2aab9':
SF: Fix arbitrary rotation with inverse display transform
Change-Id: I89b0819b0970daa20352928677064d0c5d8e2cc1
Dan Stoza [Wed, 18 May 2016 18:27:37 +0000 (18:27 +0000)]
HWC2: Set composition type before setting buffer am:
0f67b3f01f am:
20829ec6f4
am:
d8c2909d0b
* commit '
d8c2909d0b2c4631a6ae86136e74807fdda70db3':
HWC2: Set composition type before setting buffer
Change-Id: I8338c8a5be92fde418be0ccb21b1acaf484acabd
Mike Stroyan [Wed, 18 May 2016 18:23:28 +0000 (18:23 +0000)]
Merge "Preserve parameters to getProcAddress functions" into nyc-dev am:
accafc69f5
am:
722d6d7193
* commit '
722d6d7193cc013c48e3e38b990f9515b7e92a0e':
Preserve parameters to getProcAddress functions
Change-Id: I7da8b13869e5cc87c57665f5527516e58e53e14b
Mike Stroyan [Wed, 18 May 2016 18:18:29 +0000 (18:18 +0000)]
Merge "Preserve parameters to getProcAddress functions" into nyc-dev
am:
accafc69f5
* commit '
accafc69f50aeeb57615e14ff0b787ea322a0627':
Preserve parameters to getProcAddress functions
Change-Id: I7a7cbf4bcdef8d11cac0269600ff1e59076b26fe
Mike Stroyan [Wed, 18 May 2016 18:18:10 +0000 (18:18 +0000)]
Merge "Preserve parameters to getProcAddress functions" into nyc-dev
am:
accafc69f5
* commit '
accafc69f50aeeb57615e14ff0b787ea322a0627':
Preserve parameters to getProcAddress functions
Change-Id: I1610c9053c3c710be0914d74b8a5e22c5218f525
Pablo Ceballos [Wed, 18 May 2016 18:17:16 +0000 (18:17 +0000)]
Merge "SF: Fix arbitrary rotation with inverse display transform" into nyc-dev am:
885ac76b90
am:
d3e7cc010b
* commit '
d3e7cc010b361958a14f007d7ea23a892fd05df2':
SF: Fix arbitrary rotation with inverse display transform
Change-Id: I56924e0304e6086886f8ae45a4ab40c423e6a2ed
Dan Stoza [Wed, 18 May 2016 18:17:15 +0000 (18:17 +0000)]
HWC2: Set composition type before setting buffer am:
0f67b3f01f
am:
20829ec6f4
* commit '
20829ec6f4defb154ce0c92eb356b75b1bfa26e9':
HWC2: Set composition type before setting buffer
Change-Id: I0f28878147fc702310582b4a4f26406efe741d80
Pablo Ceballos [Wed, 18 May 2016 18:09:33 +0000 (18:09 +0000)]
Merge "SF: Fix arbitrary rotation with inverse display transform" into nyc-dev
am:
885ac76b90
* commit '
885ac76b90e2f3e5cfaec7bbc8ff2e1de8d62435':
SF: Fix arbitrary rotation with inverse display transform
Change-Id: I1d67ba1dd7589d35d8a23bda701896b802c38a79
Dan Stoza [Wed, 18 May 2016 18:09:32 +0000 (18:09 +0000)]
HWC2: Set composition type before setting buffer
am:
0f67b3f01f
* commit '
0f67b3f01fc74bbd8cf4be24fce4a1e42f102282':
HWC2: Set composition type before setting buffer
Change-Id: Id90777e83c0455cd95c28acb94d1ed791222851c
Pablo Ceballos [Wed, 18 May 2016 18:09:31 +0000 (18:09 +0000)]
Merge "SF: Fix arbitrary rotation with inverse display transform" into nyc-dev
am:
885ac76b90
* commit '
885ac76b90e2f3e5cfaec7bbc8ff2e1de8d62435':
SF: Fix arbitrary rotation with inverse display transform
Change-Id: Idceb5782ac8e71e7f4e4833946a32b85df59fc69
Dan Stoza [Wed, 18 May 2016 18:09:30 +0000 (18:09 +0000)]
HWC2: Set composition type before setting buffer
am:
0f67b3f01f
* commit '
0f67b3f01fc74bbd8cf4be24fce4a1e42f102282':
HWC2: Set composition type before setting buffer
Change-Id: I41f3215b2950b55d3a86b3cb01c12056371b3802
Mike Stroyan [Wed, 18 May 2016 18:07:00 +0000 (18:07 +0000)]
Merge "Preserve parameters to getProcAddress functions" into nyc-dev
Pablo Ceballos [Wed, 18 May 2016 17:59:02 +0000 (17:59 +0000)]
Merge "SF: Fix arbitrary rotation with inverse display transform" into nyc-dev
Felipe Leme [Wed, 18 May 2016 16:27:16 +0000 (09:27 -0700)]
Make bugreport_dir a common variable.
Recently, new functions were added to dump specific files, and each of
them was requiring a file location, which was polluting main() with
variables specific to each function.
BUG:
28430346
BUG:
28640932
Change-Id: I90f044a2adb961e3038145dfd635cd3ed0042e34
Jim Miller [Wed, 18 May 2016 03:40:22 +0000 (03:40 +0000)]
Add fingerprint sensor navigation keys. am:
c1b50820d0
am:
ea6ad300f1
* commit '
ea6ad300f1ee099c8121cf7ef8f501b24abfadb0':
Add fingerprint sensor navigation keys.
Change-Id: I54ac4b81059325175093894c1f04cc21630a2f58
Jim Miller [Wed, 18 May 2016 03:33:11 +0000 (03:33 +0000)]
Add fingerprint sensor navigation keys.
am:
c1b50820d0
* commit '
c1b50820d0d59c5b83c393f9aa475c1821107d2d':
Add fingerprint sensor navigation keys.
Change-Id: Ib91d6158a619e41bc87dee9195295a9828dfbffd
Jim Miller [Wed, 18 May 2016 01:10:24 +0000 (18:10 -0700)]
Add fingerprint sensor navigation keys.
Change-Id: If27d1170ede8bf3124644d47d90384313137bb18
Allow fingerprint navigation keys to be remapped by device rotation.
Change-Id: Ibfd827504e8c9aa6895bdca79eeb13be2784d5fe
Chia-I Wu [Wed, 18 May 2016 00:50:15 +0000 (08:50 +0800)]
vulkan: fix double dlopen for layer libraries
Bug:
28826014
Change-Id: I10693426f987e63bb490ac8d1f4445ce2d195d8d
Pablo Ceballos [Tue, 17 May 2016 20:34:45 +0000 (13:34 -0700)]
SF: Fix arbitrary rotation with inverse display transform
Bug
28043535
Change-Id: I8b939e17f91cf7e5b617bbcceb9df4efcc9d0161
Mike Stroyan [Tue, 17 May 2016 20:03:49 +0000 (14:03 -0600)]
Preserve parameters to getProcAddress functions
The contents of register r0 parameter were overwritten after commit
4690754. That used an "r" register to hold larger offsets, but doing
that overwrote r0 before it was passed on to the next call.
Applying the offset as two parts allows the total largest offset of
3588+1020 to be reached without using a register to hold that value.
Use an "addne" instruction to add the _api offset of up to 1020 within
the extensions array.
Use a "ldrne" offset to add the offset to the start of the extensions
array.
Bug:
26541117
Change-Id: Ie19e4aa584c9fa6fdec4de18e858777ac59d8dbd
Dan Stoza [Tue, 17 May 2016 17:48:38 +0000 (10:48 -0700)]
HWC2: Set composition type before setting buffer
SurfaceFlinger was incorrectly setting the buffer handle before
setting the composition type. This led to cases where the layer was
initially marked as Invalid or Client, allowing HWC2 to ignore the
buffer handle, even though the layer was later changed to Device
before presentation.
Bug:
28814745
Change-Id: I41189495dcb254f04e6b2b329c044301c5cff97c
Nick Kralevich [Mon, 16 May 2016 17:25:11 +0000 (17:25 +0000)]
Merge "Merge "dumpstate: convert sprintfs to snprintfs" into nyc-dev am:
853f8f9c0b am:
6f0eb8f06d" into nyc-mr1-dev-plus-aosp
am:
80d16d1709
* commit '
80d16d170916f9ee84dfa91b64d9b83fcbf7fb3b':
Change-Id: I65043a5e7439f52a3614f091eb88a7a32d0ad079
Nick Kralevich [Mon, 16 May 2016 17:25:11 +0000 (17:25 +0000)]
Merge "dumpstate: convert sprintfs to snprintfs" into nyc-dev am:
853f8f9c0b am:
bcfac7ea88
am:
cc3ec57be9
* commit '
cc3ec57be9db06c86cce804306dff89b791d0d08':
dumpstate: convert sprintfs to snprintfs
Change-Id: I5bda9128441fd521f6c5eb6f38762899b0257c46
Android Build Merger (Role) [Mon, 16 May 2016 17:21:49 +0000 (17:21 +0000)]
Merge "Merge "dumpstate: convert sprintfs to snprintfs" into nyc-dev am:
853f8f9c0b am:
6f0eb8f06d" into nyc-mr1-dev-plus-aosp
Nick Kralevich [Mon, 16 May 2016 17:21:36 +0000 (17:21 +0000)]
Merge "dumpstate: convert sprintfs to snprintfs" into nyc-dev am:
853f8f9c0b
am:
bcfac7ea88
* commit '
bcfac7ea88a976f2449b5583352d703cb4937652':
dumpstate: convert sprintfs to snprintfs
Change-Id: Ia72e8e3a312d04429d791ec6188bc773c0647802
Nick Kralevich [Mon, 16 May 2016 17:21:36 +0000 (17:21 +0000)]
Merge "dumpstate: convert sprintfs to snprintfs" into nyc-dev am:
853f8f9c0b
am:
6f0eb8f06d
* commit '
6f0eb8f06d118ea1b605ed0923b793b09263f6da':
dumpstate: convert sprintfs to snprintfs
Change-Id: Ifba09320658b49dd624ff97dcde9a87b3a5d234e
Nick Kralevich [Mon, 16 May 2016 17:18:19 +0000 (17:18 +0000)]
Merge "dumpstate: convert sprintfs to snprintfs" into nyc-dev
am:
853f8f9c0b
* commit '
853f8f9c0b95120731459c1f7567af69ce457fe0':
dumpstate: convert sprintfs to snprintfs
Change-Id: Ie88fe46faad244e6d080e063a2d7d9a94a71cd45
Nick Kralevich [Mon, 16 May 2016 17:18:19 +0000 (17:18 +0000)]
Merge "dumpstate: convert sprintfs to snprintfs" into nyc-dev
am:
853f8f9c0b
* commit '
853f8f9c0b95120731459c1f7567af69ce457fe0':
dumpstate: convert sprintfs to snprintfs
Change-Id: I62360c6f0daec9fa1149e91141e0bb5f5a09c2d2
TreeHugger Robot [Mon, 16 May 2016 17:12:56 +0000 (17:12 +0000)]
Merge "dumpstate: convert sprintfs to snprintfs" into nyc-dev
OSDN Git Service
