OSDN Git Service
TreeHugger Robot [Fri, 3 Feb 2017 00:49:43 +0000 (00:49 +0000)]
Merge changes I9f2ea67c,I34588df1,I88a56236
* changes:
Use generic libpdx event bits facility in libvrflinger and bufferhubd.
Add libvrflinger for use in SurfaceFlinger
Export surface flinger includes
TreeHugger Robot [Fri, 3 Feb 2017 00:30:10 +0000 (00:30 +0000)]
Merge "Add binder native side code for BatteryPropertiesListener"
TreeHugger Robot [Fri, 3 Feb 2017 00:29:25 +0000 (00:29 +0000)]
Merge "Build shared library for batteryservice"
TreeHugger Robot [Thu, 2 Feb 2017 23:33:58 +0000 (23:33 +0000)]
Merge "SurfaceFlinger: Set property in separate thread in init"
Corey Tabaka [Thu, 19 Jan 2017 23:07:26 +0000 (15:07 -0800)]
Use generic libpdx event bits facility in libvrflinger and bufferhubd.
Use the generic event bits abstraction to support UDS and ServiceFS
backends properly.
Bug:
34466748
Test: start/stop basicvr repeatedly; observe stable bufferhub counts.
Change-Id: I9f2ea67c25860ad7fb931938991a29a37f3391fc
Alex Vakulenko [Fri, 27 Jan 2017 22:41:57 +0000 (14:41 -0800)]
Add libvrflinger for use in SurfaceFlinger
A separate CL uses this code from SurfaceFlinger.
Bug: None
Test: Manually ran modified SurfaceFlinger
Change-Id: I34588df1365588c0a0265e1e2325e3dd5516206a
Alex Vakulenko [Thu, 2 Feb 2017 06:25:44 +0000 (22:25 -0800)]
Export surface flinger includes
* Before we start using libvrflinger, we need to export the
surface flinger includes.
Bug: None
Test: Compile surfaceflinger and libvrflinger together
Change-Id: I88a56236f297eb58397fcda5ff28bfecbd4e0971
Jin Qian [Thu, 2 Feb 2017 22:32:43 +0000 (14:32 -0800)]
Add binder native side code for BatteryPropertiesListener
Test: build flash boot
Change-Id: Ic689797708e15eb6cdf5976130e5f91429210c0d
Jin Qian [Thu, 2 Feb 2017 22:32:09 +0000 (14:32 -0800)]
Build shared library for batteryservice
Test: build flash boot
Change-Id: Ifb6ac12ffbd23b457a455dce7ab050e8d8534fae
Alex Vakulenko [Thu, 2 Feb 2017 19:35:59 +0000 (11:35 -0800)]
Remove references to libchrome
Removed dependencies on libchrome which was used mostly for logging
and switched over to standard Android log macros.
Bug: None
Test: `m -j32` still succeeds
Change-Id: I0a841c19c15c02f9a031af200e82837f9450d88a
Fabien Sanglard [Thu, 2 Feb 2017 20:29:49 +0000 (20:29 +0000)]
Merge "Merge "Fix security vulnerability" into nyc-dev am:
2188ad799e am:
80672db6b8 am:
900cd6a1d2 am:
c1038b66dd am:
64cae76fe0" into nyc-mr2-dev-plus-aosp
am:
0ad3235330
Change-Id: Ibf1f56258c1421760eb4c7044fa0e85c7e1af248
Fabien Sanglard [Thu, 2 Feb 2017 20:29:47 +0000 (20:29 +0000)]
Merge "Fix security vulnerability" into nyc-dev am:
2188ad799e am:
80672db6b8 am:
900cd6a1d2 am:
c1038b66dd am:
64cae76fe0
am:
3c0b3e0b6f
Change-Id: Ieb4399ba0740fe711ab4459a7a196d58df111c2b
Fabien Sanglard [Thu, 2 Feb 2017 20:29:26 +0000 (20:29 +0000)]
Merge "Merge "Fix security vulnerability" into nyc-dev am:
2188ad799e am:
80672db6b8 am:
900cd6a1d2 am:
c1038b66dd am:
a27b8d6f0b" into nyc-mr2-dev-plus-aosp
am:
3e3a701e38
Change-Id: I6b36c03974b28612a89f55f3fc6c6e98a6169b3b
Fabien Sanglard [Thu, 2 Feb 2017 20:29:24 +0000 (20:29 +0000)]
Merge "Fix security vulnerability" into nyc-dev am:
2188ad799e am:
80672db6b8 am:
900cd6a1d2 am:
c1038b66dd am:
a27b8d6f0b
am:
0de664e6a8
Change-Id: I085a585040267aa6d72f84db65a9e77f38d4b455
Fabien Sanglard [Thu, 2 Feb 2017 20:29:05 +0000 (20:29 +0000)]
Merge "Fix security vulnerability am:
45b202513b am:
8778a131c2 am:
18a5e5f607 am:
f91ee50667 am:
b6fa70b9fb" into nyc-mr2-dev-plus-aosp
am:
77aa001b19
Change-Id: Ide18cfcc31f8041a4b0afdae0a48e5a69935a8b3
Fabien Sanglard [Thu, 2 Feb 2017 20:29:03 +0000 (20:29 +0000)]
Fix security vulnerability am:
45b202513b am:
8778a131c2 am:
18a5e5f607 am:
f91ee50667 am:
b6fa70b9fb
am:
cf5b13aa09
Change-Id: Ie17e65a29fb90934a04d8ece10f2309526a82def
Fabien Sanglard [Thu, 2 Feb 2017 20:28:50 +0000 (20:28 +0000)]
Fix security vulnerability am:
45b202513b am:
8778a131c2 am:
18a5e5f607 am:
f91ee50667 am:
41ab86fb1f
am:
9451234907
Change-Id: Ie90de6ee888c2a90a835bfb06cfd9c1eeadba100
Android Build Merger (Role) [Thu, 2 Feb 2017 20:23:07 +0000 (20:23 +0000)]
Merge "Merge "Fix security vulnerability" into nyc-dev am:
2188ad799e am:
80672db6b8 am:
900cd6a1d2 am:
c1038b66dd am:
64cae76fe0" into nyc-mr2-dev-plus-aosp
Android Build Merger (Role) [Thu, 2 Feb 2017 20:23:04 +0000 (20:23 +0000)]
Merge "Merge "Fix security vulnerability" into nyc-dev am:
2188ad799e am:
80672db6b8 am:
900cd6a1d2 am:
c1038b66dd am:
a27b8d6f0b" into nyc-mr2-dev-plus-aosp
Fabien Sanglard [Thu, 2 Feb 2017 20:22:59 +0000 (20:22 +0000)]
Merge "Fix security vulnerability" into nyc-dev am:
2188ad799e am:
80672db6b8 am:
900cd6a1d2 am:
c1038b66dd
am:
64cae76fe0
Change-Id: I4ede153f15364c3e261e5e93c896ee79a084c2ec
Fabien Sanglard [Thu, 2 Feb 2017 20:22:57 +0000 (20:22 +0000)]
Merge "Fix security vulnerability" into nyc-dev am:
2188ad799e am:
80672db6b8 am:
900cd6a1d2 am:
c1038b66dd
am:
a27b8d6f0b
Change-Id: Ia4ab81ceb6f16145b4f10128fc64038e48d19b44
Android Build Merger (Role) [Thu, 2 Feb 2017 20:22:55 +0000 (20:22 +0000)]
Merge "Fix security vulnerability am:
45b202513b am:
8778a131c2 am:
18a5e5f607 am:
f91ee50667 am:
b6fa70b9fb" into nyc-mr2-dev-plus-aosp
Fabien Sanglard [Thu, 2 Feb 2017 20:22:45 +0000 (20:22 +0000)]
Fix security vulnerability am:
45b202513b am:
8778a131c2 am:
18a5e5f607 am:
f91ee50667
am:
41ab86fb1f
Change-Id: I49c6fa4e733d05804495de9f5986d3430178d0f9
Fabien Sanglard [Thu, 2 Feb 2017 20:22:44 +0000 (20:22 +0000)]
Fix security vulnerability am:
45b202513b am:
8778a131c2 am:
18a5e5f607 am:
f91ee50667
am:
b6fa70b9fb
Change-Id: Ided7a6c942c7414f0d7bba3fd9e707b3f030380a
Fabien Sanglard [Thu, 2 Feb 2017 20:20:26 +0000 (20:20 +0000)]
Merge "Fix security vulnerability" into nyc-dev am:
2188ad799e am:
80672db6b8 am:
900cd6a1d2
am:
c1038b66dd
Change-Id: I6d86ae8db2bea689c6db821c6924b4dcde6f7c41
Fabien Sanglard [Thu, 2 Feb 2017 20:20:25 +0000 (20:20 +0000)]
Merge "Fix security vulnerability" into nyc-dev am:
2188ad799e am:
80672db6b8 am:
900cd6a1d2
am:
c1038b66dd
Change-Id: If10a72b8c856955a543cf695133b72161192b00b
Fabien Sanglard [Thu, 2 Feb 2017 20:20:14 +0000 (20:20 +0000)]
Fix security vulnerability am:
45b202513b am:
8778a131c2 am:
18a5e5f607
am:
f91ee50667
Change-Id: I703ffd6b2a4ee5a7726bd7426f83256ad990835f
Fabien Sanglard [Thu, 2 Feb 2017 20:20:13 +0000 (20:20 +0000)]
Fix security vulnerability am:
45b202513b am:
8778a131c2 am:
18a5e5f607
am:
f91ee50667
Change-Id: Ib4fad8fa8a393bc6233b842f0550db03708a65b1
Fabien Sanglard [Thu, 2 Feb 2017 20:18:25 +0000 (20:18 +0000)]
Merge "Fix security vulnerability" into nyc-dev am:
2188ad799e am:
80672db6b8
am:
900cd6a1d2
Change-Id: Ieee74bcd82513fc4612c874b966ba9903e26565c
Fabien Sanglard [Thu, 2 Feb 2017 20:18:12 +0000 (20:18 +0000)]
Fix security vulnerability am:
45b202513b am:
8778a131c2
am:
18a5e5f607
Change-Id: Iec4b5c921b77fd29aea45bdb49cd4d7cda67edc6
Fabien Sanglard [Thu, 2 Feb 2017 20:15:54 +0000 (20:15 +0000)]
Merge "Fix security vulnerability" into nyc-dev am:
2188ad799e
am:
80672db6b8
Change-Id: I5008bd9cd2b14dd52d261f5934024f7526e96f7f
Fabien Sanglard [Thu, 2 Feb 2017 20:15:42 +0000 (20:15 +0000)]
Fix security vulnerability am:
45b202513b
am:
8778a131c2
Change-Id: Ic9300f2597702d6e83d80222dbc5ca7d2642f621
Fabien Sanglard [Thu, 2 Feb 2017 20:12:43 +0000 (20:12 +0000)]
Merge "Fix security vulnerability" into nyc-dev
am:
2188ad799e
Change-Id: Iac558b8fedbbfdd76ebe90867b70d57c33f8b644
Fabien Sanglard [Thu, 2 Feb 2017 20:12:42 +0000 (20:12 +0000)]
Fix security vulnerability
am:
45b202513b
Change-Id: Ifaf692c814e2562332914854dc95c7715d37a5c0
TreeHugger Robot [Thu, 2 Feb 2017 20:08:46 +0000 (20:08 +0000)]
Merge "Fix security vulnerability" into nyc-dev
Yifan Hong [Thu, 2 Feb 2017 19:52:36 +0000 (19:52 +0000)]
Merge "lshal: print pids of client processes." am:
1ca609d756 am:
9046024ef1 am:
d8a939213c
am:
d275f64c0f
Change-Id: Id7f6bfc4e486a33c6f399a49811bd322922f87e4
Yifan Hong [Thu, 2 Feb 2017 19:49:15 +0000 (19:49 +0000)]
Merge "lshal: print pids of client processes." am:
1ca609d756 am:
9046024ef1
am:
d8a939213c
Change-Id: Ic5bcd43734aa7be5f5ed62544ed76c0cf09ed07b
Yifan Hong [Thu, 2 Feb 2017 19:44:51 +0000 (19:44 +0000)]
Merge "lshal: print pids of client processes." am:
1ca609d756
am:
9046024ef1
Change-Id: I74ab0b58d0edbb12283367143fd52be3dae4583c
Yifan Hong [Thu, 2 Feb 2017 19:39:42 +0000 (19:39 +0000)]
Merge "lshal: print pids of client processes."
am:
1ca609d756
Change-Id: Ide68ec1bc811d0ed3c23763bc1689d43282c6503
Treehugger Robot [Thu, 2 Feb 2017 19:32:48 +0000 (19:32 +0000)]
Merge "lshal: print pids of client processes."
Wei Wang [Wed, 1 Feb 2017 01:43:23 +0000 (17:43 -0800)]
SurfaceFlinger: Set property in separate thread in init
By setting property in a separate thread, the CL aims to
avoid slow initilization in SurfaceFlinger::init where
SurfaceFlinger is waiting on property_service.
Bug:
34499826
Test: on marlin
Change-Id: I91afad3cbc9a2b31aa89ae9cc752ad491cc9d8e4
Alex Sakhartchouk [Sat, 28 Jan 2017 15:44:15 +0000 (10:44 -0500)]
Make VrWindowManager system service again.
WIP, For now just build a parallel target until controller data comes
from shared memory.
Bug: None
Test: None
Change-Id: I3aa808a4ac6f774f113abadfa76056d350f2a338
Mark Urbanus [Wed, 1 Feb 2017 17:36:51 +0000 (09:36 -0800)]
Pose orientation was rotated 90 degrees on dvr devices
Orientation property namespace did not match BoardConfig. Change the property
namespace from dvr.* to ro.dvr.*.
Test: Validated pose orientation is correct.
Bug:
34771765
Change-Id: Icca084b19b3e9a8bcfb4bcaa512df07974a9240a
John Bates [Mon, 30 Jan 2017 16:58:20 +0000 (08:58 -0800)]
Use always fatal assertions in vr_composer_view and add one more
Previously vr_composer_view would never trip on its assertions.
This caused it to startup in a bad state sometimes and need to be manually
restarted.
Bug:
34807059
Test: manually
Change-Id: I4b35c95fd411e3ca8e982de511de0e5e12f18483
Kevin Schoedel [Thu, 19 Jan 2017 18:46:17 +0000 (13:46 -0500)]
Add synthetic back button to virtual touchpad/stylus.
Also add a bit more error checking and documentation.
Test: added to VirtualTouchpad_test.cpp
Bug:
34673438
Change-Id: I3851a2ad79c5338cdd1db0c7d460aecfff082cc3
Corey Tabaka [Thu, 19 Jan 2017 23:02:59 +0000 (15:02 -0800)]
libpdx: Add support for more event bits.
- Add generic abstraction for multiple event bits with an implementation-
defined mechanism to deliver the bits.
- Update ServiceFS backend to pass through event bits.
- Implement EPOLLIN, EPOLLPRI, and EPOLLHUP event bit for UDS backed.
Bug:
34466748
Test: Build/flash system; observe stable operation.
Change-Id: I86afb5645b72ec69c095734c7891a690432150a3
John Bates [Fri, 27 Jan 2017 17:45:20 +0000 (09:45 -0800)]
Remove one more error spew from missing controllers
Bug: None
Test: One lest error when running apk
Change-Id: I4dd39223e91e124eb76350004ed0921cc6cb5d16
Fabien Sanglard [Thu, 2 Feb 2017 02:06:22 +0000 (02:06 +0000)]
Fabien Sanglard [Thu, 2 Feb 2017 02:06:07 +0000 (02:06 +0000)]
Fabien Sanglard [Thu, 2 Feb 2017 02:04:49 +0000 (02:04 +0000)]
Fix security vulnerability am:
2ae83f4f62 am:
11ab583834 am:
ac2b87ac0f am:
132d0f2aef am:
3995674f24 am:
c7892d9d0b am:
cca3b79c32 am:
ebbf8a6b5a am:
5ba227f96e am:
40cd915a54 am:
ded5521871 am:
0e0a258771 am:
6a5a220b48 am:
30ab1434c3
am:
81e84ad072
Change-Id: Ic9f4b09d2858ea09fc8587e0fbc162c49795d82f
Fabien Sanglard [Thu, 2 Feb 2017 02:03:35 +0000 (02:03 +0000)]
Fix security vulnerability am:
2ae83f4f62 am:
11ab583834 am:
ac2b87ac0f am:
132d0f2aef am:
3995674f24 am:
c7892d9d0b am:
cca3b79c32 am:
ebbf8a6b5a am:
5ba227f96e am:
40cd915a54 am:
ded5521871 am:
0e0a258771 am:
6a5a220b48 am:
30ab1434c3
am:
f6868443ef
Change-Id: I8faa4d9bc29bb2c8a9bae1f94f57e89e52a4b229
Fabien Sanglard [Thu, 2 Feb 2017 01:59:36 +0000 (01:59 +0000)]
Fix security vulnerability am:
2ae83f4f62 am:
11ab583834 am:
ac2b87ac0f am:
132d0f2aef am:
3995674f24 am:
c7892d9d0b am:
cca3b79c32 am:
ebbf8a6b5a am:
5ba227f96e am:
40cd915a54 am:
ded5521871 am:
0e0a258771 am:
6a5a220b48
am:
30ab1434c3
Change-Id: I4e08855d038ae114c6c6230288c6158115fe2f7f
Fabien Sanglard [Thu, 2 Feb 2017 01:59:36 +0000 (01:59 +0000)]
Fix security vulnerability am:
2ae83f4f62 am:
11ab583834 am:
ac2b87ac0f am:
132d0f2aef am:
3995674f24 am:
c7892d9d0b am:
cca3b79c32 am:
ebbf8a6b5a am:
5ba227f96e am:
40cd915a54 am:
ded5521871 am:
0e0a258771 am:
6a5a220b48
am:
30ab1434c3
Change-Id: Iaa4ffc3bca279f294a36df31823ec9a30a728fe7
Fabien Sanglard [Thu, 2 Feb 2017 01:57:08 +0000 (01:57 +0000)]
Fix security vulnerability am:
2ae83f4f62 am:
11ab583834 am:
ac2b87ac0f am:
132d0f2aef am:
3995674f24 am:
c7892d9d0b am:
cca3b79c32 am:
ebbf8a6b5a am:
5ba227f96e am:
40cd915a54 am:
ded5521871 am:
0e0a258771
am:
6a5a220b48
Change-Id: I47743cb142bdb4f21202dc51482fc52996f6b7a4
Fabien Sanglard [Thu, 2 Feb 2017 01:54:35 +0000 (01:54 +0000)]
Fix security vulnerability am:
2ae83f4f62 am:
11ab583834 am:
ac2b87ac0f am:
132d0f2aef am:
3995674f24 am:
c7892d9d0b am:
cca3b79c32 am:
ebbf8a6b5a am:
5ba227f96e am:
40cd915a54 am:
ded5521871
am:
0e0a258771
Change-Id: I4479a276592fc9d5d25378a5abee12473a2104ae
Fabien Sanglard [Thu, 2 Feb 2017 01:52:06 +0000 (01:52 +0000)]
Fix security vulnerability am:
2ae83f4f62 am:
11ab583834 am:
ac2b87ac0f am:
132d0f2aef am:
3995674f24 am:
c7892d9d0b am:
cca3b79c32 am:
ebbf8a6b5a am:
5ba227f96e am:
40cd915a54
am:
ded5521871
Change-Id: Ibf93b2a73caab87ee6c0b27234a8cdc05c0aa61e
Fabien Sanglard [Thu, 2 Feb 2017 01:49:06 +0000 (01:49 +0000)]
Fix security vulnerability am:
2ae83f4f62 am:
11ab583834 am:
ac2b87ac0f am:
132d0f2aef am:
3995674f24 am:
c7892d9d0b am:
cca3b79c32 am:
ebbf8a6b5a am:
5ba227f96e
am:
40cd915a54
Change-Id: Ib34c9d0e90e77565ab6d0d7fb805bb425964b5aa
Fabien Sanglard [Thu, 2 Feb 2017 01:46:34 +0000 (01:46 +0000)]
Fix security vulnerability am:
2ae83f4f62 am:
11ab583834 am:
ac2b87ac0f am:
132d0f2aef am:
3995674f24 am:
c7892d9d0b am:
cca3b79c32 am:
ebbf8a6b5a
am:
5ba227f96e
Change-Id: I9fc225ba640b4391d60380d7c588015c3e5516a7
Fabien Sanglard [Thu, 2 Feb 2017 01:43:34 +0000 (01:43 +0000)]
Fix security vulnerability am:
2ae83f4f62 am:
11ab583834 am:
ac2b87ac0f am:
132d0f2aef am:
3995674f24 am:
c7892d9d0b am:
cca3b79c32
am:
ebbf8a6b5a
Change-Id: Id8c91e714058b999805aa6da613a4343fecc1d6a
Fabien Sanglard [Thu, 2 Feb 2017 01:41:34 +0000 (01:41 +0000)]
Fix security vulnerability am:
2ae83f4f62 am:
11ab583834 am:
ac2b87ac0f am:
132d0f2aef am:
3995674f24 am:
c7892d9d0b
am:
cca3b79c32
Change-Id: I2e5da5ee33eb2757f360881e6ecc7dfd9fb67938
Fabien Sanglard [Thu, 2 Feb 2017 01:38:33 +0000 (01:38 +0000)]
Fix security vulnerability am:
2ae83f4f62 am:
11ab583834 am:
ac2b87ac0f am:
132d0f2aef am:
3995674f24
am:
c7892d9d0b
Change-Id: Ic59ba49542b907591f3e514ae0417ed82a5be7aa
Fabien Sanglard [Thu, 2 Feb 2017 01:36:33 +0000 (01:36 +0000)]
Fix security vulnerability am:
2ae83f4f62 am:
11ab583834 am:
ac2b87ac0f am:
132d0f2aef
am:
3995674f24
Change-Id: I979af2b40c8ee1b3820204cee5fa7e21e4906bf9
Fabien Sanglard [Thu, 2 Feb 2017 01:34:03 +0000 (01:34 +0000)]
Fix security vulnerability am:
2ae83f4f62 am:
11ab583834 am:
ac2b87ac0f
am:
132d0f2aef
Change-Id: If2aa999ec1f261ea34a6aa725241ea50226083ad
Fabien Sanglard [Thu, 2 Feb 2017 01:31:32 +0000 (01:31 +0000)]
Fix security vulnerability am:
2ae83f4f62 am:
11ab583834
am:
ac2b87ac0f
Change-Id: I3b249a9ec1820917dc015c72bd093535927c9ed6
Fabien Sanglard [Thu, 2 Feb 2017 01:29:02 +0000 (01:29 +0000)]
Fix security vulnerability am:
2ae83f4f62
am:
11ab583834
Change-Id: I09ec85b9f83e1f4458940415cd07f6fca725c552
Fabien Sanglard [Thu, 2 Feb 2017 01:27:03 +0000 (01:27 +0000)]
Fix security vulnerability
am:
2ae83f4f62
Change-Id: Ie0590dbb8429b5b289f3095055abdc8d29b95a7f
Yifan Hong [Wed, 1 Feb 2017 23:54:01 +0000 (15:54 -0800)]
lshal: print pids of client processes.
Bug:
34777099
Bug:
34861460
Test: lshal
Test: NFC / light / audio with and without persistent.hal.binderized;
run lshal to reflect this.
Change-Id: I50aa5d99fb14957b1e40a405836e68c235a22006
Steven Thomas [Tue, 31 Jan 2017 03:10:26 +0000 (19:10 -0800)]
Add gvr_is_feature_supported()
A new gvr function gvr_is_feature_supported() was added in
https://critique.corp.google.com/#review/
145712807.
Implement the function to bring our gvr library up to date.
Bug:
34742071
Test: Confirmed I can once again load TreasureHunt built from google3.
Change-Id: Ib6a9802812a514ee54564f8572be9f6f4820ed01
Yifan Hong [Wed, 1 Feb 2017 21:29:50 +0000 (21:29 +0000)]
Merge "Do not -1 for lshal." am:
50752b732e am:
bd4cc238fb am:
44a6d5a5eb
am:
035fa3eb6b
Change-Id: I0547c8b71e2709c19f30db457d881ee7d2986cc7
Yifan Hong [Wed, 1 Feb 2017 21:27:19 +0000 (21:27 +0000)]
Merge "Do not -1 for lshal." am:
50752b732e am:
bd4cc238fb
am:
44a6d5a5eb
Change-Id: Icfd5998fd5a6cc558cc26addf0e89ccd0b61bb5f
Yifan Hong [Wed, 1 Feb 2017 21:24:49 +0000 (21:24 +0000)]
Merge "Do not -1 for lshal." am:
50752b732e
am:
bd4cc238fb
Change-Id: I1dd676e1d50b68913578890c5d5096a8d81480b9
Yifan Hong [Wed, 1 Feb 2017 21:20:38 +0000 (21:20 +0000)]
Merge "Do not -1 for lshal."
am:
50752b732e
Change-Id: I8e0f285f5b17b11f32b504dda3a4c31da770653f
Treehugger Robot [Wed, 1 Feb 2017 21:15:42 +0000 (21:15 +0000)]
Merge "Do not -1 for lshal."
Evgenii Stepanov [Wed, 1 Feb 2017 19:35:37 +0000 (19:35 +0000)]
Merge "Disable integer sanitization on host." am:
b79d9f9d49 am:
e81efc5036 am:
49cfd967de
am:
eb14cbfedc
Change-Id: I26be24d20912d990b1c4945ff634e91113755e60
Evgenii Stepanov [Wed, 1 Feb 2017 19:33:08 +0000 (19:33 +0000)]
Merge "Disable integer sanitization on host." am:
b79d9f9d49 am:
e81efc5036
am:
49cfd967de
Change-Id: I85c053b519fba0915076800cbc7314f45ea7a9cd
Evgenii Stepanov [Wed, 1 Feb 2017 19:31:10 +0000 (19:31 +0000)]
Merge "Disable integer sanitization on host." am:
b79d9f9d49
am:
e81efc5036
Change-Id: Ifc9e92b6c39b9dc08066f051da263171bef1ee06
Evgenii Stepanov [Wed, 1 Feb 2017 19:28:31 +0000 (19:28 +0000)]
Merge "Disable integer sanitization on host."
am:
b79d9f9d49
Change-Id: I517a019007bcf12b0884c22234abf25482d50cca
Evgenii Stepanov [Wed, 1 Feb 2017 19:24:10 +0000 (19:24 +0000)]
Merge "Disable integer sanitization on host."
TreeHugger Robot [Wed, 1 Feb 2017 16:56:22 +0000 (16:56 +0000)]
Merge "Remove makefiles for vr_window_manager"
Alex Vakulenko [Wed, 1 Feb 2017 05:27:41 +0000 (21:27 -0800)]
Remove makefiles for vr_window_manager
This is temporary until we figure out what to do with vendor-specific
gralloc calls in vr_window_manager
Bug:
34819414
Test: `make checkbuild -j32` succeeds
Change-Id: I9e37af1e5fce50acc4930ea241ce7208e5ce6a52
TreeHugger Robot [Wed, 1 Feb 2017 09:01:50 +0000 (09:01 +0000)]
Merge "Push mapping from file extension to GID."
George Burgess IV [Wed, 1 Feb 2017 07:32:37 +0000 (07:32 +0000)]
Merge "Fix a use-of-uninitialized-value warning" am:
d047e10558 am:
f9e9c5bc2e am:
dfadb2a1da
am:
491b616e1d
Change-Id: I147fb87e62e93a54d40f701076463420ed50105e
George Burgess IV [Wed, 1 Feb 2017 07:27:27 +0000 (07:27 +0000)]
Merge "Fix a use-of-uninitialized-value warning" am:
d047e10558 am:
f9e9c5bc2e
am:
dfadb2a1da
Change-Id: I47059e2f25361093fdff1743ccc0c3682b0827b3
George Burgess IV [Wed, 1 Feb 2017 07:22:02 +0000 (07:22 +0000)]
Merge "Fix a use-of-uninitialized-value warning" am:
d047e10558
am:
f9e9c5bc2e
Change-Id: Iff659ffdf206f94e88fcec2a27a1518357fecead
George Burgess IV [Wed, 1 Feb 2017 07:13:44 +0000 (07:13 +0000)]
Merge "Fix a use-of-uninitialized-value warning"
am:
d047e10558
Change-Id: I4bd31c59331b6ef26e36bfff3fe57becf9b5ecc2
Jeff Sharkey [Wed, 1 Feb 2017 07:09:11 +0000 (00:09 -0700)]
Push mapping from file extension to GID.
An upcoming sdcardfs change will offer to automatically change the
GID of files on external storage based on the extension, but we need
to tell the kernel the mapping that we'd like to see.
Test: build, boots
Bug:
34733702
Change-Id: I15d4db5423d18c4da17e198c0e45a8adb381fed2
Treehugger Robot [Wed, 1 Feb 2017 07:09:50 +0000 (07:09 +0000)]
Merge "Fix a use-of-uninitialized-value warning"
TreeHugger Robot [Wed, 1 Feb 2017 05:36:09 +0000 (05:36 +0000)]
Merge "dumpstate: dump list of hardware hals on device"
Jiyong Park [Wed, 1 Feb 2017 04:23:11 +0000 (04:23 +0000)]
Merge "configstore: remove build flags from surfaceflinger"
Steven Moreland [Wed, 1 Feb 2017 03:50:46 +0000 (19:50 -0800)]
dumpstate: dump list of hardware hals on device
lshal is a binary on the device that lists all registered and
passthrough hardware hals that are currently running.
Fixes:
34809346
Test: bugreport includes lshal dump
Change-Id: Ia1340d1b94ac4c902a81b709924ebf45462435cc
Yifan Hong [Tue, 31 Jan 2017 23:54:39 +0000 (15:54 -0800)]
Do not -1 for lshal.
Test: compiles
Change-Id: I99e6306a6b82ec85bc84f9572f3e4f2f8cdf2847
George Burgess IV [Wed, 1 Feb 2017 03:49:11 +0000 (03:49 +0000)]
Merge "Fix -Wdouble-promotion warnings" am:
7920557287 am:
f2528e2dad am:
c05e232ee8
am:
62b3f36949 -s ours
Change-Id: I21afd8f781eda6c8114870bffda4613f31688acd
George Burgess IV [Wed, 1 Feb 2017 03:40:12 +0000 (03:40 +0000)]
Merge "Fix -Wdouble-promotion warnings" am:
7920557287 am:
f2528e2dad
am:
c05e232ee8
Change-Id: Ic9efe4849e9b88e2340ff8fb4fa57cc8ed3388d6
George Burgess IV [Wed, 1 Feb 2017 03:33:00 +0000 (03:33 +0000)]
Merge "Fix -Wdouble-promotion warnings" am:
7920557287
am:
f2528e2dad
Change-Id: I002b3954932af2c13b81b6f5d2e46b157f730e1e
George Burgess IV [Wed, 1 Feb 2017 03:21:30 +0000 (03:21 +0000)]
Merge "Fix -Wdouble-promotion warnings"
am:
7920557287
Change-Id: I2b7a8f6c24990220f90cb3d2f9221228ec330be5
Treehugger Robot [Wed, 1 Feb 2017 03:14:59 +0000 (03:14 +0000)]
Merge "Fix -Wdouble-promotion warnings"
Evgenii Stepanov [Wed, 1 Feb 2017 00:37:44 +0000 (16:37 -0800)]
Disable integer sanitization on host.
Test: NFC until https://android-review.googlesource.com/#/c/329510
Change-Id: I0183556d5b945c689934664fe7f15caa18a0997d
George Burgess IV [Wed, 1 Feb 2017 00:21:25 +0000 (16:21 -0800)]
Fix a use-of-uninitialized-value warning
Caught by clang's static analyzer:
frameworks/base/core/jni/com_google_android_gles_jni_GLImpl.cpp:190:30:
warning: The right operand of '+' is a garbage value
buf = (char*)buf + offset;
This is because getPointer doesn't always set `offset` to a value. We
could fix it locally by initializing `offset`, but it seems to be less
error-prone to just fix getPointer instead.
Bug: None
Test: Still builds; warning is now gone.
Change-Id: I90bea0c94cf8d7f92a0d9a4db4e64e7e563bfb09
Calin Juravle [Wed, 1 Feb 2017 00:02:53 +0000 (00:02 +0000)]
Merge "DEXOPT_FORCE may be passed for primary apk as well."
TreeHugger Robot [Tue, 31 Jan 2017 23:34:27 +0000 (23:34 +0000)]
Merge "Set cache dirty on layer creation/destruction"