OSDN Git Service
Etan Cohen [Thu, 8 Feb 2018 00:15:28 +0000 (00:15 +0000)]
Merge changes from topic "am-
513301705eec406eb3be13d14037bb53" into nyc-dev
am:
fa72a625cc
Change-Id: I99bcbd911edac1d5089e510b888c665f02dc881c
Android Build Merger (Role) [Wed, 7 Feb 2018 23:46:50 +0000 (23:46 +0000)]
Merge "Merge changes from topic "am-
9ce0d868c2a9496188a012d3ef43ba41" into nyc-dev am:
47f4b8411f" into nyc-dr1-dev
Android Build Merger (Role) [Wed, 7 Feb 2018 23:45:18 +0000 (23:45 +0000)]
Merge changes from topic "am-
513301705eec406eb3be13d14037bb53" into nyc-dev
* changes:
[automerger] Merge "Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into mnc-dr-dev am:
0153ac9dad" into cw-e-dev am:
84118c127f am:
c975948988
Merge "Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into mnc-dr-dev am:
0153ac9dad" into cw-e-dev am:
84118c127f
Android Build Merger (Role) [Wed, 7 Feb 2018 23:45:18 +0000 (23:45 +0000)]
Merge changes from topic "am-
513301705eec406eb3be13d14037bb53" into nyc-dr1-dev
* changes:
[automerger] Merge "Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into mnc-dr-dev am:
0153ac9dad" into cw-e-dev am:
84118c127f am:
c975948988 am:
b8abffa008
[automerger] Merge "Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into mnc-dr-dev am:
0153ac9dad" into cw-e-dev am:
84118c127f am:
c975948988
Merge "Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into mnc-dr-dev am:
0153ac9dad" into cw-e-dev am:
84118c127f
Etan Cohen [Wed, 7 Feb 2018 23:44:04 +0000 (23:44 +0000)]
Merge changes from topic "am-
9ce0d868c2a9496188a012d3ef43ba41" into nyc-dev
am:
47f4b8411f
Change-Id: Idb749103a54c357be2b17081c52265ca54426677
Android Build Merger (Role) [Wed, 7 Feb 2018 23:40:59 +0000 (23:40 +0000)]
[automerger] Merge "Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into mnc-dr-dev am:
0153ac9dad" into cw-e-dev am:
84118c127f am:
c975948988 am:
b8abffa008
Change-Id: I7e4aa757fe6447cc2bca1134e4406123e1ec3546
Android Build Merger (Role) [Wed, 7 Feb 2018 23:40:06 +0000 (23:40 +0000)]
[automerger] Merge changes from topic "am-
9ce0d868c2a9496188a012d3ef43ba41" into mnc-dr1.5-dev am:
eac0551992 am:
196b64c28c
Change-Id: I88db62bf864dfd51d8efe1e445fe953c17d684d9
Android Build Merger (Role) [Wed, 7 Feb 2018 23:39:56 +0000 (23:39 +0000)]
[automerger] Merge "Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into mnc-dr-dev am:
0153ac9dad" into cw-e-dev am:
84118c127f am:
c975948988
Change-Id: I2e6188de2f8814f2f75efe5000013c5636bc154a
Etan Cohen [Wed, 7 Feb 2018 23:39:34 +0000 (23:39 +0000)]
Merge changes from topic "am-
9ce0d868c2a9496188a012d3ef43ba41" into mnc-dr1.5-dev
am:
eac0551992
Change-Id: Ia7fedd1202e9250d27d16dc3327b7664b134ae1f
Etan Cohen [Wed, 7 Feb 2018 23:39:13 +0000 (23:39 +0000)]
Merge "Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into mnc-dr-dev am:
0153ac9dad" into cw-e-dev
am:
84118c127f
Change-Id: Id813276417c71446dd2ac8d146888297e5a6c89c
Android Build Merger (Role) [Wed, 7 Feb 2018 23:30:18 +0000 (23:30 +0000)]
Merge "Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into nyc-dev am:
f780227541" into nyc-dr1-dev
Etan Cohen [Wed, 7 Feb 2018 23:27:44 +0000 (23:27 +0000)]
Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into nyc-dev
am:
f780227541
Change-Id: I853c049eee96bb6b06cdc98f540e779761e946f3
Android Build Merger (Role) [Wed, 7 Feb 2018 23:27:41 +0000 (23:27 +0000)]
Merge changes from topic "am-
922cd235076540bdb5f01e7024397331" into nyc-dev
* changes:
[automerger] Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into cw-e-dev am:
6cc0b76e85 am:
c8d99435c1
Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into cw-e-dev am:
6cc0b76e85
Android Build Merger (Role) [Wed, 7 Feb 2018 23:27:41 +0000 (23:27 +0000)]
Merge "Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into cw-e-dev am:
6cc0b76e85" into mnc-dr1.5-dev
Android Build Merger (Role) [Wed, 7 Feb 2018 23:27:41 +0000 (23:27 +0000)]
Merge changes from topic "am-
922cd235076540bdb5f01e7024397331" into nyc-dr1-dev
* changes:
[automerger] Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into cw-e-dev am:
6cc0b76e85 am:
c8d99435c1 am:
117c674e9e
[automerger] Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into cw-e-dev am:
6cc0b76e85 am:
c8d99435c1
Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into cw-e-dev am:
6cc0b76e85
Android Build Merger (Role) [Wed, 7 Feb 2018 23:27:31 +0000 (23:27 +0000)]
Merge "Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into mnc-dr1.5-dev am:
1c198dfc71" into nyc-dev
Android Build Merger (Role) [Wed, 7 Feb 2018 23:27:31 +0000 (23:27 +0000)]
Merge changes from topic "am-
5525892b4ae143f49ddb25efbc5582ff" into nyc-dr1-dev
* changes:
[automerger] Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into mnc-dr1.5-dev am:
1c198dfc71 am:
dae4e83eaf
Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into mnc-dr1.5-dev am:
1c198dfc71
Android Build Merger (Role) [Wed, 7 Feb 2018 23:26:32 +0000 (23:26 +0000)]
Merge changes from topic "am-
9ce0d868c2a9496188a012d3ef43ba41" into nyc-dev
* changes:
[automerger] Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into mnc-dr-dev am:
0153ac9dad am:
523fed0deb am:
04e84bb0ec
[automerger] Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into mnc-dr-dev am:
0153ac9dad am:
523fed0deb
Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into mnc-dr-dev am:
0153ac9dad
Android Build Merger (Role) [Wed, 7 Feb 2018 23:26:32 +0000 (23:26 +0000)]
Merge changes from topic "am-
9ce0d868c2a9496188a012d3ef43ba41" into mnc-dr1.5-dev
* changes:
[automerger] Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into mnc-dr-dev am:
0153ac9dad am:
523fed0deb
Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into mnc-dr-dev am:
0153ac9dad
Android Build Merger (Role) [Wed, 7 Feb 2018 23:26:32 +0000 (23:26 +0000)]
Merge "Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into mnc-dr-dev am:
0153ac9dad" into cw-e-dev
Android Build Merger (Role) [Wed, 7 Feb 2018 23:26:32 +0000 (23:26 +0000)]
Merge changes from topic "am-
9ce0d868c2a9496188a012d3ef43ba41" into nyc-dr1-dev
* changes:
[automerger] Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into mnc-dr-dev am:
0153ac9dad am:
523fed0deb am:
04e84bb0ec am:
0dcedd2073
[automerger] Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into mnc-dr-dev am:
0153ac9dad am:
523fed0deb am:
04e84bb0ec
[automerger] Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into mnc-dr-dev am:
0153ac9dad am:
523fed0deb
Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into mnc-dr-dev am:
0153ac9dad
Android Build Merger (Role) [Wed, 7 Feb 2018 23:26:02 +0000 (23:26 +0000)]
[automerger] Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into cw-e-dev am:
6cc0b76e85 am:
c8d99435c1 am:
117c674e9e
Change-Id: I1fd6fa75b345a810ae53784b5b56004927cc35a9
Android Build Merger (Role) [Wed, 7 Feb 2018 23:25:57 +0000 (23:25 +0000)]
[automerger] Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into mnc-dr1.5-dev am:
1c198dfc71 am:
dae4e83eaf
Change-Id: I42a1eb239f491eb2c52db802b0b7cd8de9807b13
Android Build Merger (Role) [Wed, 7 Feb 2018 23:25:50 +0000 (23:25 +0000)]
[automerger] Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into cw-e-dev am:
6cc0b76e85 am:
c8d99435c1
Change-Id: I694605b85bb5b5d123663c7fe670274cb2e15f36
Etan Cohen [Wed, 7 Feb 2018 23:25:20 +0000 (23:25 +0000)]
Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into mnc-dr1.5-dev
am:
1c198dfc71
Change-Id: I26d40e2d2dd918f8dbe7b8b688f2834808c240c2
Etan Cohen [Wed, 7 Feb 2018 23:24:45 +0000 (23:24 +0000)]
Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into cw-e-dev
am:
6cc0b76e85
Change-Id: Ic11f51471318d3343024226f3bc282e35f9d6346
Android Build Merger (Role) [Wed, 7 Feb 2018 23:23:18 +0000 (23:23 +0000)]
[automerger] Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into mnc-dr-dev am:
0153ac9dad am:
523fed0deb am:
04e84bb0ec am:
0dcedd2073
Change-Id: I20247f18f27d668e38c6dbf6e79ce184d3641298
Android Build Merger (Role) [Wed, 7 Feb 2018 23:23:06 +0000 (23:23 +0000)]
[automerger] Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into mnc-dr-dev am:
0153ac9dad am:
523fed0deb am:
04e84bb0ec
Change-Id: I3cb0275cf475b0551dec3b9e4fbc6301756fb15d
Android Build Merger (Role) [Wed, 7 Feb 2018 23:23:01 +0000 (23:23 +0000)]
[automerger] Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into mnc-dr-dev am:
0153ac9dad am:
523fed0deb
Change-Id: I4e69906486cfec4c4db7cbb119df1d55aec55675
Etan Cohen [Wed, 7 Feb 2018 23:22:41 +0000 (23:22 +0000)]
Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into mnc-dr-dev
am:
0153ac9dad
Change-Id: I2a07841e7cd27f2ba7c30f9b2df5ddf1afcc6ef5
Android Build Merger (Role) [Wed, 7 Feb 2018 23:22:14 +0000 (23:22 +0000)]
[automerger] Merge "[RTT] ParcelableRttResults parcel code fix" into mnc-dev am:
e137462b2c am:
15754b34be am:
c3fc912374 am:
0c37ab30a1 am:
def8c23fb5
Change-Id: I8732629d97566fe507b87e333dc2a7ce562c7b38
Android Build Merger (Role) [Wed, 7 Feb 2018 23:21:59 +0000 (23:21 +0000)]
[automerger] Merge "[RTT] ParcelableRttResults parcel code fix" into mnc-dev am:
e137462b2c am:
15754b34be am:
c3fc912374 am:
0c37ab30a1
Change-Id: I5d1adb5f7d6d5eb3ba584033453bf4766b5fd300
Android Build Merger (Role) [Wed, 7 Feb 2018 23:21:52 +0000 (23:21 +0000)]
[automerger] Merge "[RTT] ParcelableRttResults parcel code fix" into mnc-dev am:
e137462b2c am:
15754b34be am:
c3fc912374
Change-Id: I9a94eac5fa1b832b4334e08676b2be7a032c3efc
Android Build Merger (Role) [Wed, 7 Feb 2018 23:21:42 +0000 (23:21 +0000)]
[automerger] Merge "[RTT] ParcelableRttResults parcel code fix" into mnc-dev am:
e137462b2c am:
15754b34be
Change-Id: Idfec393662af2392aba6949d7ffcad720b4d4eb6
Etan Cohen [Wed, 7 Feb 2018 23:21:17 +0000 (23:21 +0000)]
Merge "[RTT] ParcelableRttResults parcel code fix" into mnc-dev
am:
e137462b2c
Change-Id: I4132c2ccfc0db161c6a89a6c62fb276f0874d39b
Etan Cohen [Wed, 7 Feb 2018 22:41:26 +0000 (22:41 +0000)]
Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into nyc-dr1-dev
* changes:
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c am:
5f4d9350f4 am:
8d2d052b61 am:
af9f48b7e8 am:
ee65cf4766
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c am:
5f4d9350f4 am:
8d2d052b61 am:
af9f48b7e8
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c am:
5f4d9350f4 am:
8d2d052b61
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c am:
5f4d9350f4
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c
[RTT] ParcelableRttResults parcel code fix
Etan Cohen [Wed, 7 Feb 2018 22:41:26 +0000 (22:41 +0000)]
Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into nyc-dev
* changes:
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c am:
5f4d9350f4 am:
8d2d052b61 am:
af9f48b7e8
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c am:
5f4d9350f4 am:
8d2d052b61
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c am:
5f4d9350f4
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c
[RTT] ParcelableRttResults parcel code fix
Etan Cohen [Wed, 7 Feb 2018 22:41:26 +0000 (22:41 +0000)]
Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into mnc-dr1.5-dev
* changes:
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c am:
5f4d9350f4 am:
8d2d052b61
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c am:
5f4d9350f4
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c
[RTT] ParcelableRttResults parcel code fix
Etan Cohen [Wed, 7 Feb 2018 22:41:26 +0000 (22:41 +0000)]
Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into cw-e-dev
* changes:
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c am:
5f4d9350f4
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c
[RTT] ParcelableRttResults parcel code fix
Etan Cohen [Wed, 7 Feb 2018 22:41:26 +0000 (22:41 +0000)]
Merge changes from topic "am-
8cd2288f-c3e9-422f-8fde-
02d5b6100d12" into mnc-dr-dev
* changes:
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c
[RTT] ParcelableRttResults parcel code fix
Etan Cohen [Wed, 7 Feb 2018 22:41:26 +0000 (22:41 +0000)]
Merge "[RTT] ParcelableRttResults parcel code fix" into mnc-dev
Android Build Merger (Role) [Wed, 7 Feb 2018 08:18:37 +0000 (08:18 +0000)]
[automerger] Fix VerifyCredentialResponse parcelling code am:
54813e9888 am:
0231bc4d6d am:
83cb35453f am:
4405b0ced2 am:
b3012285e2
Change-Id: I76a950ed4296cad67230c36ee9edc0b7cc905c60
Android Build Merger (Role) [Wed, 7 Feb 2018 08:18:22 +0000 (08:18 +0000)]
[automerger] Fix VerifyCredentialResponse parcelling code am:
54813e9888 am:
0231bc4d6d am:
83cb35453f am:
4405b0ced2
Change-Id: I7c984a83858ee5bb0b84d122dac27e0273f0a177
Android Build Merger (Role) [Wed, 7 Feb 2018 08:18:15 +0000 (08:18 +0000)]
[automerger] Fix VerifyCredentialResponse parcelling code am:
54813e9888 am:
0231bc4d6d am:
83cb35453f
Change-Id: Ib6d585953a35d3d00ab51144af7639c851ac3d72
Android Build Merger (Role) [Wed, 7 Feb 2018 08:18:09 +0000 (08:18 +0000)]
[automerger] Fix VerifyCredentialResponse parcelling code am:
54813e9888 am:
0231bc4d6d
Change-Id: I060b6306f3f53b4497b6a19d7221aa1938e66f55
Android Build Merger (Role) [Wed, 7 Feb 2018 08:18:02 +0000 (08:18 +0000)]
[automerger] Fix VerifyCredentialResponse parcelling code am:
54813e9888
Change-Id: Ib1b60818cddeefe3031cf6c9880f5b790775aa62
Rubin Xu [Wed, 7 Feb 2018 08:10:08 +0000 (08:10 +0000)]
Fix VerifyCredentialResponse parcelling code
There was an asymmetry between parcelling and unparcelling of
VerifyCredentialResponse that could lead to type confusion if
packed with other objects in a Parcel.
Test: none
Bug:
71714464
Change-Id: Icff68879e249422ccca49f2bb7db85c35b4cb353
Android Build Merger (Role) [Fri, 2 Feb 2018 18:16:25 +0000 (18:16 +0000)]
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c am:
5f4d9350f4 am:
8d2d052b61 am:
af9f48b7e8 am:
ee65cf4766
Change-Id: I15d12616e80cfd1b4d03a76ef1030fa2003a83d2
Android Build Merger (Role) [Fri, 2 Feb 2018 18:16:12 +0000 (18:16 +0000)]
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c am:
5f4d9350f4 am:
8d2d052b61 am:
af9f48b7e8
Change-Id: I5a6d8519fc77c96d2df7afc58c1d45af57250e8b
Android Build Merger (Role) [Fri, 2 Feb 2018 18:16:07 +0000 (18:16 +0000)]
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c am:
5f4d9350f4 am:
8d2d052b61
Change-Id: I2be402278897c6d97207672f8bfc5af8cbc6dc6d
Android Build Merger (Role) [Fri, 2 Feb 2018 18:16:00 +0000 (18:16 +0000)]
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c am:
5f4d9350f4
Change-Id: I371f3a2967a5a7a826bca94637a78b7dae7c2cd8
Android Build Merger (Role) [Fri, 2 Feb 2018 18:15:53 +0000 (18:15 +0000)]
[automerger] [RTT] ParcelableRttResults parcel code fix am:
e1e5a2409c
Change-Id: I46bbee504ea7a64d39b98a2a8336b3bcf593869a
Etan Cohen [Fri, 2 Feb 2018 16:07:20 +0000 (08:07 -0800)]
[RTT] ParcelableRttResults parcel code fix
ParcelableRttResults was unparceled incorrectly.
Bug:
70398564
Test: exploit provided in bug no longer works
Change-Id: Ifd6de547e9861bbebc399b43d0cc2899a8160813
Android Build Merger (Role) [Thu, 1 Feb 2018 14:14:40 +0000 (14:14 +0000)]
[automerger] Merge "Adjust URI host parsing to stop on \ character." into lmp-mr1-dev am:
5ed5d15e66 am:
8a0c7fd99e am:
c1cb058249 am:
2c70774e72 am:
3ec9cb8d3a am:
2876452814
Change-Id: I1b8b8bdfd800c6bed1a8c3e69ef9ba81b9fe2bf2
Android Build Merger (Role) [Thu, 1 Feb 2018 14:14:27 +0000 (14:14 +0000)]
[automerger] Merge "Adjust URI host parsing to stop on \ character." into lmp-mr1-dev am:
5ed5d15e66 am:
8a0c7fd99e am:
c1cb058249 am:
2c70774e72 am:
3ec9cb8d3a
Change-Id: I964d1b8a03e24cc51b8c385d2a04c4a6a338aa36
Android Build Merger (Role) [Thu, 1 Feb 2018 14:14:22 +0000 (14:14 +0000)]
[automerger] Merge "Adjust URI host parsing to stop on \ character." into lmp-mr1-dev am:
5ed5d15e66 am:
8a0c7fd99e am:
c1cb058249 am:
2c70774e72
Change-Id: I982742b65d3ae6941b274c147d09ce6f50533c1e
Android Build Merger (Role) [Thu, 1 Feb 2018 14:14:17 +0000 (14:14 +0000)]
[automerger] Merge "Adjust URI host parsing to stop on \ character." into lmp-mr1-dev am:
5ed5d15e66 am:
8a0c7fd99e am:
c1cb058249
Change-Id: I1ea542611301d0c4359021303b05a5e59ee1185b
Android Build Merger (Role) [Thu, 1 Feb 2018 14:14:11 +0000 (14:14 +0000)]
[automerger] Merge "Adjust URI host parsing to stop on \ character." into lmp-mr1-dev am:
5ed5d15e66 am:
8a0c7fd99e
Change-Id: If53ecf0654e883fa43e2f543561f0f7994763698
Adam Vartanian [Thu, 1 Feb 2018 14:13:34 +0000 (14:13 +0000)]
Merge "Adjust URI host parsing to stop on \ character." into lmp-mr1-dev
am:
5ed5d15e66
Change-Id: I7eb106b0db3ab568a7d8845ddd2025d80eeced3c
Android Build Merger (Role) [Thu, 1 Feb 2018 14:06:34 +0000 (14:06 +0000)]
[automerger] Merge changes from topic "am-
f1eb5cc5-7ac1-4540-b9cf-
e0577f9334e7" into mnc-dr-dev am:
fea4158eea am:
8fbe4e673f am:
3534bc9786 am:
4021c84e85
Change-Id: Ib248b06c7d6a3c90020e43e04554af39918be955
Android Build Merger (Role) [Thu, 1 Feb 2018 14:06:20 +0000 (14:06 +0000)]
[automerger] Merge changes from topic "am-
f1eb5cc5-7ac1-4540-b9cf-
e0577f9334e7" into mnc-dr-dev am:
fea4158eea am:
8fbe4e673f am:
3534bc9786
Change-Id: I3649d3b8bfa880ac44c88f5f6672b94877345911
Android Build Merger (Role) [Thu, 1 Feb 2018 14:06:15 +0000 (14:06 +0000)]
[automerger] Merge changes from topic "am-
f1eb5cc5-7ac1-4540-b9cf-
e0577f9334e7" into mnc-dr-dev am:
fea4158eea am:
8fbe4e673f
Change-Id: Ifd6fc978fb4544f7f4c9fe99599d472c10b071ac
Adam Vartanian [Thu, 1 Feb 2018 14:05:44 +0000 (14:05 +0000)]
Merge changes from topic "am-
f1eb5cc5-7ac1-4540-b9cf-
e0577f9334e7" into mnc-dr-dev
am:
fea4158eea
Change-Id: Iea20c91a29115634c2241f535c4a0c489605798f
Adam Vartanian [Thu, 1 Feb 2018 10:02:43 +0000 (10:02 +0000)]
Merge changes from topic "am-
f1eb5cc5-7ac1-4540-b9cf-
e0577f9334e7" into mnc-dr-dev
* changes:
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7
Adjust URI host parsing to stop on \ character.
Adam Vartanian [Thu, 1 Feb 2018 10:02:43 +0000 (10:02 +0000)]
Merge changes from topic "am-
f1eb5cc5-7ac1-4540-b9cf-
e0577f9334e7" into mnc-dev
* changes:
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7
Adjust URI host parsing to stop on \ character.
Adam Vartanian [Thu, 1 Feb 2018 10:02:43 +0000 (10:02 +0000)]
Merge changes from topic "am-
f1eb5cc5-7ac1-4540-b9cf-
e0577f9334e7" into nyc-dr1-dev
* changes:
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2 am:
d3c0db66b9 am:
373cfa75c0 am:
bdff04aba3
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2 am:
d3c0db66b9 am:
373cfa75c0
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2 am:
d3c0db66b9
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7
Adjust URI host parsing to stop on \ character.
Adam Vartanian [Thu, 1 Feb 2018 10:02:43 +0000 (10:02 +0000)]
Merge changes from topic "am-
f1eb5cc5-7ac1-4540-b9cf-
e0577f9334e7" into mnc-dr1.5-dev
* changes:
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2 am:
d3c0db66b9
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7
Adjust URI host parsing to stop on \ character.
Adam Vartanian [Thu, 1 Feb 2018 10:02:42 +0000 (10:02 +0000)]
Merge "Adjust URI host parsing to stop on \ character." into lmp-mr1-dev
Adam Vartanian [Thu, 1 Feb 2018 10:02:42 +0000 (10:02 +0000)]
Merge changes from topic "am-
f1eb5cc5-7ac1-4540-b9cf-
e0577f9334e7" into nyc-dev
* changes:
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2 am:
d3c0db66b9 am:
373cfa75c0
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2 am:
d3c0db66b9
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7
Adjust URI host parsing to stop on \ character.
Adam Vartanian [Thu, 1 Feb 2018 10:02:42 +0000 (10:02 +0000)]
Merge changes from topic "am-
f1eb5cc5-7ac1-4540-b9cf-
e0577f9334e7" into cw-e-dev
* changes:
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7
Adjust URI host parsing to stop on \ character.
Android Build Merger (Role) [Wed, 31 Jan 2018 11:20:41 +0000 (11:20 +0000)]
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2 am:
d3c0db66b9 am:
373cfa75c0 am:
bdff04aba3
Change-Id: Ieddabe1b12f34bd7632ce893ef4e0c298f5c44df
Android Build Merger (Role) [Wed, 31 Jan 2018 11:20:28 +0000 (11:20 +0000)]
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2 am:
d3c0db66b9 am:
373cfa75c0
Change-Id: Ia7b1157fb7f2066e26dc82ec703f39cd9fa69fd7
Android Build Merger (Role) [Wed, 31 Jan 2018 11:20:21 +0000 (11:20 +0000)]
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2 am:
d3c0db66b9
Change-Id: If07298bb4ecf8a55391a014568a3ea264358b0e9
Android Build Merger (Role) [Wed, 31 Jan 2018 11:20:15 +0000 (11:20 +0000)]
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137 am:
fddbf1b6b2
Change-Id: I3fd20a3ee5eaa6be1c1989f13d40aed34136557e
Android Build Merger (Role) [Wed, 31 Jan 2018 11:20:08 +0000 (11:20 +0000)]
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7 am:
97668ae137
Change-Id: Ic336b5fafebabdd4a5ad4d775a96d76739189a09
Android Build Merger (Role) [Wed, 31 Jan 2018 11:19:56 +0000 (11:19 +0000)]
[automerger] Adjust URI host parsing to stop on \ character. am:
fa3afbd0e7
Change-Id: I20336a5786e753e6941b9a784068480475415110
Adam Vartanian [Wed, 31 Jan 2018 11:05:10 +0000 (11:05 +0000)]
Adjust URI host parsing to stop on \ character.
The WHATWG URL parsing algorithm [1] used by browsers says that for
"special" URL schemes (which is basically all commonly-used
hierarchical schemes, including http, https, ftp, and file), the host
portion ends if a \ character is seen, whereas this class previously
continued to consider characters part of the hostname. This meant
that a malicious URL could be seen as having a "safe" host when viewed
by an app but navigate to a different host when passed to a browser.
[1] https://url.spec.whatwg.org/#host-state
Bug:
71360761
Test: vogar frameworks/base/core/tests/coretests/src/android/net/UriTest.java (on NYC branch)
Test: cts -m CtsNetTestCases (on NYC branch)
Change-Id: Id53f7054d1be8d59bbcc7e219159e59a2425106e
Android Build Merger (Role) [Wed, 17 Jan 2018 22:20:41 +0000 (22:20 +0000)]
[automerger] Check for null-terminator in ResStringPool::string8At am:
5ec65ae909 am:
c3d7250b99 am:
e2417e6682 am:
0ab4540c41 am:
a3f0976937 am:
166aa6e149
Change-Id: I7d51ce90a1c1075e72dbdf6d1436c4ff22e4f85b
Android Build Merger (Role) [Wed, 17 Jan 2018 22:20:29 +0000 (22:20 +0000)]
[automerger] Check for null-terminator in ResStringPool::string8At am:
5ec65ae909 am:
c3d7250b99 am:
e2417e6682 am:
0ab4540c41 am:
a3f0976937
Change-Id: If96dfd76092dc107e75fbc213346eba2cbc0a0c1
Android Build Merger (Role) [Wed, 17 Jan 2018 22:20:24 +0000 (22:20 +0000)]
[automerger] Check for null-terminator in ResStringPool::string8At am:
5ec65ae909 am:
c3d7250b99 am:
e2417e6682 am:
0ab4540c41
Change-Id: I4861f114af1061df6280a8adfd10839c67ddbdf3
Android Build Merger (Role) [Wed, 17 Jan 2018 22:20:19 +0000 (22:20 +0000)]
[automerger] Check for null-terminator in ResStringPool::string8At am:
5ec65ae909 am:
c3d7250b99 am:
e2417e6682
Change-Id: Ief72a1c4868ab7433e4d3d4d99cbdc30954d6695
Android Build Merger (Role) [Wed, 17 Jan 2018 22:20:14 +0000 (22:20 +0000)]
[automerger] Check for null-terminator in ResStringPool::string8At am:
5ec65ae909 am:
c3d7250b99
Change-Id: I43a4eb54f67bd3dbcffd0432c3988b0377463fff
Android Build Merger (Role) [Wed, 17 Jan 2018 22:20:03 +0000 (22:20 +0000)]
[automerger] Check for null-terminator in ResStringPool::string8At am:
5ec65ae909
Change-Id: I1ea52e1ccd7bf5467438e3dc2e670cf8f325c629
Adam Lesinski [Fri, 10 Nov 2017 01:12:17 +0000 (17:12 -0800)]
Check for null-terminator in ResStringPool::string8At
All other stringAt methods check for null termination. Be consistent
so that upper levels don't end up with huge corrupt strings.
Bug:
62537081
Test: none
Change-Id: I17bdfb0c1e34507b66c6cad651bbdb12c5d4c417
(cherry picked from commit
3d35a0ea307693a97583a61973e729a5e7db2687)
(cherry picked from commit
97f8cb01149b35b1832c7f9efe85ff19edf1083e)
Adam Vartanian [Tue, 7 Nov 2017 22:12:09 +0000 (22:12 +0000)]
Adjust Uri host parsing to use last instead of first @. am:
cd6228dd37 am:
6a9c7c4814 am:
4158c9fbf3 am:
eee677386e am:
49e5fca362 am:
240b55de2c
am:
3ac5dabc21
Change-Id: I43fbad45f90ec2d1fb48fecbd2d73a05f39730a9
Adam Vartanian [Tue, 7 Nov 2017 21:56:10 +0000 (21:56 +0000)]
Adjust Uri host parsing to use last instead of first @. am:
cd6228dd37 am:
6a9c7c4814 am:
4158c9fbf3 am:
eee677386e am:
49e5fca362
am:
240b55de2c
Change-Id: Ie3d378e8d9aeaff6f45838ebe988a5799f6acf3b
Adam Vartanian [Tue, 7 Nov 2017 21:41:55 +0000 (21:41 +0000)]
Adjust Uri host parsing to use last instead of first @. am:
cd6228dd37 am:
6a9c7c4814 am:
4158c9fbf3 am:
eee677386e
am:
49e5fca362
Change-Id: Id6f38542623d768bebcfae7e79e8e49450329037
Adam Vartanian [Tue, 7 Nov 2017 21:29:27 +0000 (21:29 +0000)]
Adjust Uri host parsing to use last instead of first @. am:
cd6228dd37 am:
6a9c7c4814 am:
4158c9fbf3
am:
eee677386e
Change-Id: Ifd94d94c5376a6b4f1174aa7c2c8bb6d40199d89
Adam Vartanian [Tue, 7 Nov 2017 21:02:07 +0000 (21:02 +0000)]
Adjust Uri host parsing to use last instead of first @. am:
cd6228dd37 am:
6a9c7c4814
am:
4158c9fbf3
Change-Id: I61bc0f5471d8f7a9a59136f320d465f2ee81b518
Adam Vartanian [Tue, 7 Nov 2017 20:51:02 +0000 (20:51 +0000)]
Adjust Uri host parsing to use last instead of first @. am:
cd6228dd37
am:
6a9c7c4814
Change-Id: I80bedf58833511d336839df9f17daf65cfebfacf
Adam Vartanian [Tue, 7 Nov 2017 20:41:28 +0000 (20:41 +0000)]
Adjust Uri host parsing to use last instead of first @.
am:
cd6228dd37
Change-Id: I5db66a5a2073acaffe0560999c914a78df362c51
Adam Vartanian [Tue, 7 Nov 2017 12:22:23 +0000 (12:22 +0000)]
Adjust Uri host parsing to use last instead of first @.
Malformed authority segments can currently cause the parser to produce
a hostname that doesn't match the hostname produced by the WHATWG URL
parsing algorithm* used by browsers, which means that a URL could be seen
as having a "safe" host when checked by an Android app but actually visit
a different host when passed to a browser. The WHATWG URL parsing
algorithm always produces a hostname based on the last @ in the authority
segment, so we do the same.
* https://url.spec.whatwg.org/#authority-state resets the "buffer", which
is being used to build up the host name, each time an @ is found, so it
has the effect of using the content between the final @ and the end
of the authority section as the hostname.
Bug:
68341964
Test: vogar android.net.UriTest (on NYC branch)
Test: cts -m CtsNetTestCases (on NYC branch)
Change-Id: Idca79f35a886de042c94d6ab66787c2e98ac8376
Siyamed Sinir [Tue, 31 Oct 2017 17:05:15 +0000 (17:05 +0000)]
Merge "Use calling user ID when calling isDeviceLocked" into mnc-dev am:
a0c253d07a am:
c275b77b03 am:
1f8536653b am:
bc56010856
am:
eeb90235bf
Change-Id: I3125788140ad50b492d4f361b77db1d187f7c952
Siyamed Sinir [Tue, 31 Oct 2017 16:53:16 +0000 (16:53 +0000)]
Merge "Use calling user ID when calling isDeviceLocked" into mnc-dev am:
a0c253d07a am:
c275b77b03 am:
1f8536653b
am:
bc56010856
Change-Id: I2e2cc32e794f498843e6d6f468fdc6e9f8fc5026
Siyamed Sinir [Tue, 31 Oct 2017 16:42:29 +0000 (16:42 +0000)]
Merge "Use calling user ID when calling isDeviceLocked" into mnc-dev am:
a0c253d07a am:
c275b77b03
am:
1f8536653b
Change-Id: Idbf65d9e9db40c7dfa2456f3e807890c88dcbb3d
Siyamed Sinir [Tue, 31 Oct 2017 16:34:29 +0000 (16:34 +0000)]
Merge "Use calling user ID when calling isDeviceLocked" into mnc-dev am:
a0c253d07a
am:
c275b77b03
Change-Id: Ia2887869c4ac6cdcd1a66372b991b9f78edf7679
Siyamed Sinir [Tue, 31 Oct 2017 16:25:26 +0000 (16:25 +0000)]
Merge "Use calling user ID when calling isDeviceLocked" into mnc-dev
am:
a0c253d07a
Change-Id: I9040d5dcde6228ea3f10bc03077800d2b070cbb1
Siyamed Sinir [Tue, 31 Oct 2017 16:17:06 +0000 (16:17 +0000)]
Merge "Use calling user ID when calling isDeviceLocked" into mnc-dev
Chong Zhang [Mon, 30 Oct 2017 23:00:59 +0000 (23:00 +0000)]
Merge "mtp: fix double free of thumbnail data" into nyc-dev
am:
914bc14e82
Change-Id: I9f8e2264e93590de4179ee5c6ab30c7509e775f5
Chong Zhang [Mon, 30 Oct 2017 22:46:40 +0000 (22:46 +0000)]
Merge "mtp: fix double free of thumbnail data" into nyc-dev
OSDN Git Service
