OSDN Git Service
Arve Hjønnevåg [Fri, 19 Aug 2016 01:23:22 +0000 (18:23 -0700)]
resolve merge conflicts of
083f4ec to nyc-dev-plus-aosp
Change-Id: I1532b1e4ee225f821fcd6a9eaee11f20bac8c9e1
Arve Hjnnevg [Fri, 19 Aug 2016 01:15:05 +0000 (01:15 +0000)]
ServiceManager: Allow system services running as secondary users to add services am:
e6bbe69ba7 am:
2cb14836ac am:
c29c3734af am:
ce0e72911c am:
2c39ea1025 am:
fa5aafc9f3 am:
1f36bcd2ba
am:
75469c1fc9
Change-Id: Icbe1e240a365b6f473ee060cdec384db3b49db24
Arve Hjnnevg [Fri, 19 Aug 2016 01:11:01 +0000 (01:11 +0000)]
ServiceManager: Allow system services running as secondary users to add services am:
e6bbe69ba7 am:
2cb14836ac am:
c29c3734af am:
ce0e72911c am:
2c39ea1025 am:
fa5aafc9f3
am:
1f36bcd2ba
Change-Id: Ic4225509044c66a55910b827e8076cf20c4b5bba
Arve Hjnnevg [Fri, 19 Aug 2016 01:07:30 +0000 (01:07 +0000)]
ServiceManager: Allow system services running as secondary users to add services am:
e6bbe69ba7 am:
2cb14836ac am:
c29c3734af am:
ce0e72911c am:
2c39ea1025
am:
fa5aafc9f3
Change-Id: I2b83c66f04f7dbfb1740d525ba6d424c9ea42c2b
Arve Hjnnevg [Fri, 19 Aug 2016 01:04:30 +0000 (01:04 +0000)]
ServiceManager: Allow system services running as secondary users to add services am:
e6bbe69ba7 am:
2cb14836ac am:
c29c3734af am:
ce0e72911c
am:
2c39ea1025
Change-Id: I355431fb0c566965759cd3d07d481c475cb494d0
Arve Hjnnevg [Fri, 19 Aug 2016 01:01:29 +0000 (01:01 +0000)]
ServiceManager: Allow system services running as secondary users to add services am:
e6bbe69ba7 am:
2cb14836ac am:
c29c3734af
am:
ce0e72911c
Change-Id: I2c36fdb4c92359a03af1c8a563d4d73b9e2898a2
Arve Hjnnevg [Fri, 19 Aug 2016 00:58:34 +0000 (00:58 +0000)]
ServiceManager: Allow system services running as secondary users to add services am:
e6bbe69ba7 am:
2cb14836ac
am:
c29c3734af
Change-Id: I72992d6662bbace5cecce2b96389139c96d2e181
Arve Hjnnevg [Fri, 19 Aug 2016 00:49:29 +0000 (00:49 +0000)]
ServiceManager: Allow system services running as secondary users to add services am:
e6bbe69ba7
am:
2cb14836ac
Change-Id: Ia7deecedc7eff4fb35742ba9c7475ca32ecf48aa
Arve Hjnnevg [Fri, 19 Aug 2016 00:46:28 +0000 (00:46 +0000)]
ServiceManager: Allow system services running as secondary users to add services
am:
e6bbe69ba7
Change-Id: Iebb7be5ff42026adb2ff2d2b610902b995acdbc0
Arve Hjønnevåg [Thu, 18 Aug 2016 22:42:35 +0000 (15:42 -0700)]
ServiceManager: Allow system services running as secondary users to add services
This should be reverted when all system services have been cleaned up to not
do this. A process looking up a service while running in the background will
see the service registered by the active user (assuming the service is
registered on every user switch), not the service registered by the user that
the process itself belongs to.
BUG:
30795333
Change-Id: I1b74d58be38ed358f43c163692f9e704f8f31dbe
Dmitriy Filchenko [Thu, 18 Aug 2016 03:21:03 +0000 (03:21 +0000)]
Merge "Remove unused include." am:
5242fb42fb
am:
23e469f5dc
Change-Id: I830745f6bcf717089a6264a700ccf8a5e5ab96c0
Dmitriy Filchenko [Thu, 18 Aug 2016 03:17:36 +0000 (03:17 +0000)]
Merge "Remove unused include."
am:
5242fb42fb
Change-Id: Id3ccb5f3dfb9d2188b6e570eaaa6ba23438ae392
Treehugger Robot [Thu, 18 Aug 2016 03:13:47 +0000 (03:13 +0000)]
Merge "Remove unused include."
Dmitriy Filchenko [Thu, 18 Aug 2016 01:00:39 +0000 (18:00 -0700)]
Remove unused include.
BUG:
29824203
Change-Id: Ied8ccb8c30632b41f6c6c3d848dc94d7b1e731e0
Arve Hjnnevg [Tue, 9 Aug 2016 21:22:26 +0000 (21:22 +0000)]
DO NOT MERGE ServiceManager: Restore basic uid check am:
eb304f0a36 -s ours am:
a82f82293a am:
1c220583e4 am:
ce472fbb54 -s ours am:
e8cb9c8982 am:
1414d7b372 am:
b8d937caeb am:
1864a8748d -s ours
am:
a4ef62b859
Change-Id: Ia01791f2f6a16f4484fa0f965daf598d8a5bb30b
Arve Hjnnevg [Tue, 9 Aug 2016 21:18:53 +0000 (21:18 +0000)]
DO NOT MERGE ServiceManager: Restore basic uid check am:
eb304f0a36 -s ours am:
a82f82293a am:
1c220583e4 am:
ce472fbb54 -s ours am:
e8cb9c8982 am:
1414d7b372 am:
b8d937caeb
am:
1864a8748d -s ours
Change-Id: I2e022f5c528ded283a40ad3e3a4ac230070a242b
Arve Hjnnevg [Tue, 9 Aug 2016 21:16:24 +0000 (21:16 +0000)]
DO NOT MERGE ServiceManager: Restore basic uid check am:
247ae46340 am:
171ab27931 am:
101c678909 -s ours am:
e55418a857 am:
419626b496 am:
12151706b2 am:
899d956cf3 -s ours
am:
66818cfeae
Change-Id: Ide7a6b47d4a0027203741f12c8229ba3948cb3c0
Arve Hjnnevg [Tue, 9 Aug 2016 21:16:23 +0000 (21:16 +0000)]
DO NOT MERGE ServiceManager: Restore basic uid check am:
eb304f0a36 -s ours am:
a82f82293a am:
1c220583e4 am:
ce472fbb54 -s ours am:
e8cb9c8982 am:
1414d7b372
am:
b8d937caeb
Change-Id: I82f6a95334c5c8e484260f120b54ac1d386274da
Arve Hjnnevg [Tue, 9 Aug 2016 21:13:23 +0000 (21:13 +0000)]
DO NOT MERGE ServiceManager: Restore basic uid check am:
eb304f0a36 -s ours am:
a82f82293a am:
1c220583e4 am:
ce472fbb54 -s ours am:
e8cb9c8982
am:
1414d7b372
Change-Id: I50541ba686cafded699568f710627bf3e4f8aa1d
Arve Hjnnevg [Tue, 9 Aug 2016 21:10:26 +0000 (21:10 +0000)]
DO NOT MERGE ServiceManager: Restore basic uid check am:
eb304f0a36 -s ours am:
a82f82293a am:
1c220583e4 am:
ce472fbb54 -s ours
am:
e8cb9c8982
Change-Id: I9445235baf1ea98e3e47af3034fa49b0593ae1b2
Arve Hjnnevg [Tue, 9 Aug 2016 21:10:26 +0000 (21:10 +0000)]
DO NOT MERGE ServiceManager: Restore basic uid check am:
247ae46340 am:
171ab27931 am:
101c678909 -s ours am:
e55418a857 am:
419626b496 am:
12151706b2
am:
899d956cf3 -s ours
Change-Id: I107ec23f410d6ee30603596e4bd4b93c93619791
Arve Hjnnevg [Tue, 9 Aug 2016 21:07:31 +0000 (21:07 +0000)]
DO NOT MERGE ServiceManager: Restore basic uid check am:
eb304f0a36 -s ours am:
a82f82293a am:
1c220583e4
am:
ce472fbb54 -s ours
Change-Id: I9ac9efe65b6985fc7bd4e7be8a37e471023bd450
Arve Hjnnevg [Tue, 9 Aug 2016 21:07:23 +0000 (21:07 +0000)]
DO NOT MERGE ServiceManager: Restore basic uid check am:
247ae46340 am:
171ab27931 am:
101c678909 -s ours am:
e55418a857 am:
419626b496
am:
12151706b2
Change-Id: I0e550c834f988591d761a1830bee72e99be968f1
Arve Hjnnevg [Tue, 9 Aug 2016 21:04:24 +0000 (21:04 +0000)]
DO NOT MERGE ServiceManager: Restore basic uid check am:
eb304f0a36 -s ours am:
a82f82293a
am:
1c220583e4
Change-Id: Ie1ab626a476ecada3ed5171489dc3fec0cf5a1f5
Arve Hjnnevg [Tue, 9 Aug 2016 21:04:24 +0000 (21:04 +0000)]
DO NOT MERGE ServiceManager: Restore basic uid check am:
f03ba2c0d8 am:
a9963dcfb7 am:
cac59eae3b am:
0c63d9490c -s ours
am:
cc453b9926
Change-Id: I6b8be55f4d748f243cb8aeddfb63d9b1740ee0ad
Arve Hjnnevg [Tue, 9 Aug 2016 21:04:24 +0000 (21:04 +0000)]
DO NOT MERGE ServiceManager: Restore basic uid check am:
247ae46340 am:
171ab27931 am:
101c678909 -s ours am:
e55418a857
am:
419626b496
Change-Id: Ibe41eb3a2c9a0e28211d546b6b79469bb0523d01
Arve Hjnnevg [Tue, 9 Aug 2016 21:01:23 +0000 (21:01 +0000)]
DO NOT MERGE ServiceManager: Restore basic uid check am:
eb304f0a36 -s ours
am:
a82f82293a
Change-Id: Ib91d630f70f4fa434915ac15938c7dca94fe3de5
Arve Hjnnevg [Tue, 9 Aug 2016 20:58:24 +0000 (20:58 +0000)]
DO NOT MERGE ServiceManager: Restore basic uid check am:
247ae46340 am:
171ab27931 am:
101c678909 -s ours
am:
e55418a857
Change-Id: If0008ff56fb3348ac1bef2c77e99032bf6d51680
Arve Hjnnevg [Tue, 9 Aug 2016 20:58:24 +0000 (20:58 +0000)]
DO NOT MERGE ServiceManager: Restore basic uid check am:
f03ba2c0d8 am:
a9963dcfb7 am:
cac59eae3b
am:
0c63d9490c -s ours
Change-Id: I2d17ab94a66c5ee9b5aa7d0bd8a89e31f39d7b9d
Arve Hjnnevg [Tue, 9 Aug 2016 20:55:31 +0000 (20:55 +0000)]
DO NOT MERGE ServiceManager: Restore basic uid check am:
247ae46340 am:
171ab27931
am:
101c678909 -s ours
Change-Id: I3c98fc1516193caab37bcb9cf88ffe6104dd65b1
Arve Hjnnevg [Tue, 9 Aug 2016 20:55:23 +0000 (20:55 +0000)]
DO NOT MERGE ServiceManager: Restore basic uid check
am:
eb304f0a36 -s ours
Change-Id: I6bae641d0ec80aaba79b716ef8bcd46279aca0ed
Arve Hjnnevg [Tue, 9 Aug 2016 20:55:19 +0000 (20:55 +0000)]
DO NOT MERGE ServiceManager: Restore basic uid check am:
f03ba2c0d8 am:
a9963dcfb7
am:
cac59eae3b
Change-Id: I672617263a66261b36de2f3fb6c7829d39f87e51
Arve Hjnnevg [Tue, 9 Aug 2016 20:52:18 +0000 (20:52 +0000)]
DO NOT MERGE ServiceManager: Restore basic uid check am:
f03ba2c0d8
am:
a9963dcfb7
Change-Id: Id42cd61ca837cc5e9da644feaae10f8f7d0e6c11
Arve Hjnnevg [Tue, 9 Aug 2016 20:49:54 +0000 (20:49 +0000)]
DO NOT MERGE ServiceManager: Restore basic uid check am:
247ae46340
am:
171ab27931
Change-Id: I3cfc70e8fb1dd393a92ace283d36ee2b35585ea4
Arve Hjnnevg [Tue, 9 Aug 2016 20:46:49 +0000 (20:46 +0000)]
DO NOT MERGE ServiceManager: Restore basic uid check
am:
247ae46340
Change-Id: I67af781d5876b13daca82cb7e947397c94cd62e7
Arve Hjnnevg [Tue, 9 Aug 2016 20:46:49 +0000 (20:46 +0000)]
DO NOT MERGE ServiceManager: Restore basic uid check
am:
f03ba2c0d8
Change-Id: I1435bfcd119116cdd242cf7714ef9535d7abc6fa
Arve Hjnnevg [Tue, 9 Aug 2016 20:46:48 +0000 (20:46 +0000)]
ServiceManager: Restore basic uid check
am:
2b74d2c1d2
Change-Id: I27c3515350a64177f2e1de2599fe48eda7b3a739
Arve Hjønnevåg [Mon, 1 Aug 2016 23:05:17 +0000 (16:05 -0700)]
DO NOT MERGE ServiceManager: Restore basic uid check
Prevent apps from registering services without relying on selinux checks.
Bug:
29431260
Change-Id: I38c6e8bc7f7cba1cbd3568e8fed1ae7ac2054a9b
Arve Hjønnevåg [Mon, 1 Aug 2016 23:05:17 +0000 (16:05 -0700)]
DO NOT MERGE ServiceManager: Restore basic uid check
Prevent apps from registering services without relying on selinux checks.
Bug:
29431260
Change-Id: I38c6e8bc7f7cba1cbd3568e8fed1ae7ac2054a9b
Arve Hjønnevåg [Mon, 1 Aug 2016 23:05:17 +0000 (16:05 -0700)]
DO NOT MERGE ServiceManager: Restore basic uid check
Prevent apps from registering services without relying on selinux checks.
Bug:
29431260
Change-Id: I38c6e8bc7f7cba1cbd3568e8fed1ae7ac2054a9b
Dan Willemsen [Fri, 5 Aug 2016 22:57:47 +0000 (22:57 +0000)]
resolve merge conflicts of
0783d5f to stage-aosp-master
am:
2a001e8bfe
Change-Id: Ib0fc16f4a35761c0b2a3e3273800e1f27e527577
Dan Willemsen [Fri, 5 Aug 2016 21:06:41 +0000 (14:06 -0700)]
resolve merge conflicts of
0783d5f to stage-aosp-master
Change-Id: I4fe9c0391d6d41bae5fbbb0df6e00e264e87649f
Dan Willemsen [Fri, 5 Aug 2016 20:44:52 +0000 (20:44 +0000)]
Merge "Start converting Android.mk to Android.bp"
Dan Willemsen [Tue, 26 Jul 2016 00:13:45 +0000 (17:13 -0700)]
Start converting Android.mk to Android.bp
See build/soong/README.md for more information.
Merged-In: Ifbe9b0072a63b4467c72b3a52148a606e5365f78
Change-Id: Ifbe9b0072a63b4467c72b3a52148a606e5365f78
Arve Hjønnevåg [Mon, 1 Aug 2016 23:05:17 +0000 (16:05 -0700)]
ServiceManager: Restore basic uid check
Prevent apps from registering services without relying on selinux checks.
Bug:
29431260
Change-Id: I38c6e8bc7f7cba1cbd3568e8fed1ae7ac2054a9b
Dimitry Ivanov [Mon, 1 Aug 2016 22:58:40 +0000 (22:58 +0000)]
Merge "libsigchain: intercept bsd_signal on lp32" am:
1c59b4b4e8
am:
759d63a2f4
Change-Id: I53158e2be6716ee5db2c995822e735fb255adc9c
Dimitry Ivanov [Mon, 1 Aug 2016 22:47:36 +0000 (22:47 +0000)]
Merge "libsigchain: intercept bsd_signal on lp32"
am:
1c59b4b4e8
Change-Id: Ib0b9789d7a75928f7433557936b9fac81c53b049
Treehugger Robot [Mon, 1 Aug 2016 22:39:15 +0000 (22:39 +0000)]
Merge "libsigchain: intercept bsd_signal on lp32"
Dimitry Ivanov [Mon, 1 Aug 2016 21:13:37 +0000 (14:13 -0700)]
libsigchain: intercept bsd_signal on lp32
bsd_signal is a deprecated synonym for the signal. Nevertheless
there are apps and libraries calling this function.
libsigchain needs to intercept these calls and handle them the same
way it handles signal() call.
Bug: http://b/
30562229
Test: readelf --dyn-sym surfaceflinger and check that bsd_signal is exported for lp32
and is not exported for lp64 binary version
Change-Id: If80e45502275b26c3ee4026ab12cadd77f8fbd3b
Chia-I Wu [Fri, 29 Jul 2016 02:59:54 +0000 (02:59 +0000)]
Merge \"libvulkan: Fix for -Wcast-calling-convention\" into stage-aosp-master
am:
99465d6a4a
Change-Id: Id998b894fc49763ff86ec81d8c403963be53e74b
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
Chia-I Wu [Fri, 29 Jul 2016 02:50:30 +0000 (02:50 +0000)]
Merge "libvulkan: Fix for -Wcast-calling-convention" into stage-aosp-master
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
OSDN Git Service
