OSDN Git Service
Chia-I Wu [Fri, 29 Jul 2016 02:59:53 +0000 (02:59 +0000)]
libvulkan: Fix for -Wcast-calling-convention
am:
359d801bbd
Change-Id: I25c1ee776be7f04a1f4e5193088adda3849e685a
Jesse Hall [Mon, 25 Jul 2016 06:22:49 +0000 (06:22 +0000)]
resolve merge conflicts of
75b79d3 to stage-aosp-master
am:
21f67731bb
Change-Id: I8d823ce09258b4b6ee1ec9dece8a46794d6fe87a
Jesse Hall [Mon, 25 Jul 2016 06:14:18 +0000 (23:14 -0700)]
resolve merge conflicts of
75b79d3 to stage-aosp-master
Change-Id: Ia7201fb25389688231cbcfb1ac24aeef7dec79d8
Jesse Hall [Mon, 25 Jul 2016 03:54:48 +0000 (03:54 +0000)]
Merge \\"egl: Enable EGL_KHR_GL_COLORSPACE\\" am:
5271156353
am:
fe11e10bb6
Change-Id: Ib0bf287687b91e6d78d33185023244fb93abf3b7
Sandeep Shinde [Mon, 25 Jul 2016 03:48:26 +0000 (03:48 +0000)]
Merge \"egl: Enable EGL_KHR_GL_COLORSPACE\"
am:
5271156353
Change-Id: I2c2538852782bef9026b354ad1c0aca1e0fedbeb
Jesse Hall [Mon, 25 Jul 2016 03:38:04 +0000 (03:38 +0000)]
Merge "egl: Call loseCurrent after eglReleaseThread"
Jesse Hall [Mon, 25 Jul 2016 03:36:53 +0000 (03:36 +0000)]
Merge "egl: Enable EGL_KHR_GL_COLORSPACE"
Elliott Hughes [Fri, 22 Jul 2016 17:50:30 +0000 (17:50 +0000)]
Merge \\"Fix a typo in the atrace help text.\\" am:
133650e5b1
am:
97acea9a6f
Change-Id: I7a3d3921245ab300898a99f237b7bf5d80edda66
Elliott Hughes [Fri, 22 Jul 2016 17:47:33 +0000 (17:47 +0000)]
Merge \"Fix a typo in the atrace help text.\"
am:
133650e5b1
Change-Id: Idc66112bedc8f6a31bd73e479bd8905a7875d360
Treehugger Robot [Fri, 22 Jul 2016 17:35:05 +0000 (17:35 +0000)]
Merge "Fix a typo in the atrace help text."
Elliott Hughes [Fri, 22 Jul 2016 16:38:44 +0000 (09:38 -0700)]
Fix a typo in the atrace help text.
Change-Id: I1b9d04d3d17e851d08a8ae39e26483e106516b88
Elliott Hughes [Fri, 22 Jul 2016 16:07:25 +0000 (16:07 +0000)]
resolve merge conflicts of
f5b35b6 to stage-aosp-master
am:
b59e296147
Change-Id: I9a8b3f84cf23a26dbbaf729c12515b838012c147
Elliott Hughes [Fri, 22 Jul 2016 16:00:59 +0000 (09:00 -0700)]
resolve merge conflicts of
f5b35b6 to stage-aosp-master
Change-Id: Ie1ac182893214022a68746f563765f6a271f8d1d
Treehugger Robot [Fri, 22 Jul 2016 15:49:13 +0000 (15:49 +0000)]
Merge "Clean up memory allocation in dumpTrace."
Chia-I Wu [Fri, 22 Jul 2016 02:36:33 +0000 (10:36 +0800)]
libvulkan: Fix for -Wcast-calling-convention
It should be harmless, as NoOp does not use any argument and should never
be reached.
Bug:
30290462
Change-Id: I0592c3ce10c510713525b5aa0bd38a2f9adc5898
Elliott Hughes [Fri, 22 Jul 2016 00:12:15 +0000 (17:12 -0700)]
Clean up memory allocation in dumpTrace.
Bug: http://b/
20674092
Change-Id: Id8ba2b0efc1641929790770714e48cde545fb3b0
Andreas Gampe [Thu, 21 Jul 2016 23:22:16 +0000 (23:22 +0000)]
Merge \"Dumpstate: Fix long lines.\" into stage-aosp-master
am:
fde0beac8f
Change-Id: Ie5230f962c39bb2134d2347ab848a12c498a7ce0
Dan Willemsen [Thu, 21 Jul 2016 20:50:00 +0000 (20:50 +0000)]
Merge "Dumpstate: Fix long lines." into stage-aosp-master
Roshan Pius [Thu, 21 Jul 2016 18:31:39 +0000 (18:31 +0000)]
Merge \\"Add |readString8| method which returns failure\\" am:
115e6ec7e9
am:
83b9ea5d1f
Change-Id: Ib43e53e377a4315c141d9e3bcd16d287d4175cf3
Roshan Pius [Thu, 21 Jul 2016 18:28:38 +0000 (18:28 +0000)]
Merge \"Add |readString8| method which returns failure\"
am:
115e6ec7e9
Change-Id: Iaf1ea3b66ed242dcd82a88ebc0556c08a5fdf85e
Roshan Pius [Thu, 21 Jul 2016 18:19:33 +0000 (18:19 +0000)]
Merge "Add |readString8| method which returns failure"
Roshan Pius [Mon, 18 Jul 2016 19:51:02 +0000 (12:51 -0700)]
Add |readString8| method which returns failure
Add a new method to return |String8| read failures from Parcels.
BUG:
30189542
Change-Id: I65b59887dd9a15068abe95d24d390aa577bc49a6
Christopher Ferris [Wed, 20 Jul 2016 18:18:24 +0000 (18:18 +0000)]
Merge \\"Change to include linux/android/binder.h.\\" am:
b34400ea94
am:
173b3eff35
Change-Id: I1698162d5b0b04ed427a3f5e9a7b327c95b7dd77
Christopher Ferris [Wed, 20 Jul 2016 18:09:35 +0000 (18:09 +0000)]
Merge \"Change to include linux/android/binder.h.\"
am:
b34400ea94
Change-Id: I1aab76bd51c448410d1d9ff3ae288013c81c8d52
Christopher Ferris [Wed, 20 Jul 2016 18:03:47 +0000 (18:03 +0000)]
Merge "Change to include linux/android/binder.h."
Christopher Wiley [Wed, 20 Jul 2016 15:38:31 +0000 (15:38 +0000)]
Fix unused variable build errors
am:
0a9a1c1ba5
Change-Id: I331cd47269fac66990783cb60571e0b9a0a0ba85
Christopher Wiley [Wed, 20 Jul 2016 15:28:14 +0000 (08:28 -0700)]
Fix unused variable build errors
Change-Id: Ia4f5dc95110b75eefc41b2828990cdbbcb75c033
Christopher Wiley [Wed, 20 Jul 2016 15:13:00 +0000 (15:13 +0000)]
Merge \\"libbinder: Tighten compiler warnings/errors\\" am:
ead989c34d
am:
abf1adc163
Change-Id: Ie24c6550d8046f900fa65ed472366df2f23e319d
Christopher Wiley [Wed, 20 Jul 2016 15:10:31 +0000 (15:10 +0000)]
Merge \"libbinder: Tighten compiler warnings/errors\"
am:
ead989c34d
Change-Id: I8d06de42b9ac861b3189db936656cf906ba3597f
Treehugger Robot [Wed, 20 Jul 2016 15:04:31 +0000 (15:04 +0000)]
Merge "libbinder: Tighten compiler warnings/errors"
Pirama Arumuga Nainar [Wed, 20 Jul 2016 00:30:06 +0000 (00:30 +0000)]
Disable -Wcast-calling-convention for vulkan
am:
d2c942f42a
Change-Id: I640038e8dea1a725bb368ae23e4cb2b9020c938a
Pirama Arumuga Nainar [Tue, 28 Jun 2016 21:45:29 +0000 (14:45 -0700)]
Disable -Wcast-calling-convention for vulkan
The following warning is triggered by the upcoming Clang update to
r271374:
frameworks/native/vulkan/libvulkan/stubhal.cpp:114:12: error: cast
between incompatible calling conventions 'cdecl' and 'aapcs-vfp'; calls
through thispointer may abort at runtime
[-Werror,-Wcast-calling-convention]
return reinterpret_cast<PFN_vkVoidFunction>(NoOp);
Change-Id: I8de75fd6a3b579a91598aebbdd23bf74b57c3593
(cherry picked from commit
b4c0eb1d203f88f0ef9ef9c360c03bcbb3e90efc)
Sandeep Shinde [Tue, 10 Feb 2015 10:34:15 +0000 (16:04 +0530)]
egl: Enable EGL_KHR_GL_COLORSPACE
Add EGL_KHR_GL_COLORSPACE extension to EGL header.
Enable EGL_KHR_GL_COLORSPACE extension handling in meta EGL layer.
Change-Id: If6d3fe26c411ddc83d8b23bf16e93862cf68c1b6
Pirama Arumuga Nainar [Tue, 28 Jun 2016 21:45:29 +0000 (14:45 -0700)]
Disable -Wcast-calling-convention for vulkan
The following warning is triggered by the upcoming Clang update to
r271374:
frameworks/native/vulkan/libvulkan/stubhal.cpp:114:12: error: cast
between incompatible calling conventions 'cdecl' and 'aapcs-vfp'; calls
through thispointer may abort at runtime
[-Werror,-Wcast-calling-convention]
return reinterpret_cast<PFN_vkVoidFunction>(NoOp);
Change-Id: I8de75fd6a3b579a91598aebbdd23bf74b57c3593
Andreas Gampe [Tue, 19 Jul 2016 01:24:05 +0000 (18:24 -0700)]
Dumpstate: Fix long lines.
Follow-up to commit
aff684300a3b7d6984d3b3c1efddb810cd0205e7.
Change-Id: I3faa645b0da7ea27ce3a8df2dbd3b6a50bc1c2bd
(cherry picked from commit
27cd7b256eb08bf9dec7e4e8af8375711ab10225)
Andreas Gampe [Tue, 19 Jul 2016 19:54:03 +0000 (19:54 +0000)]
Dumpstate: Use unique_fd
am:
0079a59c43 -s ours
Change-Id: Ie78509bf00777e9dbd16d4dafca22715703f94fa
Andreas Gampe [Tue, 19 Jul 2016 01:01:27 +0000 (18:01 -0700)]
Dumpstate: Use unique_fd
ScopedFd has been deprecated (and removed) in favor of unique_fd.
Bug:
21192156
Change-Id: Ic46ca6d349bf0cc640b7d4008ac540d2c6d08568
(cherry picked from commit
aff684300a3b7d6984d3b3c1efddb810cd0205e7)
Christopher Wiley [Tue, 19 Jul 2016 18:21:27 +0000 (18:21 +0000)]
Merge \\"Fix broken readNullableStrongBinder<T> implementation\\" am:
6e81c9a4c6
am:
869f04bedb
Change-Id: If89b553521a2ebe384dbd63756364c263c75cfd3
Christopher Wiley [Tue, 19 Jul 2016 18:19:00 +0000 (18:19 +0000)]
Merge \"Fix broken readNullableStrongBinder<T> implementation\"
am:
6e81c9a4c6
Change-Id: I4342a65c92cbc70f716b21c730f355da3f98dbbb
Treehugger Robot [Tue, 19 Jul 2016 18:06:37 +0000 (18:06 +0000)]
Merge "Fix broken readNullableStrongBinder<T> implementation"
Christopher Wiley [Tue, 19 Jul 2016 16:40:13 +0000 (09:40 -0700)]
libbinder: Tighten compiler warnings/errors
Use all of -Wall -Wextra -Werror and fix the minor errors that result.
Change-Id: Id56e9c454dd3570f713d161577eed6aa8e8074aa
Christopher Wiley [Tue, 19 Jul 2016 16:23:25 +0000 (09:23 -0700)]
Fix broken readNullableStrongBinder<T> implementation
Added a missing return statement. Omitting this statement
caused the compiler to silently cast a pointer to a status_t,
which in general wasn't the expected value of OK.
Only return an error when the type casted return value is null and
the IBinder we got back was not null, indicating a type error, rather
than the expected null binder.
Bug:
30160959
Change-Id: Ief3c924b902a607335eff2fcd4d860cd8523593a
Test: Integration tests in aidl that exercise this method now pass.
Andreas Gampe [Tue, 19 Jul 2016 01:24:05 +0000 (18:24 -0700)]
Dumpstate: Fix long lines.
Follow-up to commit
aff684300a3b7d6984d3b3c1efddb810cd0205e7.
Change-Id: I3faa645b0da7ea27ce3a8df2dbd3b6a50bc1c2bd
Andreas Gampe [Tue, 19 Jul 2016 01:01:27 +0000 (18:01 -0700)]
Dumpstate: Use unique_fd
ScopedFd has been deprecated (and removed) in favor of unique_fd.
Bug:
21192156
(cherry picked from commit
aff684300a3b7d6984d3b3c1efddb810cd0205e7)
Change-Id: Ic46ca6d349bf0cc640b7d4008ac540d2c6d08568
Christopher Ferris [Mon, 18 Jul 2016 23:57:34 +0000 (16:57 -0700)]
Change to include linux/android/binder.h.
The upstream kernels have binder.h as linux/android/binder.h, so
match that.
Bug:
30072483
Change-Id: Iacdc96629dd09c1f4be0a5767666ab64b3df8f15
Pablo Ceballos [Mon, 18 Jul 2016 22:35:19 +0000 (22:35 +0000)]
Region: Detect malicious overflow in unflatten am:
1a65fccc50 am:
fd579a51b5 am:
0e85f4d48d am:
0ec362e024
am:
b82c6f52c0
Change-Id: Iae280f2d174a8144e7c9fa657cd346597658927c
Pablo Ceballos [Mon, 18 Jul 2016 22:32:55 +0000 (22:32 +0000)]
Region: Detect malicious overflow in unflatten am:
1a65fccc50 am:
fd579a51b5 am:
0e85f4d48d
am:
0ec362e024
Change-Id: Ibf1f0aedeab8552fe2a211d01d8b5c2c1ddafcdd
Pablo Ceballos [Mon, 18 Jul 2016 22:30:46 +0000 (22:30 +0000)]
Region: Detect malicious overflow in unflatten am:
1a65fccc50 am:
fd579a51b5
am:
0e85f4d48d
Change-Id: I6d8ed780a6ec9d8e5b3ec17b20bce528835b4bf0
Pablo Ceballos [Mon, 18 Jul 2016 22:28:15 +0000 (22:28 +0000)]
Region: Detect malicious overflow in unflatten am:
1a65fccc50
am:
fd579a51b5
Change-Id: I2d584199f001f7da8f4331729d796cf527ba79fd
Pablo Ceballos [Mon, 18 Jul 2016 22:25:45 +0000 (22:25 +0000)]
Region: Detect malicious overflow in unflatten
am:
1a65fccc50
Change-Id: I597a130dfe82c21c5611f45f6977b189c0a1a8ea
Evgenii Stepanov [Thu, 14 Jul 2016 21:52:54 +0000 (21:52 +0000)]
Merge \\"Workaround alloc-dealloc-mismatch error on ASan device boot.\\" am:
7d8f246415
am:
23d1d10872
Change-Id: I5b8baa53812fa991cc7fa45c64e620045f2687ca
Evgenii Stepanov [Thu, 14 Jul 2016 21:50:29 +0000 (21:50 +0000)]
Merge \"Workaround alloc-dealloc-mismatch error on ASan device boot.\"
am:
7d8f246415
Change-Id: Ic34e6263619b98739f935e0aa05bf50aa7399829
Evgenii Stepanov [Thu, 14 Jul 2016 21:39:39 +0000 (21:39 +0000)]
Merge "Workaround alloc-dealloc-mismatch error on ASan device boot."
Evgenii Stepanov [Thu, 14 Jul 2016 21:17:24 +0000 (14:17 -0700)]
Workaround alloc-dealloc-mismatch error on ASan device boot.
/proc/self/environ inaccessible in SurfaceFlinger
=> ASan fails to read ASAN_OPTIONS => alloc-dealloc-mismatch bug is not
suppressed and prevents the device from booting.
This is not perfect because, by enabling it in asan build only, the first several attempts to start
surfaceflinger fail while the /data partition is being encrypted. On the other hand, this does not affect
user builds, and device eventually gets up anyway.
BUG=b/
30067360
Change-Id: Ieaa37ff7768a11450ea33fee1f7d70a41b246c6a
Sergio Giro [Thu, 14 Jul 2016 18:07:50 +0000 (18:07 +0000)]
Add bound checks to utf16_to_utf8
am:
9b39ebe132
Change-Id: I1b3aa4ab0c3f6f4b577d10dda8ce9604d0fc4e9c
Pablo Ceballos [Wed, 13 Jul 2016 21:11:57 +0000 (14:11 -0700)]
Region: Detect malicious overflow in unflatten
Bug
29983260
Change-Id: Ib6e1cb8ae279010c5e9960aaa03513f55b7d873b
Sergio Giro [Tue, 28 Jun 2016 17:19:33 +0000 (18:19 +0100)]
Add bound checks to utf16_to_utf8
Bug:
29250543
Change-Id: I518e7b2fe10aaa3f1c1987586a09b1110aff7e1a
(cherry picked from commit
7e93b2ddcb49b5365fbe1dab134ffb38e6f1c719)
Lazar Trsic [Wed, 13 Jul 2016 18:42:29 +0000 (18:42 +0000)]
Merge \\"[mips] Resolve issue with .align directive, when using clang IAS\\" am:
febb7ea6a0
am:
bf8f1cdaf0
Change-Id: I8dd76819ef91b080b42cc9bac25a43b657d66e48
Lazar Trsic [Wed, 13 Jul 2016 18:39:54 +0000 (18:39 +0000)]
Merge \"[mips] Resolve issue with .align directive, when using clang IAS\"
am:
febb7ea6a0
Change-Id: I38969dbcd1251355cf3b7bbbf2e25a20930c28df
Treehugger Robot [Wed, 13 Jul 2016 18:34:54 +0000 (18:34 +0000)]
Merge "[mips] Resolve issue with .align directive, when using clang IAS"
Lazar Trsic [Wed, 13 Jul 2016 12:53:07 +0000 (14:53 +0200)]
[mips] Resolve issue with .align directive, when using clang IAS
Clang IAS does not support .align without args, concrete value is needed.
Change-Id: I03a9daca0be380daa744307b3510446f8d6c9b7e
smain@google.com [Mon, 11 Jul 2016 17:05:06 +0000 (17:05 +0000)]
update NDK doxygen templates to create DevSite-style HTML.
am:
20e2095c7b
Change-Id: I14176725080533151df88e20a43bc78550975011
smain@google.com [Fri, 8 Jul 2016 00:11:35 +0000 (17:11 -0700)]
update NDK doxygen templates to create DevSite-style HTML.
Previously, we had doxygen create .jd files with some syntax that
was parsed by the DocLava build tools when creating the final HTML
files for the website. But now that we're publishing these docs through
Piper, we don't need to run them through DocLava anymore. So with this
change, we now create .html files that then need to be copied to
google3/googledata/devsite/site-android/en/ndk/
where they can be immediately published via devsite once merged.
bug:
29943712
Change-Id: I8af5555f802e8c0122378bd504ad4308ff9aad56
Chih-hung Hsieh [Thu, 7 Jul 2016 22:04:33 +0000 (22:04 +0000)]
Merge \\"Fix misc-macro-parentheses warnings in opengl.\\" am:
d4ffb636d8
am:
db7f636c16
Change-Id: I5ec41ce5409e7ebb942c785cf33f3af988831273
Chih-Hung Hsieh [Thu, 7 Jul 2016 22:01:18 +0000 (22:01 +0000)]
Merge \"Fix misc-macro-parentheses warnings in opengl.\"
am:
d4ffb636d8
Change-Id: I93f0fca53e380f0272ef10c4d38ea0033cef7cc4
Chih-hung Hsieh [Thu, 7 Jul 2016 21:55:37 +0000 (21:55 +0000)]
Merge "Fix misc-macro-parentheses warnings in opengl."
Pablo Ceballos [Thu, 30 Jun 2016 23:30:05 +0000 (23:30 +0000)]
BQ: Add and expose a unique id
am:
8e3e92b906
Change-Id: I2602c1d2f5247cf0b3d2718f52dddba6c23c003d
Chih-Hung Hsieh [Wed, 29 Jun 2016 21:25:19 +0000 (14:25 -0700)]
Fix misc-macro-parentheses warnings in opengl.
Add parentheses around negative literals.
Bug:
28705665
Test: build with clang-tidy
Change-Id: I342f1d04ac08bbc28ee3ff4ebbbccbfa9f754a94
Pablo Ceballos [Tue, 28 Jun 2016 00:56:53 +0000 (17:56 -0700)]
BQ: Add and expose a unique id
Bug
29422927
Change-Id: I80eab94f073ebc378302f00fa86a740c3643657e
Mark Salyzyn [Fri, 24 Jun 2016 23:31:24 +0000 (23:31 +0000)]
dumpstate: Also pick up /sys/fs/pstore/console-ramoops-0 for LAST KMSG
am:
ced6078b0e
Change-Id: I5972646a22b4a853d5e711d5574c6776a781a5bd
Mark Salyzyn [Fri, 24 Jun 2016 21:37:00 +0000 (21:37 +0000)]
Merge \\"dumpstate: Also pick up /sys/fs/pstore/console-ramoops-0 for LAST KMSG\\" am:
00e3f2995f
am:
db290501a5
Change-Id: Ib628ab8c43db208fa891d1e19f483a1f6bea21e0
Mark Salyzyn [Fri, 24 Jun 2016 21:35:07 +0000 (21:35 +0000)]
Merge \"dumpstate: Also pick up /sys/fs/pstore/console-ramoops-0 for LAST KMSG\"
am:
00e3f2995f
Change-Id: Ie0eed7a01655af927304b148005e9a37f9c11883
Mark Salyzyn [Fri, 24 Jun 2016 21:06:15 +0000 (14:06 -0700)]
dumpstate: Also pick up /sys/fs/pstore/console-ramoops-0 for LAST KMSG
(cherry pick from commit
7d0a762ecaf9f4d005f0f6db913034c2e084d362)
Bug:
29639467
Change-Id: Iba0b1754eaebfb2b0624dcbef522b7d8456eeb50
Mark Salyzyn [Fri, 24 Jun 2016 21:26:16 +0000 (21:26 +0000)]
Merge "dumpstate: Also pick up /sys/fs/pstore/console-ramoops-0 for LAST KMSG"
Mark Salyzyn [Fri, 24 Jun 2016 21:06:15 +0000 (14:06 -0700)]
dumpstate: Also pick up /sys/fs/pstore/console-ramoops-0 for LAST KMSG
Bug:
29639467
Change-Id: Iba0b1754eaebfb2b0624dcbef522b7d8456eeb50
Greg Kaiser [Thu, 23 Jun 2016 03:31:57 +0000 (03:31 +0000)]
Merge \"Sensor: Make getId() more varied\" into nyc-dev
am:
c0ca0ceaa5
Change-Id: Ifa6208fea63d830d07447d5232b39f9e3ccf870b
Greg Kaiser [Thu, 23 Jun 2016 03:25:44 +0000 (03:25 +0000)]
Merge "Sensor: Make getId() more varied" into nyc-dev
Greg Kaiser [Tue, 21 Jun 2016 23:11:14 +0000 (16:11 -0700)]
Sensor: Make getId() more varied
Apps from different developers will now receive a different
ID for the same dynamic sensor. Additionally, all apps
will now receive a different/new ID for the same dynamic
sensor after a factory reset.
Bug:
28775590,
29547335
Change-Id: I368655b0e4bdc16736a7fd163ea3f7dad2886b3b
Felipe Leme [Wed, 22 Jun 2016 20:29:24 +0000 (20:29 +0000)]
Merge \"Run iptables as root.\" into nyc-dev
am:
ab69cc1f11
Change-Id: I1c45a731c685ddbde7630c588fb6e53a08489a75
TreeHugger Robot [Wed, 22 Jun 2016 20:24:53 +0000 (20:24 +0000)]
Merge "Run iptables as root." into nyc-dev
Greg Kaiser [Mon, 20 Jun 2016 17:21:41 +0000 (17:21 +0000)]
Merge \"SensorList: Don\'t output UUIDs\" into nyc-dev
am:
a0c08e2f8f
Change-Id: Ia791bb67a2351f68da06e0ddc35c224677e4cead
Felipe Leme [Sat, 18 Jun 2016 00:37:13 +0000 (17:37 -0700)]
Run iptables as root.
iptables requires root access and su is not available on user builds,
hence it must be ran before dropping uid to shell user.
BUG:
29455997
Change-Id: I10c6337b411875b061ae9556b6e9c44f83301ae1
Greg Kaiser [Mon, 20 Jun 2016 16:24:51 +0000 (16:24 +0000)]
Merge "SensorList: Don't output UUIDs" into nyc-dev
Eino-Ville Talvala [Sat, 18 Jun 2016 02:18:21 +0000 (02:18 +0000)]
Merge \"BufferQueueProducer: Signal consumer when a buffer is detached\" into nyc-dev
am:
51ed38bb13
Change-Id: I9adb021022e1ed4b1a5b74eaa59cc88c5de475a6
Eino-Ville Talvala [Sat, 18 Jun 2016 02:10:11 +0000 (02:10 +0000)]
Merge "BufferQueueProducer: Signal consumer when a buffer is detached" into nyc-dev
Greg Kaiser [Fri, 17 Jun 2016 22:27:12 +0000 (15:27 -0700)]
SensorList: Don't output UUIDs
We don't want the UUIDs of dynamic sensors to be in the logs.
Bug:
28775590
Change-Id: I85ca83e0ad1a0a8ed6618999bd22d86d7ef972f9
Jesse Hall [Fri, 17 Jun 2016 21:05:17 +0000 (21:05 +0000)]
vulkan: Updated IHV documentation
am:
c2f184d9d8
Change-Id: I61d568218cedd32e7deb514fd092d7d424f26218
Jesse Hall [Fri, 17 Jun 2016 20:54:53 +0000 (13:54 -0700)]
vulkan: Updated IHV documentation
Also deleted DevelopersGuide.pdf, which was very out of date and has
been superceded by public documentation on developer.android.com.
Change-Id: I7e47177191a773eea6db3ee2af0a287877cb8532
David Brazdil [Thu, 16 Jun 2016 13:24:01 +0000 (13:24 +0000)]
Merge \"Revert \"Attach profiles to bug reports\"\" into nyc-dev
am:
ea1aa91a25
Change-Id: I736c406da5b866b712c02315a787019ad307c109
David Brazdil [Thu, 16 Jun 2016 13:11:05 +0000 (13:11 +0000)]
Merge "Revert "Attach profiles to bug reports"" into nyc-dev
David Brazdil [Thu, 16 Jun 2016 09:11:31 +0000 (09:11 +0000)]
Revert "Attach profiles to bug reports"
This reverts commit
0faf2b870f934c1cdd883d29642fd84da3b352e2.
Bug:
28610953
Bug:
29395357
Change-Id: I609fe344dfc61311e37b91b48480d9392764a598
Elliott Hughes [Wed, 15 Jun 2016 16:37:43 +0000 (16:37 +0000)]
Merge \\"No need for dumpstate to explicitly reference \\'toybox\\'...\\" am:
c1c06a7d6b
am:
b660711d76
Change-Id: I09b62f9faa6c72e804a9c3199b518cd3c5edb676
Elliott Hughes [Wed, 15 Jun 2016 16:33:42 +0000 (16:33 +0000)]
Merge \"No need for dumpstate to explicitly reference \'toybox\'...\"
am:
c1c06a7d6b
Change-Id: Icb2f2ba9cd42e7f3c209d2f7b9e14ec8443a9a16
Treehugger Robot [Wed, 15 Jun 2016 16:29:53 +0000 (16:29 +0000)]
Merge "No need for dumpstate to explicitly reference 'toybox'..."
Elliott Hughes [Tue, 14 Jun 2016 20:56:00 +0000 (13:56 -0700)]
No need for dumpstate to explicitly reference 'toybox'...
...now we've switched the symlinks over to the toybox implementations.
Change-Id: I6301e3bc8de7210bf111889ee3b014802aecf15c
Craig Donner [Tue, 14 Jun 2016 03:55:26 +0000 (03:55 +0000)]
Merge "resolve merge conflicts of
4931fb2 to nyc-mr1-dev-plus-aosp" into nyc-dev-plus-aosp
Elliott Hughes [Tue, 14 Jun 2016 01:38:37 +0000 (01:38 +0000)]
Merge \\"Move dumpstate over to toybox top.\\" am:
f5e4ac0338
am:
0498cc9683
Change-Id: Ie747d812296798d74d61bba4f9092ba0585b415d
Elliott Hughes [Tue, 14 Jun 2016 01:33:47 +0000 (01:33 +0000)]
Merge \"Move dumpstate over to toybox top.\"
am:
f5e4ac0338
Change-Id: Ib6fb7d2c0b7f5507b02dcd160cb0a24ab8ac1558
Treehugger Robot [Tue, 14 Jun 2016 01:29:49 +0000 (01:29 +0000)]
Merge "Move dumpstate over to toybox top."
Craig Donner [Tue, 14 Jun 2016 00:45:06 +0000 (17:45 -0700)]
resolve merge conflicts of
4931fb2 to nyc-mr1-dev-plus-aosp
Change-Id: Ic490104e9b7f01df5ea6404b3b5bab733fa46812
OSDN Git Service
