OSDN Git Service
Marco Nelissen [Tue, 6 Jun 2017 23:54:55 +0000 (23:54 +0000)]
Merge "Close connection before retrying" into lmp-dev am:
a8648ecebb am:
5181a7ab64 am:
4b78a79546 am:
6d5bc9a3c2 am:
3272cf26c1 am:
e18e8c4113 am:
69b6a382a3 am:
ce5c72e887
am:
4d9e6150f3
Change-Id: I5ede1388f265920fa5dd835c4a6335380daa9103
Marco Nelissen [Tue, 6 Jun 2017 23:45:51 +0000 (23:45 +0000)]
Merge "Close connection before retrying" into lmp-dev am:
a8648ecebb am:
5181a7ab64 am:
4b78a79546 am:
6d5bc9a3c2 am:
3272cf26c1 am:
e18e8c4113 am:
69b6a382a3
am:
ce5c72e887
Change-Id: I081f15c5d6bb16b3f490e53dbc2910a45e6a920b
Marco Nelissen [Tue, 6 Jun 2017 23:39:57 +0000 (23:39 +0000)]
Merge "Close connection before retrying" into lmp-dev am:
a8648ecebb am:
5181a7ab64 am:
4b78a79546 am:
6d5bc9a3c2 am:
3272cf26c1 am:
e18e8c4113
am:
69b6a382a3
Change-Id: I2c599bac680bda5d4dcfa4f3b9fb5f1413839da0
Marco Nelissen [Tue, 6 Jun 2017 23:33:50 +0000 (23:33 +0000)]
Merge "Close connection before retrying" into lmp-dev am:
a8648ecebb am:
5181a7ab64 am:
4b78a79546 am:
6d5bc9a3c2 am:
3272cf26c1
am:
e18e8c4113
Change-Id: I5c34b680b1c7abcfd33c8719406516fe796afebb
Marco Nelissen [Tue, 6 Jun 2017 23:28:27 +0000 (23:28 +0000)]
Merge "Close connection before retrying" into lmp-dev am:
a8648ecebb am:
5181a7ab64 am:
4b78a79546 am:
6d5bc9a3c2
am:
3272cf26c1
Change-Id: I92f069aa6f3a897f9bfba4405dcd64dc066db944
Marco Nelissen [Tue, 6 Jun 2017 23:22:14 +0000 (23:22 +0000)]
Merge "Close connection before retrying" into lmp-dev am:
a8648ecebb am:
5181a7ab64 am:
4b78a79546
am:
6d5bc9a3c2
Change-Id: I8165c2218d0d5de41468f8acff86a720c03d1f52
Marco Nelissen [Tue, 6 Jun 2017 23:16:24 +0000 (23:16 +0000)]
Merge "Close connection before retrying" into lmp-dev am:
a8648ecebb am:
5181a7ab64
am:
4b78a79546
Change-Id: Iceb4edfd80a0a483d28f2624669eff9dd86bfcb8
Marco Nelissen [Tue, 6 Jun 2017 23:10:16 +0000 (23:10 +0000)]
Merge "Close connection before retrying" into lmp-dev am:
a8648ecebb
am:
5181a7ab64
Change-Id: I34a176a0da235836eaa9e44b843ec5d5654b8db9
Marco Nelissen [Tue, 6 Jun 2017 23:02:35 +0000 (23:02 +0000)]
Merge "Close connection before retrying" into lmp-dev
am:
a8648ecebb
Change-Id: I744fdb979aa2803b53d3ff6f4e3e72f6f1160d74
TreeHugger Robot [Tue, 6 Jun 2017 22:53:55 +0000 (22:53 +0000)]
Merge "Close connection before retrying" into lmp-dev
Marco Nelissen [Fri, 2 Jun 2017 19:16:44 +0000 (12:16 -0700)]
Close connection before retrying
Otherwise the (CTS) server might run out of connections.
Bug:
38391487
Bug:
22771132
Test: build, run CTS, stream music
Change-Id: I92c782a6799ab36eec8df3f7c3217bea667b838a
Nick Kralevich [Tue, 23 May 2017 00:18:31 +0000 (00:18 +0000)]
ZygoteInit: Remove CAP_SYS_RESOURCE am:
4911af2b8c am:
1cc9ec47c8 am:
8965cd6a39 am:
47beaa8fab am:
55c8a1ede9 am:
66a08a5413 am:
7a06357519 am:
a07389b446
am:
5f4382e2a6
Change-Id: Ieab172a133b0d9198cef008b037c4a1107d0746c
Nick Kralevich [Tue, 23 May 2017 00:17:22 +0000 (00:17 +0000)]
system_server: add CAP_SYS_PTRACE am:
966619d0ab am:
b8d972e973 am:
c46889e2d2 am:
f5bd84b82d am:
982b8018af am:
7fd2d8ea31 am:
5bfe82c3ee am:
12c5f0da9f
am:
dc87ac995a
Change-Id: Ic7e65852a72cde3d2e285774e9cb85e9590e7fd2
Nick Kralevich [Tue, 23 May 2017 00:07:43 +0000 (00:07 +0000)]
ZygoteInit: Remove CAP_SYS_RESOURCE am:
4911af2b8c am:
1cc9ec47c8 am:
8965cd6a39 am:
47beaa8fab am:
55c8a1ede9 am:
66a08a5413 am:
7a06357519
am:
a07389b446
Change-Id: I5e8fdff89b3d8d1e36f24767dc60efa1dc352dcb
Nick Kralevich [Tue, 23 May 2017 00:06:55 +0000 (00:06 +0000)]
system_server: add CAP_SYS_PTRACE am:
966619d0ab am:
b8d972e973 am:
c46889e2d2 am:
f5bd84b82d am:
982b8018af am:
7fd2d8ea31 am:
5bfe82c3ee
am:
12c5f0da9f
Change-Id: I8ce1d6a2399967cf0408adf7ffbe1839f471e1e7
Nick Kralevich [Mon, 22 May 2017 23:51:48 +0000 (23:51 +0000)]
ZygoteInit: Remove CAP_SYS_RESOURCE am:
4911af2b8c am:
1cc9ec47c8 am:
8965cd6a39 am:
47beaa8fab am:
55c8a1ede9 am:
66a08a5413
am:
7a06357519
Change-Id: I9301189268f519d4b87d8c9bfa88d1da4e8a53cd
Nick Kralevich [Mon, 22 May 2017 23:50:57 +0000 (23:50 +0000)]
system_server: add CAP_SYS_PTRACE am:
966619d0ab am:
b8d972e973 am:
c46889e2d2 am:
f5bd84b82d am:
982b8018af am:
7fd2d8ea31
am:
5bfe82c3ee
Change-Id: I95333a7ff3d6ee1a3161d436a2a0b312931b663e
Nick Kralevich [Mon, 22 May 2017 23:36:12 +0000 (23:36 +0000)]
ZygoteInit: Remove CAP_SYS_RESOURCE am:
4911af2b8c am:
1cc9ec47c8 am:
8965cd6a39 am:
47beaa8fab am:
55c8a1ede9
am:
66a08a5413
Change-Id: Ica5cb7828a37bd597dc0d83f7a65e89380d1e31c
Nick Kralevich [Mon, 22 May 2017 23:35:04 +0000 (23:35 +0000)]
system_server: add CAP_SYS_PTRACE am:
966619d0ab am:
b8d972e973 am:
c46889e2d2 am:
f5bd84b82d am:
982b8018af
am:
7fd2d8ea31
Change-Id: I4b57d119b9b8d512a017ede0fb62658fb25f9580
Nick Kralevich [Mon, 22 May 2017 23:19:09 +0000 (23:19 +0000)]
ZygoteInit: Remove CAP_SYS_RESOURCE am:
4911af2b8c am:
1cc9ec47c8 am:
8965cd6a39 am:
47beaa8fab
am:
55c8a1ede9
Change-Id: Ia3e4d749c5b5475640325fd47eb4260d52e61365
Nick Kralevich [Mon, 22 May 2017 23:18:24 +0000 (23:18 +0000)]
system_server: add CAP_SYS_PTRACE am:
966619d0ab am:
b8d972e973 am:
c46889e2d2 am:
f5bd84b82d
am:
982b8018af
Change-Id: I8cb5052694668ee8021f75778244e4d1b6cc3bb5
Nick Kralevich [Mon, 22 May 2017 23:02:54 +0000 (23:02 +0000)]
ZygoteInit: Remove CAP_SYS_RESOURCE am:
4911af2b8c am:
1cc9ec47c8 am:
8965cd6a39
am:
47beaa8fab
Change-Id: Ie697e5e8bfb7664b410d564a84ae5784be890f90
Nick Kralevich [Mon, 22 May 2017 23:02:13 +0000 (23:02 +0000)]
system_server: add CAP_SYS_PTRACE am:
966619d0ab am:
b8d972e973 am:
c46889e2d2
am:
f5bd84b82d
Change-Id: I163a9224d6b0ff5f42f52656773e1c297661b977
Nick Kralevich [Mon, 22 May 2017 22:46:18 +0000 (22:46 +0000)]
ZygoteInit: Remove CAP_SYS_RESOURCE am:
4911af2b8c am:
1cc9ec47c8
am:
8965cd6a39
Change-Id: If549cda5fd1a640fee746311745b9b08ebf63b91
Nick Kralevich [Mon, 22 May 2017 22:45:44 +0000 (22:45 +0000)]
system_server: add CAP_SYS_PTRACE am:
966619d0ab am:
b8d972e973
am:
c46889e2d2
Change-Id: I840740012d9ba0c434f7de0fd9ca83a44926d018
Nick Kralevich [Mon, 22 May 2017 22:24:39 +0000 (22:24 +0000)]
ZygoteInit: Remove CAP_SYS_RESOURCE am:
4911af2b8c
am:
1cc9ec47c8
Change-Id: Ic81685686dabbc1f0004a30785a021bf89420846
Nick Kralevich [Mon, 22 May 2017 22:23:47 +0000 (22:23 +0000)]
system_server: add CAP_SYS_PTRACE am:
966619d0ab
am:
b8d972e973
Change-Id: I4d9e2d9b53523b9182a9f9272d06a93a87b0c61b
Nick Kralevich [Mon, 22 May 2017 22:05:18 +0000 (22:05 +0000)]
ZygoteInit: Remove CAP_SYS_RESOURCE
am:
4911af2b8c
Change-Id: I4aa46981edb8fd711e1aec8c889528e596e5c233
Nick Kralevich [Mon, 22 May 2017 22:04:57 +0000 (22:04 +0000)]
system_server: add CAP_SYS_PTRACE
am:
966619d0ab
Change-Id: Ie5f95f2c078cd0bec7a2b2321c3303301ec9ec74
Nick Kralevich [Tue, 14 Mar 2017 17:25:35 +0000 (10:25 -0700)]
ZygoteInit: Remove CAP_SYS_RESOURCE
Please see commit
3082eb7c7253c62a06aa151a80487a4eabd49914 for an
explanation of this change.
This capability is not used by system_server.
Bug:
34951864
Bug:
38496951
Test: code compiles, device boots, no selinux errors ever reported.
Change-Id: I4242b1abaa8679b9bfa0d31a1df565b46b7b3cc3
(cherry picked from commit
35775783fc6609035136184e3843bc743b59945d)
Nick Kralevich [Wed, 15 Feb 2017 23:12:31 +0000 (15:12 -0800)]
system_server: add CAP_SYS_PTRACE
Commit https://android.googlesource.com/kernel/common/+/
f0ce0eee added
CAP_SYS_RESOURCE as a capability check which would allow access to
sensitive /proc/PID files. system_server uses this capability to collect
smaps from managed processes. Presumably this was done to avoid the
implications of granting CAP_SYS_PTRACE to system_server.
However, with SELinux enforcement, we can grant CAP_SYS_PTRACE but not
allow ptrace attach() to other processes. The net result of this is that
CAP_SYS_PTRACE and CAP_SYS_RESOURCE have identical security controls, as
long as system_server:process ptrace is never granted.
Add CAP_SYS_PTRACE to the set of capabilities granted to system_server.
Don't delete CAP_SYS_RESOURCE for now. SELinux has blocked the use of
CAP_SYS_RESOURCE, but we still want to generate audit logs if it's
triggered. CAP_SYS_RESOURCE can be deleted in a future commit.
Bug:
34951864
Bug:
38496951
Test: Device boots, functionality remains identical, no sys_resource
denials from system_server.
Change-Id: I2570266165396dba2b600eac7c42c94800d9c65b
(cherry picked from commit
3082eb7c7253c62a06aa151a80487a4eabd49914)
David Farrow [Thu, 27 Apr 2017 17:01:09 +0000 (17:01 +0000)]
Merge "documentation fixes" into nyc-mr1-dev
Dave Friedman [Thu, 13 Apr 2017 17:00:44 +0000 (17:00 +0000)]
Docs: Fixes broken link in Javadoc. am:
df0fd34d50
am:
506a8b39fb
Change-Id: If60b7db71fe92508daaec1255c637927432d7b55
Dave Friedman [Thu, 13 Apr 2017 16:48:41 +0000 (16:48 +0000)]
Docs: Fixes broken link in Javadoc.
am:
df0fd34d50
Change-Id: I76ed5361426065d5e532c5a11c2d11f28ba8c2d7
Dave Friedman [Mon, 10 Apr 2017 21:50:24 +0000 (14:50 -0700)]
Docs: Fixes broken link in Javadoc.
Bug:
37198106
Change-Id: If005bf563f7bd97f794261e03d46c7b092955a89
Phil Weaver [Sat, 8 Apr 2017 00:25:13 +0000 (00:25 +0000)]
Merge "Make a11y node info parceling more robust" into lmp-mr1-dev am:
88698afd01 am:
7cb5e1dfd1 am:
d7552dc819 am:
e3a1b81c8f am:
879bdbeb37 am:
f580a2c257 am:
68a93d2be2
am:
c7db1bf43a
Change-Id: I19e1e68857f43e9d36240753d2f5c72374b566b1
Phil Weaver [Sat, 8 Apr 2017 00:17:24 +0000 (00:17 +0000)]
Merge "Make a11y node info parceling more robust" into lmp-mr1-dev am:
88698afd01 am:
7cb5e1dfd1 am:
d7552dc819 am:
e3a1b81c8f am:
879bdbeb37 am:
f580a2c257
am:
68a93d2be2
Change-Id: I3ea690e5ee140b0f0e38935adabda3aeeb9e57cb
Phil Weaver [Sat, 8 Apr 2017 00:09:44 +0000 (00:09 +0000)]
Merge "Make a11y node info parceling more robust" into lmp-mr1-dev am:
88698afd01 am:
7cb5e1dfd1 am:
d7552dc819 am:
e3a1b81c8f am:
879bdbeb37
am:
f580a2c257
Change-Id: I25bc8884d004bfc9790d40cb8f1ad1a285203e98
Phil Weaver [Sat, 8 Apr 2017 00:09:40 +0000 (00:09 +0000)]
Make a11y node info parceling more robust am:
1d8eb49073 am:
93c47c9d07 am:
3a7cf1f057 -s ours am:
d3a4f4a33c am:
384e51767d am:
e4beeeb423 am:
8e6d10c65f am:
ba05c14397
am:
88bd259e8d
Change-Id: I78596326137bb4fcd01f6f2b9d81787d9ccb9cf9
Phil Weaver [Sat, 8 Apr 2017 00:02:10 +0000 (00:02 +0000)]
Make a11y node info parceling more robust am:
1d8eb49073 am:
93c47c9d07 am:
3a7cf1f057 -s ours am:
d3a4f4a33c am:
384e51767d am:
e4beeeb423 am:
8e6d10c65f
am:
ba05c14397
Change-Id: I9b44e3353c2140d074f7eb38342257334330fb6f
Phil Weaver [Sat, 8 Apr 2017 00:02:02 +0000 (00:02 +0000)]
Merge "Make a11y node info parceling more robust" into lmp-mr1-dev am:
88698afd01 am:
7cb5e1dfd1 am:
d7552dc819 am:
e3a1b81c8f
am:
879bdbeb37
Change-Id: I7e7f391e2fe53d60a13b8c96d5ba1cab6e880b48
Phil Weaver [Fri, 7 Apr 2017 23:58:02 +0000 (23:58 +0000)]
Merge "Make a11y node info parceling more robust" into lmp-mr1-dev am:
88698afd01 am:
7cb5e1dfd1 am:
d7552dc819
am:
e3a1b81c8f
Change-Id: I221aecc956ab769246b0aaee7507a468c106c43d
Phil Weaver [Fri, 7 Apr 2017 23:54:43 +0000 (23:54 +0000)]
Make a11y node info parceling more robust am:
1d8eb49073 am:
93c47c9d07 am:
3a7cf1f057 -s ours am:
d3a4f4a33c am:
384e51767d am:
e4beeeb423
am:
8e6d10c65f
Change-Id: I6ce318f51b1a7ead1898c6a6c61d9ca5e48f2fd1
Phil Weaver [Fri, 7 Apr 2017 23:51:01 +0000 (23:51 +0000)]
Merge "Make a11y node info parceling more robust" into lmp-mr1-dev am:
88698afd01 am:
7cb5e1dfd1
am:
d7552dc819
Change-Id: I926e8b686895d4dcb401e0274b786702a5648307
Phil Weaver [Fri, 7 Apr 2017 23:47:07 +0000 (23:47 +0000)]
Make a11y node info parceling more robust am:
1d8eb49073 am:
93c47c9d07 am:
3a7cf1f057 -s ours am:
d3a4f4a33c am:
384e51767d
am:
e4beeeb423
Change-Id: I6a369b43c54463330d6aa8a2f4ad9b5f5e46e887
Phil Weaver [Fri, 7 Apr 2017 23:43:28 +0000 (23:43 +0000)]
Merge "Make a11y node info parceling more robust" into lmp-mr1-dev am:
88698afd01
am:
7cb5e1dfd1
Change-Id: I8e51350ae38384dfb9ae034d73fe9087837b27f7
Phil Weaver [Fri, 7 Apr 2017 23:43:01 +0000 (23:43 +0000)]
Make a11y node info parceling more robust am:
1d8eb49073 am:
93c47c9d07 am:
3a7cf1f057 -s ours am:
d3a4f4a33c
am:
384e51767d
Change-Id: I566fa4ea9d3d15e1a65fbae11d20defb37868dd6
Phil Weaver [Fri, 7 Apr 2017 23:36:29 +0000 (23:36 +0000)]
Merge "Make a11y node info parceling more robust" into lmp-mr1-dev
am:
88698afd01
Change-Id: I37194d958aa5fc21ece027c288e2f9a0a239cd93
Phil Weaver [Fri, 7 Apr 2017 23:36:29 +0000 (23:36 +0000)]
Make a11y node info parceling more robust am:
1d8eb49073 am:
93c47c9d07 am:
3a7cf1f057 -s ours
am:
d3a4f4a33c
Change-Id: I2c1d0fb08ed990e4deb03361dddb1075d1ac7fad
Phil Weaver [Fri, 7 Apr 2017 23:30:19 +0000 (23:30 +0000)]
Make a11y node info parceling more robust am:
1d8eb49073 am:
93c47c9d07
am:
3a7cf1f057 -s ours
Change-Id: I0000c6df3ca0375022535be19cf0f9a76ed07e39
Phil Weaver [Fri, 7 Apr 2017 23:27:47 +0000 (23:27 +0000)]
Merge "Make a11y node info parceling more robust" into lmp-mr1-dev
Phil Weaver [Fri, 7 Apr 2017 23:25:03 +0000 (23:25 +0000)]
Merge "Make a11y node info parceling more robust" into nyc-dev am:
ce5c8cb6b8
am:
3241198caa
Change-Id: I370bd8804cd24fb3b67160da1e76084abce525cf
Phil Weaver [Fri, 7 Apr 2017 23:17:08 +0000 (23:17 +0000)]
Make a11y node info parceling more robust am:
d0e54c1c09 am:
d87b12a4df am:
a0f874d5c1 am:
c30868369c am:
4c898e40ef
am:
b35d6eadf3
Change-Id: I460b2e5df5cc1946eec4e9366e22c5de188642c9
Phil Weaver [Fri, 7 Apr 2017 23:17:02 +0000 (23:17 +0000)]
Merge "Make a11y node info parceling more robust" into nyc-dev
am:
ce5c8cb6b8
Change-Id: I6cd7aa39d267bbecbbed54f564dc90b520fe5773
Phil Weaver [Fri, 7 Apr 2017 23:16:55 +0000 (23:16 +0000)]
Make a11y node info parceling more robust am:
1d8eb49073
am:
93c47c9d07
Change-Id: I8677c77968c202c8c6a0553db919610a140fda58
Phil Weaver [Fri, 7 Apr 2017 23:10:27 +0000 (23:10 +0000)]
Merge "Make a11y node info parceling more robust" into nyc-dev
Phil Weaver [Fri, 7 Apr 2017 23:09:35 +0000 (23:09 +0000)]
Make a11y node info parceling more robust am:
d0e54c1c09 am:
d87b12a4df am:
a0f874d5c1 am:
c30868369c
am:
4c898e40ef
Change-Id: Icdb456c12bf0e0d3675ab15fa0b82b482ff4ddeb
Phil Weaver [Fri, 7 Apr 2017 23:09:28 +0000 (23:09 +0000)]
Make a11y node info parceling more robust
am:
1d8eb49073
Change-Id: I5280a23cbfff5abfcc83e9e6d9afb4f8960ece44
Phil Weaver [Fri, 7 Apr 2017 23:02:10 +0000 (23:02 +0000)]
Make a11y node info parceling more robust am:
d0e54c1c09 am:
d87b12a4df am:
a0f874d5c1
am:
c30868369c
Change-Id: If1cfc920db5aea27397a8f79125db944d5c4580b
Phil Weaver [Fri, 7 Apr 2017 22:53:58 +0000 (22:53 +0000)]
Make a11y node info parceling more robust am:
d0e54c1c09 am:
d87b12a4df
am:
a0f874d5c1
Change-Id: I2bc5c091c1c685da2be951e4294483519481789f
Phil Weaver [Fri, 7 Apr 2017 22:46:31 +0000 (22:46 +0000)]
Make a11y node info parceling more robust am:
d0e54c1c09
am:
d87b12a4df
Change-Id: Ic10324338024f86cfc64b3e01c6380b26334d5a3
Phil Weaver [Fri, 7 Apr 2017 22:39:22 +0000 (22:39 +0000)]
Make a11y node info parceling more robust
am:
d0e54c1c09
Change-Id: Ie4c34b84540bc928859ef1c271b4eb9d520fa6bc
Phil Weaver [Fri, 7 Apr 2017 21:39:27 +0000 (14:39 -0700)]
Make a11y node info parceling more robust
Fix a bug where a malformed Parceled representation
of an AccessibilityNodeInfo could be used to mess with
Bundles as they get reparceled.
Bug:
36491278
Test: Verified that POC no longer works, a11y cts still passes.
(Manual merge from commit
687bb44b437f7bb24dd3dddf072c2f646308e2ca)
Change-Id: I7746c9175a2da28f75d4f4b169d7997abadf1852
Phil Weaver [Fri, 7 Apr 2017 21:39:27 +0000 (14:39 -0700)]
Make a11y node info parceling more robust
Fix a bug where a malformed Parceled representation
of an AccessibilityNodeInfo could be used to mess with
Bundles as they get reparceled.
Bug:
36491278
Test: Verified that POC no longer works, a11y cts still passes.
(Manual merge from commit
687bb44b437f7bb24dd3dddf072c2f646308e2ca)
Change-Id: I7746c9175a2da28f75d4f4b169d7997abadf1852
Phil Weaver [Fri, 7 Apr 2017 00:40:51 +0000 (17:40 -0700)]
Make a11y node info parceling more robust
Fix a bug where a malformed Parceled representation
of an AccessibilityNodeInfo could be used to mess with
Bundles as they get reparceled.
Bug:
36491278
Test: Verified that POC no longer works, a11y cts still passes.
Change-Id: I10f24747e3ab87d77cd1deba56db4526e3aa5441
(cherry picked from commit
687bb44b437f7bb24dd3dddf072c2f646308e2ca)
Phil Weaver [Fri, 7 Apr 2017 00:40:51 +0000 (17:40 -0700)]
Make a11y node info parceling more robust
Fix a bug where a malformed Parceled representation
of an AccessibilityNodeInfo could be used to mess with
Bundles as they get reparceled.
Bug:
36491278
Test: Verified that POC no longer works, a11y cts still passes.
Change-Id: I10f24747e3ab87d77cd1deba56db4526e3aa5441
(cherry picked from commit
687bb44b437f7bb24dd3dddf072c2f646308e2ca)
Andrew Solovay [Thu, 9 Mar 2017 01:38:01 +0000 (17:38 -0800)]
docs: Removing Android dev docs from Gerrit
Android developer docs are now maintained in Piper, go/dac-source
Removing all files from Gerrit, since these files can cause build
errors if they refer to classes that are later removed (whence
bug b/
35849713 ).
Gerrit already has readme files in these directories telling people
docs are not maintained here; these readmes will be a lot easier to
spot now.
Ran a doc build with these files deleted, and it seems to work fine,
so submitting this CL *shouldn't* break anything.
Merged to master to resolve conflict.
Merged-In: Ic74c3f97f9620daf23543930a8b7ed1386f4d172
Bug:
35849713
Change-Id: I5331cdc968be817ff70ba32dd03fce76493a6ab8
Marie Janssen [Tue, 14 Mar 2017 19:16:47 +0000 (19:16 +0000)]
Merge commit '
faf40708836c34936932c67f47ed39ef4b85de03' into manual_merge_faf40708836c
am:
4034a9a96a
Change-Id: Ie63f9d24ab37c5465b250d2b9b60efdf736b4d60
Marie Janssen [Tue, 14 Mar 2017 17:09:52 +0000 (10:09 -0700)]
Merge commit '
faf40708836c34936932c67f47ed39ef4b85de03' into manual_merge_faf40708836c
Change-Id: I2b9aeca138aefb0579b3be8014b3f0bf49d99764
Marie Janssen [Tue, 14 Mar 2017 16:01:07 +0000 (16:01 +0000)]
Merge "Protect Bluetooth OPP ACCEPT and DECLINE broadcast" into nyc-dev
Kenny Guy [Tue, 14 Mar 2017 12:11:54 +0000 (12:11 +0000)]
Merge "DO NOT MERGE Clear calling identity before checking if user is running." into nyc-dev am:
2df7f9f9c0
am:
c5d86736d3
Change-Id: I0886d46f74fec980eb8bd6c99d8b647e294bcb21
Kenny Guy [Tue, 14 Mar 2017 12:07:26 +0000 (12:07 +0000)]
Merge "DO NOT MERGE Clear calling identity before checking if user is running." into nyc-dev
am:
2df7f9f9c0
Change-Id: I9ca23aa395e0120413a60174e9b7ef44d91a90b1
Kenny Guy [Tue, 14 Mar 2017 12:01:54 +0000 (12:01 +0000)]
Merge "DO NOT MERGE Clear calling identity before checking if user is running." into nyc-dev
Fyodor Kupolov [Fri, 10 Mar 2017 03:58:02 +0000 (03:58 +0000)]
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev am:
ac87aee354 am:
a821245d70 am:
156fa32e2a -s ours am:
de9cb7ed68 -s ours am:
2c112c4ad2 am:
2411b4f774 -s ours am:
aa0b718886 am:
9e2cf8e5c4 am:
f937aabb0f am:
f7cde31747 -s ours am:
1fd70c201a
am:
ff5be765b1
Change-Id: I4fb68c79924a046a065f893b14877fb6d6e21632
Fyodor Kupolov [Fri, 10 Mar 2017 03:48:47 +0000 (03:48 +0000)]
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev am:
ac87aee354 am:
a821245d70 am:
156fa32e2a -s ours am:
de9cb7ed68 -s ours am:
2c112c4ad2 am:
2411b4f774 -s ours am:
aa0b718886 am:
9e2cf8e5c4 am:
f937aabb0f am:
f7cde31747 -s ours
am:
1fd70c201a
Change-Id: Ia89d648b7b9042781c41a8bb0ffa7a125b3f36d1
Fyodor Kupolov [Fri, 10 Mar 2017 03:40:12 +0000 (03:40 +0000)]
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev am:
ac87aee354 am:
a821245d70 am:
156fa32e2a -s ours am:
de9cb7ed68 -s ours am:
2c112c4ad2 am:
2411b4f774 -s ours am:
aa0b718886 am:
9e2cf8e5c4 am:
f937aabb0f
am:
f7cde31747 -s ours
Change-Id: I801cd8c8e607f2c88edb26ea1947e650f128df4d
Fyodor Kupolov [Fri, 10 Mar 2017 03:34:38 +0000 (03:34 +0000)]
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev am:
ac87aee354 am:
a821245d70 am:
156fa32e2a -s ours am:
de9cb7ed68 -s ours am:
2c112c4ad2 am:
2411b4f774 -s ours am:
aa0b718886 am:
9e2cf8e5c4
am:
f937aabb0f
Change-Id: I6c0bf6190e96b34b6995337a94c451b4b172c168
Fyodor Kupolov [Fri, 10 Mar 2017 03:28:56 +0000 (03:28 +0000)]
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev am:
ac87aee354 am:
a821245d70 am:
156fa32e2a -s ours am:
de9cb7ed68 -s ours am:
2c112c4ad2 am:
2411b4f774 -s ours am:
aa0b718886
am:
9e2cf8e5c4
Change-Id: I4d447f67d293a1cc4a187d66496cb447612eebad
Fyodor Kupolov [Fri, 10 Mar 2017 03:23:34 +0000 (03:23 +0000)]
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev am:
ac87aee354 am:
a821245d70 am:
156fa32e2a -s ours am:
de9cb7ed68 -s ours am:
2c112c4ad2 am:
2411b4f774 -s ours
am:
aa0b718886
Change-Id: Ife44fe3b8b295901699de0043dba5bcdc06f32f3
Fyodor Kupolov [Fri, 10 Mar 2017 03:17:46 +0000 (03:17 +0000)]
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev am:
ac87aee354 am:
a821245d70 am:
156fa32e2a -s ours am:
de9cb7ed68 -s ours am:
2c112c4ad2
am:
2411b4f774 -s ours
Change-Id: Ie78ad1a602d6502c09a98ee9e28119caab3534b7
Fyodor Kupolov [Fri, 10 Mar 2017 03:12:06 +0000 (03:12 +0000)]
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev am:
ac87aee354 am:
a821245d70 am:
156fa32e2a -s ours am:
de9cb7ed68 -s ours
am:
2c112c4ad2
Change-Id: Ic108a0750248d001873de33d69984e6cf2c3584a
Fyodor Kupolov [Fri, 10 Mar 2017 03:06:31 +0000 (03:06 +0000)]
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev am:
ac87aee354 am:
a821245d70 am:
156fa32e2a -s ours
am:
de9cb7ed68 -s ours
Change-Id: I2f94e2ea49c05a29308ca2351a083377350bb2ab
Fyodor Kupolov [Fri, 10 Mar 2017 03:03:03 +0000 (03:03 +0000)]
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into lmp-dev am:
d2e8e1488a -s ours am:
1e6d3f904e am:
ce677737ec -s ours am:
b76704bf25 am:
ad386addb9 am:
bbb7ae05d4 am:
1aaef53444 -s ours am:
9c4d89c55f
am:
a1aa5cb34a
Change-Id: Idb8e058c25dc0f9fe9a1de880a6cb4f052a8729d
Fyodor Kupolov [Fri, 10 Mar 2017 03:00:46 +0000 (03:00 +0000)]
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev am:
ac87aee354 am:
a821245d70
am:
156fa32e2a -s ours
Change-Id: Ic4e51daa36c395f2e3b538658649ff9104bb962c
Fyodor Kupolov [Fri, 10 Mar 2017 02:59:41 +0000 (02:59 +0000)]
[DO NOT MERGE] Throw exception if slot has invalid offset am:
69e347f7ef -s ours am:
1c732801ab am:
78861ad53e -s ours am:
13df27e68b am:
a3912b6a1b am:
0766ba70c0 am:
46dbe6a7d0 -s ours am:
567e742daf
am:
5a16e06272
Change-Id: I314400073f43d720f74eac2e8f744b3768537f49
Fyodor Kupolov [Fri, 10 Mar 2017 02:55:29 +0000 (02:55 +0000)]
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into lmp-dev am:
d2e8e1488a -s ours am:
1e6d3f904e am:
ce677737ec -s ours am:
b76704bf25 am:
ad386addb9 am:
bbb7ae05d4 am:
1aaef53444 -s ours
am:
9c4d89c55f
Change-Id: Ief6c78fd5c3d281eae14928bd5572e0042cbc684
Fyodor Kupolov [Fri, 10 Mar 2017 02:55:07 +0000 (02:55 +0000)]
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev am:
ac87aee354
am:
a821245d70
Change-Id: I1e47c963728906cb2283a353c882017368d07747
Fyodor Kupolov [Fri, 10 Mar 2017 02:50:38 +0000 (02:50 +0000)]
[DO NOT MERGE] Throw exception if slot has invalid offset am:
69e347f7ef -s ours am:
1c732801ab am:
78861ad53e -s ours am:
13df27e68b am:
a3912b6a1b am:
0766ba70c0 am:
46dbe6a7d0 -s ours
am:
567e742daf
Change-Id: Iad3060ad58e0276c5125a54915f35e01eaa5babe
Fyodor Kupolov [Fri, 10 Mar 2017 02:49:34 +0000 (02:49 +0000)]
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev
am:
ac87aee354
Change-Id: I5bbdc48120f2d03b4ad6605bfeccd5ccdc8c7958
Fyodor Kupolov [Fri, 10 Mar 2017 02:45:57 +0000 (02:45 +0000)]
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into lmp-dev am:
d2e8e1488a -s ours am:
1e6d3f904e am:
ce677737ec -s ours am:
b76704bf25 am:
ad386addb9 am:
bbb7ae05d4
am:
1aaef53444 -s ours
Change-Id: I9a962db0db6c1e5369bc3e21b4b2f1c6a21dc2c6
Fyodor Kupolov [Fri, 10 Mar 2017 02:42:23 +0000 (02:42 +0000)]
[DO NOT MERGE] Throw exception if slot has invalid offset am:
69e347f7ef -s ours am:
1c732801ab am:
78861ad53e -s ours am:
13df27e68b am:
a3912b6a1b am:
0766ba70c0
am:
46dbe6a7d0 -s ours
Change-Id: I23d0261d2b1704528a4ea49c59785c9e35419d2b
Fyodor Kupolov [Fri, 10 Mar 2017 02:39:09 +0000 (02:39 +0000)]
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into klp-dev
Fyodor Kupolov [Fri, 10 Mar 2017 02:39:11 +0000 (02:39 +0000)]
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into lmp-mr1-dev am:
e1766acb41 am:
105b0ff30c -s ours am:
677a8879c0 am:
360cb87db4 am:
109ac1c0b6 am:
48a36cdade -s ours am:
e8fb34b44c
am:
c4054a8b7f
Change-Id: I6834bf86950b8e6889515fcf52e930301c99ca57
Fyodor Kupolov [Fri, 10 Mar 2017 02:37:52 +0000 (02:37 +0000)]
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into lmp-dev am:
d2e8e1488a -s ours am:
1e6d3f904e am:
ce677737ec -s ours am:
b76704bf25 am:
ad386addb9
am:
bbb7ae05d4
Change-Id: Ia30782857bdbb6e05bc1e2b0e7c5d905509e2c5d
Fyodor Kupolov [Fri, 10 Mar 2017 02:34:06 +0000 (02:34 +0000)]
[DO NOT MERGE] Throw exception if slot has invalid offset am:
69e347f7ef -s ours am:
1c732801ab am:
78861ad53e -s ours am:
13df27e68b am:
a3912b6a1b
am:
0766ba70c0
Change-Id: Iccf8ecd9b0a5571efe648416ffda156578aeb095
Fyodor Kupolov [Fri, 10 Mar 2017 02:33:18 +0000 (02:33 +0000)]
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into lmp-mr1-dev am:
e1766acb41 am:
105b0ff30c -s ours am:
677a8879c0 am:
360cb87db4 am:
109ac1c0b6 am:
48a36cdade -s ours
am:
e8fb34b44c
Change-Id: I1aead2d88b2af119492a62134c1b416792218227
Fyodor Kupolov [Fri, 10 Mar 2017 02:30:29 +0000 (02:30 +0000)]
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into lmp-dev am:
d2e8e1488a -s ours am:
1e6d3f904e am:
ce677737ec -s ours am:
b76704bf25
am:
ad386addb9
Change-Id: I80e715d7dc65b82d89249b163c2198e5c0561761
Fyodor Kupolov [Fri, 10 Mar 2017 02:25:30 +0000 (02:25 +0000)]
[DO NOT MERGE] Throw exception if slot has invalid offset am:
69e347f7ef -s ours am:
1c732801ab am:
78861ad53e -s ours am:
13df27e68b
am:
a3912b6a1b
Change-Id: I48d59519ecc404860100e8aba1cb118e1d141ca0
Fyodor Kupolov [Fri, 10 Mar 2017 02:25:14 +0000 (02:25 +0000)]
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into lmp-mr1-dev am:
e1766acb41 am:
105b0ff30c -s ours am:
677a8879c0 am:
360cb87db4 am:
109ac1c0b6
am:
48a36cdade -s ours
Change-Id: I7cf97386f135d2814da0c7b33d7d80372b2bbaf2
Fyodor Kupolov [Fri, 10 Mar 2017 02:22:43 +0000 (02:22 +0000)]
Merge "[DO NOT MERGE] Throw exception if slot has invalid offset" into mnc-dev am:
d2699d009b am:
4130501c19 am:
3a8534f18e am:
a74748d05e -s ours am:
dd472080f0
am:
221088d6df
Change-Id: I2b47df993ec31f20618b0372995176d9bb38c0f7
OSDN Git Service
