OSDN Git Service
Yunlian Jiang [Fri, 3 Feb 2017 02:51:14 +0000 (02:51 +0000)]
Merge "Fix warning: macro redefined" am:
909ef30a63 am:
f62690cdaf
am:
d1f7b9d025
Change-Id: Ifa71e97d5ade8685f2f31400afd1727034321b4d
Yunlian Jiang [Fri, 3 Feb 2017 02:48:46 +0000 (02:48 +0000)]
Merge "Fix warning: macro redefined" am:
909ef30a63
am:
f62690cdaf
Change-Id: If7255629f0be37af2c08da90e9010423d73decfc
Yunlian Jiang [Fri, 3 Feb 2017 02:46:15 +0000 (02:46 +0000)]
Merge "Fix warning: macro redefined"
am:
909ef30a63
Change-Id: Ia1b083546fe41a81acf83e0cb0b8921700aa1bfa
Treehugger Robot [Fri, 3 Feb 2017 02:39:19 +0000 (02:39 +0000)]
Merge "Fix warning: macro redefined"
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: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."
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
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: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."
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
Treehugger Robot [Wed, 1 Feb 2017 07:09:50 +0000 (07:09 +0000)]
Merge "Fix a use-of-uninitialized-value warning"
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: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
George Burgess IV [Tue, 31 Jan 2017 03:37:43 +0000 (03:37 +0000)]
Merge "Add permission bits to open calls with O_CREAT" am:
9dc2e6bc43 am:
3e240c81be
am:
417c546404
Change-Id: I35421a4b17751fb04e9b0532d40c822812ad0cb8
George Burgess IV [Tue, 31 Jan 2017 03:35:13 +0000 (03:35 +0000)]
Merge "Add permission bits to open calls with O_CREAT" am:
9dc2e6bc43
am:
3e240c81be
Change-Id: Id28d9cdc5b4862b7c62b4d5dd2da6fde13f8dd9c
George Burgess IV [Tue, 31 Jan 2017 03:32:44 +0000 (03:32 +0000)]
Merge "Add permission bits to open calls with O_CREAT"
am:
9dc2e6bc43
Change-Id: Ifa1d1607751dc89cb341a97c1b737bf2ee7bc260
Treehugger Robot [Tue, 31 Jan 2017 03:29:05 +0000 (03:29 +0000)]
Merge "Add permission bits to open calls with O_CREAT"
George Burgess IV [Wed, 25 Jan 2017 19:36:12 +0000 (11:36 -0800)]
Add permission bits to open calls with O_CREAT
Open needs a third argument if you pass it O_CREAT:
https://linux.die.net/man/3/open
This turns into a compile-time error with FORITFY, so we need this fixed
before our unbroken FORTIFY can go in.
(The TEMP_FAILURE_RETRY open isn't detected by clang FORTIFY, but I
noticed that open_reference_profile potentially passes in O_CREAT as an
open_flag.)
Bug:
32073964
Test: Now builds with clang FORTIFY; CtsCompilationTestCases passes;
manually verified that /data/misc/profiles/ref/*/primary.prof has rw
permissions after a successful `cmd package compile -m speed-profile`.
Change-Id: Ie707d5ad403d2f86c769277b3e0f147c45000a6b
George Burgess IV [Thu, 26 Jan 2017 20:41:16 +0000 (20:41 +0000)]
Merge "Replace strlen with arraysize in array bounds." am:
70a5f12045 am:
5f186d057a
am:
d427837d32
Change-Id: Ia9f3ad966545b25d05394d57f38f3c1107a69469
George Burgess IV [Thu, 26 Jan 2017 20:33:01 +0000 (20:33 +0000)]
Merge "Replace strlen with arraysize in array bounds." am:
70a5f12045
am:
5f186d057a
Change-Id: Ic23f22a26e160055c2e50eb9641183c0da9dfc2a
George Burgess IV [Thu, 26 Jan 2017 20:26:56 +0000 (20:26 +0000)]
Merge "Replace strlen with arraysize in array bounds."
am:
70a5f12045
Change-Id: I3357cadb32858a94d94c6b4bd82fe69f241027b4
Treehugger Robot [Thu, 26 Jan 2017 20:06:50 +0000 (20:06 +0000)]
Merge "Replace strlen with arraysize in array bounds."
George Burgess IV [Wed, 25 Jan 2017 21:33:38 +0000 (13:33 -0800)]
Fix -Wdouble-promotion warnings
With the new clang FORTIFY, this code emits the following error:
error: implicit conversion increases floating-point precision: 'float'
to 'double' [-Werror,-Wdouble-promotion]
This is because strncpy is now a function, not a macro defined in a
system header. So, the warning is considered to appear in user code
(instead of system code), and is therefore no longer suppressed.
Bug:
32073964
Test: Now builds with clang FORTIFY
Change-Id: Id5fcfe91755535f90b542e11bc42b66976fe24fc
Merged-In: I5e8292d7800434268793bc4db4a96f20b7022e17
George Burgess IV [Wed, 25 Jan 2017 19:52:01 +0000 (11:52 -0800)]
Replace strlen with arraysize in array bounds.
clang-FORTIFY doesn't let us evaluate strlen("foo") as a constant
expression that can be used in static array bounds. Instead, we'd need
to either do __builtin_strlen("foo") or arraysize("foo") - 1. Just use
arraysize here, since the extra 1 byte per array isn't likely to be a
terrible thing.
Happy to swap to __builtin_strlen if anyone cares deeply enough.
Bug:
32073964
Test: Now builds with clang FORTIFY.
Change-Id: I4c9b3eb74775901554b939246722bd3a22326d10
Yifan Hong [Thu, 26 Jan 2017 18:30:58 +0000 (18:30 +0000)]
Merge changes from topic 'lshal' am:
1f2d5a9cda am:
65b5fab397
am:
cf41d3fa69
Change-Id: Ia11923e218c0594d2f67b95ec510fa80716d74e3
Yifan Hong [Thu, 26 Jan 2017 18:29:38 +0000 (18:29 +0000)]
Add debugDump() to IServiceManager. am:
5ccdab9bc5 am:
169161171c
am:
6c24cc3dd6
Change-Id: Id823cb5ce3aab358311858a5c041fbeb305dfdb7
Yifan Hong [Thu, 26 Jan 2017 18:29:26 +0000 (18:29 +0000)]
Add an lshal command. am:
85dd3ad89f am:
a763ae7121
am:
5a0eaa454f
Change-Id: Ifa851e5bb55a870a290b4be134607a744af5f741
Yifan Hong [Thu, 26 Jan 2017 18:27:25 +0000 (18:27 +0000)]
Merge changes from topic 'lshal' am:
1f2d5a9cda
am:
65b5fab397
Change-Id: If32d7c1459710e4f584be7740e8de785337dd54b
Yifan Hong [Thu, 26 Jan 2017 18:26:07 +0000 (18:26 +0000)]
Add debugDump() to IServiceManager. am:
5ccdab9bc5
am:
169161171c
Change-Id: I570c0d3f712dd8069d14fdae37c587ebcfd99229
Yifan Hong [Thu, 26 Jan 2017 18:25:56 +0000 (18:25 +0000)]
Add an lshal command. am:
85dd3ad89f
am:
a763ae7121
Change-Id: I627e16e1216e09dccbc96db26dfba844e073d403
Yifan Hong [Thu, 26 Jan 2017 18:24:44 +0000 (18:24 +0000)]
Merge changes from topic 'lshal'
am:
1f2d5a9cda
Change-Id: If2ed2950dfa6f7a4598e143e9e22b34426a8f196
Yifan Hong [Thu, 26 Jan 2017 18:23:12 +0000 (18:23 +0000)]
Add debugDump() to IServiceManager.
am:
5ccdab9bc5
Change-Id: I4823ca88072ebe167fa6a3b894cad610cea88c94
Yifan Hong [Thu, 26 Jan 2017 18:23:02 +0000 (18:23 +0000)]
Add an lshal command.
am:
85dd3ad89f
Change-Id: I43be1cd548f30d7d6e954411fc3db8b13e20f3c0
Yifan Hong [Thu, 26 Jan 2017 18:18:19 +0000 (18:18 +0000)]
Merge changes from topic 'lshal'
* changes:
Add debugDump() to IServiceManager.
Add an lshal command.
Jeff Sharkey [Thu, 26 Jan 2017 17:45:35 +0000 (17:45 +0000)]
Merge "Fix two bugs in external storage accounting." am:
d1361ceb0c am:
e4dc5d4ec5
am:
0f08cf28bd
Change-Id: Ib784b3bbeb49c56b0f2f2b180c04fc6bec14e68b
Jeff Sharkey [Thu, 26 Jan 2017 17:43:07 +0000 (17:43 +0000)]
Merge "Fix two bugs in external storage accounting." am:
d1361ceb0c
am:
e4dc5d4ec5
Change-Id: I61ec7deb5d7196259e83de0a141ef23d198b9f1e
Jeff Sharkey [Thu, 26 Jan 2017 17:40:36 +0000 (17:40 +0000)]
Merge "Fix two bugs in external storage accounting."
am:
d1361ceb0c
Change-Id: I6f661104fbe8527bfbb1f9599beb395e5bc9d218
Treehugger Robot [Thu, 26 Jan 2017 17:37:23 +0000 (17:37 +0000)]
Merge "Fix two bugs in external storage accounting."
Yifan Hong [Thu, 26 Jan 2017 06:53:37 +0000 (22:53 -0800)]
Add debugDump() to IServiceManager.
Test: mma
Change-Id: I04289500c7ee42a84d3593b4c0e45a0b829370a7
Yifan Hong [Wed, 25 Jan 2017 22:20:34 +0000 (14:20 -0800)]
Add an lshal command.
lshal lists services registered to the binderized
IServiceManager and all services available to the
passthrough IServiceManager as *.so libraries. It
also dumps the reference count for each service.
Bug:
34712252
Test: adb shell lshal
Change-Id: I9436a033cf736b8a8c307a2e87549c9db6379f3f
Jeff Sharkey [Thu, 26 Jan 2017 05:15:42 +0000 (22:15 -0700)]
Fix two bugs in external storage accounting.
When doing a manual tree walk, we always want to inherit fts_number
from the parent fts node.
For create_data_media_package_path(), two of the arguments had been
swapped.
Test: cts-tradefed run commandAndExit cts-dev -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.StorageHostTest
Bug:
27948817,
30927649
Change-Id: Ic3cbf387cf119aa82af6e380bde9d9b069f6bfb0
George Burgess IV [Thu, 26 Jan 2017 01:37:08 +0000 (01:37 +0000)]
Merge "Add mode to open call with O_CREAT" am:
af78fe13a0 am:
f6b468db7b
am:
2b0fedb71e
Change-Id: I7710b8e0e21243edf1136fa87bb36655bc5b5b95
George Burgess IV [Thu, 26 Jan 2017 01:34:39 +0000 (01:34 +0000)]
Merge "Add mode to open call with O_CREAT" am:
af78fe13a0
am:
f6b468db7b
Change-Id: I6ec7cd3bfa79ac95a042e26455073cb3cbec60c3
George Burgess IV [Thu, 26 Jan 2017 01:32:36 +0000 (01:32 +0000)]
Merge "Add mode to open call with O_CREAT"
am:
af78fe13a0
Change-Id: I488ffb3be9152532fd3e7eddd7bc78d311673420
Treehugger Robot [Thu, 26 Jan 2017 01:25:52 +0000 (01:25 +0000)]
Merge "Add mode to open call with O_CREAT"
George Burgess IV [Wed, 25 Jan 2017 21:51:53 +0000 (13:51 -0800)]
Add mode to open call with O_CREAT
This change was already applied internally. For us to submit FORTIFY, we
need to push it out here. Otherwise, we get compile-time errors about
this.
Bug:
32073964
Test: Builds with FORTIFY.
Change-Id: Ib500aca933468c06f7ceb796a9bb6a16c118e366
Merged-In: I63eb3d5499ae7e9ff9a77393763e39b747fd4611
Stephen Hines [Tue, 24 Jan 2017 02:22:06 +0000 (02:22 +0000)]
Merge "Properly align a packed structure." am:
24257dda48 am:
7e500210be
am:
bfee6aee59
Change-Id: I801b129aa66816d9639f9b089ca35fc82caf69fa
Stephen Hines [Tue, 24 Jan 2017 01:21:35 +0000 (01:21 +0000)]
Merge "Properly align a packed structure." am:
24257dda48
am:
7e500210be
Change-Id: If09a200e9efa35ecc8611d087a7ba63f99f2a330
Stephen Hines [Tue, 24 Jan 2017 01:20:04 +0000 (01:20 +0000)]
Merge "Properly align a packed structure."
am:
24257dda48
Change-Id: I66d07aab4dfa72afe44270d866514102f660aab6
Treehugger Robot [Tue, 24 Jan 2017 01:15:06 +0000 (01:15 +0000)]
Merge "Properly align a packed structure."