OSDN Git Service
Bill Yi [Fri, 20 Oct 2017 16:24:41 +0000 (16:24 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am:
639ee5c778 -s ours am:
a8c5964576 -s ours
am:
61632b84b6 -s ours
Change-Id: Ia891428b4b5b8c8269b793f85bf67f635f87579c
Bill Yi [Fri, 20 Oct 2017 16:18:25 +0000 (16:18 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am:
422b17438b -s ours am:
49cc0fd2f8 -s ours
am:
5ac591340c -s ours
Change-Id: I2ccca27ed7794200d17ef939493e1042c09514d7
Bill Yi [Fri, 20 Oct 2017 16:11:51 +0000 (16:11 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am:
639ee5c778 -s ours
am:
a8c5964576 -s ours
Change-Id: Ia2ddb89614a8fadf9f91276f883fbd09f44b2066
Bill Yi [Fri, 20 Oct 2017 16:04:33 +0000 (16:04 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am:
422b17438b -s ours
am:
49cc0fd2f8 -s ours
Change-Id: If6132f679d6bd5aa37a1e4645c4494523babda6f
Bill Yi [Fri, 20 Oct 2017 15:58:55 +0000 (15:58 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am:
5fdf106b8b -s ours am:
b823588836 -s ours
am:
e3f60e7f70 -s ours
Change-Id: Ib929a40568f54d28e710d8e71a5fd1f0c0da83ba
Bill Yi [Fri, 20 Oct 2017 15:55:28 +0000 (15:55 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am:
c035f28175 -s ours am:
770e4008b2 -s ours
am:
ae6151ecef -s ours
Change-Id: Ie45ce84c781af3e97cc80df0ff81365eb34470a1
Bill Yi [Fri, 20 Oct 2017 15:50:09 +0000 (15:50 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am:
5fdf106b8b -s ours
am:
b823588836 -s ours
Change-Id: Ifa87ae57ef423c5ff56e2c59a28ff9fecee549c8
Bill Yi [Fri, 20 Oct 2017 15:48:36 +0000 (15:48 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am:
639ee5c778 -s ours
Change-Id: Ic0ebba84ca5dfedd88b08c334de5e31de5cedc20
Bill Yi [Fri, 20 Oct 2017 15:46:36 +0000 (15:46 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am:
c035f28175 -s ours
am:
770e4008b2 -s ours
Change-Id: I65c915a26923287d6097a374d48f7d34a892f992
Bill Yi [Fri, 20 Oct 2017 15:45:40 +0000 (15:45 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am:
422b17438b -s ours
Change-Id: Icdd126fb90cdce54c2bf44e1ef924c8ea19951f0
Ben Schwartz [Fri, 20 Oct 2017 15:45:24 +0000 (15:45 +0000)]
Merge "Add a global setting to disable DNS over TLS" am:
4a906c167b am:
3017ebec8c am:
b84582fc96
am:
7e7c472d9a
Change-Id: I0c066afaa0d6d776cac08cbc7bd97dbf5b29a8be
Bill Yi [Fri, 20 Oct 2017 15:40:21 +0000 (15:40 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am:
5fdf106b8b -s ours
Change-Id: I6da8e75d0ac5544d6524f8a180bc302896f5a93f
Bill Yi [Fri, 20 Oct 2017 15:35:36 +0000 (15:35 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am:
c035f28175 -s ours
Change-Id: Id153ec0566031b928d5087c04b03616141ab0568
Ben Schwartz [Fri, 20 Oct 2017 15:33:17 +0000 (15:33 +0000)]
Merge "Add a global setting to disable DNS over TLS" am:
4a906c167b am:
3017ebec8c
am:
b84582fc96
Change-Id: Ia64a8318ad2f57aa3dc58a13d20274b877649fef
TreeHugger Robot [Fri, 20 Oct 2017 15:29:19 +0000 (15:29 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Fri, 20 Oct 2017 15:28:04 +0000 (15:28 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Fri, 20 Oct 2017 15:27:19 +0000 (15:27 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Fri, 20 Oct 2017 15:23:26 +0000 (15:23 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Nick Kralevich [Fri, 20 Oct 2017 15:20:34 +0000 (15:20 +0000)]
Merge "more O_CLOEXEC" am:
9f8ed6500a am:
7c27266544 am:
db61fce852
am:
b8ba9d0236
Change-Id: Idc4c10296fd8887016326bb45764a5ab5feb07a5
Ben Schwartz [Fri, 20 Oct 2017 15:18:38 +0000 (15:18 +0000)]
Merge "Add a global setting to disable DNS over TLS" am:
4a906c167b
am:
3017ebec8c
Change-Id: I94c2f2011bbe29e3d8a39904d19d2b5c606ae0be
Nick Kralevich [Fri, 20 Oct 2017 15:11:42 +0000 (15:11 +0000)]
Merge "more O_CLOEXEC" am:
9f8ed6500a am:
7c27266544
am:
db61fce852
Change-Id: I9b53dd6984a3ae3e89b8279551367ac97e8ed7fa
Ben Schwartz [Fri, 20 Oct 2017 15:08:55 +0000 (15:08 +0000)]
Merge "Add a global setting to disable DNS over TLS"
am:
4a906c167b
Change-Id: Ie0f5586342b32c9e7c745ab9697b44158a920233
Nick Kralevich [Fri, 20 Oct 2017 15:02:21 +0000 (15:02 +0000)]
Merge "more O_CLOEXEC" am:
9f8ed6500a
am:
7c27266544
Change-Id: I1b2c3f06bf02e2170f3ffa70d10d37d45da1a0c4
Treehugger Robot [Fri, 20 Oct 2017 14:58:39 +0000 (14:58 +0000)]
Merge "Add a global setting to disable DNS over TLS"
Nick Kralevich [Fri, 20 Oct 2017 14:53:14 +0000 (14:53 +0000)]
Merge "more O_CLOEXEC"
am:
9f8ed6500a
Change-Id: I7d07ad29cddeac5f44cc5a918e33b0a9068d29c0
Treehugger Robot [Fri, 20 Oct 2017 14:44:26 +0000 (14:44 +0000)]
Merge "more O_CLOEXEC"
Bill Yi [Fri, 20 Oct 2017 09:23:10 +0000 (02:23 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
68003463
Change-Id: I54b9c45224a393b5724a8964858817e3247ece54
Bill Yi [Fri, 20 Oct 2017 09:06:39 +0000 (02:06 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
68003463
Change-Id: I1786cdac7dae8737ba1f7ea7665a62dfcfc2d7f2
Niranjan Pendharkar [Fri, 20 Oct 2017 08:53:29 +0000 (08:53 +0000)]
Merge "Fix netlink group mismatch in fds used for offload" am:
fb7c0e8c91 am:
6d36b2657f am:
9c2576fa9b
am:
5e917d7d79
Change-Id: I96d6d5601aff009879f452975be91b6e7e40bb57
Niranjan Pendharkar [Fri, 20 Oct 2017 08:44:05 +0000 (08:44 +0000)]
Merge "Fix netlink group mismatch in fds used for offload" am:
fb7c0e8c91 am:
6d36b2657f
am:
9c2576fa9b
Change-Id: I2dcebec1c08bb7b067621331533d8a65dd7b5083
Niranjan Pendharkar [Fri, 20 Oct 2017 08:35:10 +0000 (08:35 +0000)]
Merge "Fix netlink group mismatch in fds used for offload" am:
fb7c0e8c91
am:
6d36b2657f
Change-Id: I44aef861bdc3e3454127fefd024c84eb44d7301b
Niranjan Pendharkar [Fri, 20 Oct 2017 08:25:19 +0000 (08:25 +0000)]
Merge "Fix netlink group mismatch in fds used for offload"
am:
fb7c0e8c91
Change-Id: Iaca85d6b06dfc642ffce7c53bb87cd25dabe04c9
Treehugger Robot [Fri, 20 Oct 2017 08:14:40 +0000 (08:14 +0000)]
Merge "Fix netlink group mismatch in fds used for offload"
Pengquan Meng [Fri, 20 Oct 2017 06:23:33 +0000 (06:23 +0000)]
Merge "[framework] Fixed signal strength issue" am:
6d98743048 am:
c671962c9a am:
af9207272a
am:
00c9323828
Change-Id: I0e0dcfe8c5cf366a27d64d460328b99be184fcc5
Pengquan Meng [Fri, 20 Oct 2017 06:13:15 +0000 (06:13 +0000)]
Merge "[framework] Fixed signal strength issue" am:
6d98743048 am:
c671962c9a
am:
af9207272a
Change-Id: I86d83b0b51a5a9b73ddd181f4962ac1b9647bb1c
Pengquan Meng [Fri, 20 Oct 2017 06:03:11 +0000 (06:03 +0000)]
Merge "[framework] Fixed signal strength issue" am:
6d98743048
am:
c671962c9a
Change-Id: I3065d74ca69f49b97dd64d015d65260671ecf158
Bill Yi [Fri, 20 Oct 2017 05:58:04 +0000 (22:58 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
68003463
Change-Id: I92ebc3587a83fcb69588e4629eac2d8a779c2ebd
Pengquan Meng [Fri, 20 Oct 2017 05:52:43 +0000 (05:52 +0000)]
Merge "[framework] Fixed signal strength issue"
am:
6d98743048
Change-Id: I5d6ff6f0419b658ee9786567087b95ced5e70233
Bill Yi [Fri, 20 Oct 2017 05:50:47 +0000 (22:50 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
68003463
Change-Id: Ie775264bf5f54adb9239d9a66821164c8db38136
Pengquan Meng [Fri, 20 Oct 2017 05:44:42 +0000 (05:44 +0000)]
Merge "[framework] Fixed signal strength issue"
Niranjan Pendharkar [Wed, 18 Oct 2017 23:58:25 +0000 (16:58 -0700)]
Fix netlink group mismatch in fds used for offload
Existing groups used for binding to netlink conntrack events don't
seem to work as expected. Fix this by using exact groups defined
in IOffloadConfig hal.
Test: as follows
- Compiles and boots on walleye
- Validated conntrack destroy events are received as expected.
- Validated offload works as expected.
Bug:
68018148
CRs-fixed:
2126789
Change-Id: I76178fd7f109b82a4e4961347b8949937813d71d
Steven Moreland [Fri, 20 Oct 2017 04:54:37 +0000 (04:54 +0000)]
Merge "HwBinder: don't re-implement libhidl's getService" am:
992f9e7e0b am:
3147d2f429 am:
cb2bde9c7f
am:
e5f7f43e3a
Change-Id: I9723234007b5da01a81da79a58d778d592a74e8e
TreeHugger Robot [Fri, 20 Oct 2017 04:44:40 +0000 (04:44 +0000)]
Merge changes from topics "rtt_error_codes", "rtt_use_mm"
* changes:
[RTT2] Error code reconfiguration
[RTT2] Ranging results CM -> MM
Steven Moreland [Fri, 20 Oct 2017 04:40:54 +0000 (04:40 +0000)]
Merge "HwBinder: don't re-implement libhidl's getService" am:
992f9e7e0b am:
3147d2f429
am:
cb2bde9c7f
Change-Id: Ia003e53904ffc24cdb8e4d9560236f32ec3d6f7b
Steven Moreland [Fri, 20 Oct 2017 04:32:10 +0000 (04:32 +0000)]
Merge "HwBinder: don't re-implement libhidl's getService" am:
992f9e7e0b
am:
3147d2f429
Change-Id: I588305d25372f4c2465d0e1f3a0610599aea28b7
Steven Moreland [Fri, 20 Oct 2017 04:23:34 +0000 (04:23 +0000)]
Merge "HwBinder: don't re-implement libhidl's getService"
am:
992f9e7e0b
Change-Id: Icd082eca740ea5a9839dffc326c45ed9d4102a10
Treehugger Robot [Fri, 20 Oct 2017 04:12:29 +0000 (04:12 +0000)]
Merge "HwBinder: don't re-implement libhidl's getService"
Erik Kline [Fri, 20 Oct 2017 04:08:39 +0000 (04:08 +0000)]
Merge "Merge changes I3b56e75d,I36255a2c am:
5c7128c070 am:
464d7635b0 am:
ff426ec10c" into oc-mr1-dev-plus-aosp
am:
d6e29fd1cd
Change-Id: Ife0e40a2c73246658bab77e443e1e09922323c67
Jonathan Basseri [Fri, 20 Oct 2017 03:51:33 +0000 (03:51 +0000)]
Merge "DO NOT MERGE Revert "Convert ICarrierService to oneway."" into oc-mr1-dev am:
7bd96d32a1
am:
cb9dc98cb8 -s ours
Change-Id: I7af86235fb7830d4084a8e9e169977c6776fec00
TreeHugger Robot [Fri, 20 Oct 2017 03:45:27 +0000 (03:45 +0000)]
Merge "Allow datasets without presentation to optimize authentication use case."
Android Build Merger (Role) [Fri, 20 Oct 2017 03:37:28 +0000 (03:37 +0000)]
Merge "Merge "Remove "result2" in AccountManagerService" am:
eaf4d18bdf am:
4b4b759272 am:
640a087f91 am:
88e6c96571"
tiansiming [Fri, 20 Oct 2017 03:35:52 +0000 (03:35 +0000)]
Merge "Remove "result2" in AccountManagerService" am:
eaf4d18bdf am:
4b4b759272 am:
640a087f91
am:
88e6c96571
Change-Id: I0d38e1be07166288c521eae08cf075e25bdeb6fb
Android Build Merger (Role) [Fri, 20 Oct 2017 03:30:07 +0000 (03:30 +0000)]
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
ca7ffa06bc -s ours am:
edb6b17ebc -s ours am:
08bd3a75fb am:
9c441159f9 am:
2f8dbe9693 am:
3bb6994a0b -s ours am:
73a4e88df8 am:
832890f6e2 am:
34e4628cfb am:
76d9732106 am:
af70ac2914 -s ours am:
571c8a4507 am:
45829c0c41 am:
9117ad721a am:
0f4e6c4736 -s ours"
Jeff Sharkey [Fri, 20 Oct 2017 03:28:30 +0000 (03:28 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
ca7ffa06bc -s ours am:
edb6b17ebc -s ours am:
08bd3a75fb am:
9c441159f9 am:
2f8dbe9693 am:
3bb6994a0b -s ours am:
73a4e88df8 am:
832890f6e2 am:
34e4628cfb am:
76d9732106 am:
af70ac2914 -s ours am:
571c8a4507 am:
45829c0c41 am:
9117ad721a
am:
0f4e6c4736 -s ours
Change-Id: Ib20c31232a1fb9b1bbefbc1f390c8abf82f713bf
Android Build Merger (Role) [Fri, 20 Oct 2017 03:26:46 +0000 (03:26 +0000)]
Merge "Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
1f2a5d3622 -s ours am:
b52056d549 am:
563ea682e7 am:
901c587c6b am:
1455bd6492 -s ours am:
7f00f14d81 am:
3c30346de2 am:
b049f43f9b am:
1b40397eb0 am:
00183554a9 -s ours am:
61d6dd8185 am:
438ed4369d am:
d59cb81ea9" into oc-mr1-dev-plus-aosp am:
c10c572530 -s ours"
Jeff Sharkey [Fri, 20 Oct 2017 03:24:53 +0000 (03:24 +0000)]
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
1f2a5d3622 -s ours am:
b52056d549 am:
563ea682e7 am:
901c587c6b am:
1455bd6492 -s ours am:
7f00f14d81 am:
3c30346de2 am:
b049f43f9b am:
1b40397eb0 am:
00183554a9 -s ours am:
61d6dd8185 am:
438ed4369d am:
d59cb81ea9" into oc-mr1-dev-plus-aosp
am:
c10c572530 -s ours
Change-Id: I19c8ea20b8a32b4cac1a6ccf70ed56b22c7cb083
Android Build Merger (Role) [Fri, 20 Oct 2017 03:23:20 +0000 (03:23 +0000)]
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
ca7ffa06bc -s ours am:
edb6b17ebc -s ours am:
08bd3a75fb am:
9c441159f9 am:
2f8dbe9693 am:
3bb6994a0b -s ours am:
73a4e88df8 am:
832890f6e2 am:
34e4628cfb am:
76d9732106 am:
af70ac2914 -s ours am:
571c8a4507 am:
45829c0c41 am:
c13982c8a8 am:
a63880c929 -s ours"
Jeff Sharkey [Fri, 20 Oct 2017 03:21:23 +0000 (03:21 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
ca7ffa06bc -s ours am:
edb6b17ebc -s ours am:
08bd3a75fb am:
9c441159f9 am:
2f8dbe9693 am:
3bb6994a0b -s ours am:
73a4e88df8 am:
832890f6e2 am:
34e4628cfb am:
76d9732106 am:
af70ac2914 -s ours am:
571c8a4507 am:
45829c0c41 am:
c13982c8a8
am:
a63880c929 -s ours
Change-Id: I092cf086b993c2368cdb91c9b21a547d8632c7cb
Android Build Merger (Role) [Fri, 20 Oct 2017 03:19:43 +0000 (03:19 +0000)]
Merge "Merge "Fix ClipboardService device lock check for cross profile am:
0595b5a94b am:
9e5a4ed6c3 -s ours am:
1c7cdde2d3 am:
63bb54738d am:
4c7113461f am:
74b3298994 am:
4afdfec2d9 am:
bf5b9d7e8e am:
9f073ee9fd am:
c257b61ec2 am:
21bdeacae7 am:
6ecad744a9 am:
289db3b4f3 am:
bd0619b1c5" into oc-mr1-dev-plus-aosp am:
462128f831"
Siyamed Sinir [Fri, 20 Oct 2017 03:18:00 +0000 (03:18 +0000)]
Merge "Fix ClipboardService device lock check for cross profile am:
0595b5a94b am:
9e5a4ed6c3 -s ours am:
1c7cdde2d3 am:
63bb54738d am:
4c7113461f am:
74b3298994 am:
4afdfec2d9 am:
bf5b9d7e8e am:
9f073ee9fd am:
c257b61ec2 am:
21bdeacae7 am:
6ecad744a9 am:
289db3b4f3 am:
bd0619b1c5" into oc-mr1-dev-plus-aosp
am:
462128f831
Change-Id: I6a4abfac3df78456b588b9b6a4d7e2be96a36d81
TreeHugger Robot [Fri, 20 Oct 2017 03:14:48 +0000 (03:14 +0000)]
Merge "Make new Autofill API concretes, so they don't break support library."
Android Build Merger (Role) [Fri, 20 Oct 2017 03:05:55 +0000 (03:05 +0000)]
Merge "Merge changes I3b56e75d,I36255a2c am:
5c7128c070 am:
464d7635b0 am:
ff426ec10c" into oc-mr1-dev-plus-aosp
Erik Kline [Fri, 20 Oct 2017 03:04:28 +0000 (03:04 +0000)]
Merge changes I3b56e75d,I36255a2c am:
5c7128c070 am:
464d7635b0
am:
ff426ec10c
Change-Id: I70dd6de78fc7bbec28196283c9b0227d718f1baf
Jonathan Basseri [Fri, 20 Oct 2017 03:01:14 +0000 (03:01 +0000)]
Merge "DO NOT MERGE Revert "Convert ICarrierService to oneway."" into oc-mr1-dev
am:
7bd96d32a1
Change-Id: I0566980aa480c50fa785465b08a40ba40d6c7520
Jeff Sharkey [Fri, 20 Oct 2017 02:54:29 +0000 (02:54 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
1f2a5d3622 -s ours am:
b52056d549 am:
563ea682e7 am:
901c587c6b am:
1455bd6492 -s ours am:
7f00f14d81 am:
3c30346de2 am:
b049f43f9b am:
1b40397eb0 am:
00183554a9 -s ours am:
61d6dd8185 am:
438ed4369d am:
74552f1b98
am:
6eeabc69e4 -s ours
Change-Id: Ib4461b654f15d2a44e6359530041060aa3d6d7d3
Erik Kline [Fri, 20 Oct 2017 02:54:08 +0000 (02:54 +0000)]
Merge changes I3b56e75d,I36255a2c am:
5c7128c070
am:
464d7635b0
Change-Id: I691118a7806cbd557b0f490f21bfaadc6d0aaf1d
Jonathan Basseri [Fri, 20 Oct 2017 02:50:35 +0000 (02:50 +0000)]
Merge "DO NOT MERGE Revert "Convert ICarrierService to oneway."" into oc-mr1-dev
Siyamed Sinir [Fri, 20 Oct 2017 02:49:46 +0000 (02:49 +0000)]
Fix ClipboardService device lock check for cross profile am:
0595b5a94b am:
9e5a4ed6c3 -s ours am:
1c7cdde2d3 am:
63bb54738d am:
4c7113461f am:
74b3298994 am:
4afdfec2d9 am:
bf5b9d7e8e am:
9f073ee9fd am:
c257b61ec2 am:
21bdeacae7 am:
6ecad744a9 am:
289db3b4f3 am:
cd30a463c6
am:
dd77a3da32
Change-Id: I559b381611367bd577b6206d16ded798a6a22abc
Erik Kline [Fri, 20 Oct 2017 02:45:14 +0000 (02:45 +0000)]
Merge changes I3b56e75d,I36255a2c
am:
5c7128c070
Change-Id: I8ab4bfa6a069d24b89a6595dbc9ffd5d6dd816ec
tiansiming [Fri, 20 Oct 2017 02:39:59 +0000 (02:39 +0000)]
Merge "Remove "result2" in AccountManagerService" am:
eaf4d18bdf am:
4b4b759272
am:
640a087f91
Change-Id: I89f76114c37fe63556c0813cb860ba01366c98c9
Jeff Sharkey [Fri, 20 Oct 2017 02:33:30 +0000 (02:33 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
ca7ffa06bc -s ours am:
edb6b17ebc -s ours am:
08bd3a75fb am:
9c441159f9 am:
2f8dbe9693 am:
3bb6994a0b -s ours am:
73a4e88df8 am:
832890f6e2 am:
34e4628cfb am:
76d9732106 am:
af70ac2914 -s ours am:
571c8a4507 am:
45829c0c41
am:
9117ad721a
Change-Id: I7a6dea5fc296207e66e7b7bab39d8c9ca1852e0a
Treehugger Robot [Fri, 20 Oct 2017 02:29:41 +0000 (02:29 +0000)]
Merge changes I3b56e75d,I36255a2c
* changes:
Skeletal IpManager proxying to the new IpClient
Rename IpManager to IpClient
Etan Cohen [Fri, 20 Oct 2017 02:28:31 +0000 (02:28 +0000)]
Merge changes from topics "rtt_access_point_api_name", "rtt_aware"
* changes:
[RTT2] Rename API Ap -> AccessPoint, timestamp
[RTT2] Add support for RTT to Wi-Fi Aware peers
Android Build Merger (Role) [Fri, 20 Oct 2017 02:21:16 +0000 (02:21 +0000)]
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
1f2a5d3622 -s ours am:
b52056d549 am:
563ea682e7 am:
901c587c6b am:
1455bd6492 -s ours am:
7f00f14d81 am:
3c30346de2 am:
b049f43f9b am:
1b40397eb0 am:
00183554a9 -s ours am:
61d6dd8185 am:
438ed4369d am:
d59cb81ea9" into oc-mr1-dev-plus-aosp
Jeff Sharkey [Fri, 20 Oct 2017 02:18:47 +0000 (02:18 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
1f2a5d3622 -s ours am:
b52056d549 am:
563ea682e7 am:
901c587c6b am:
1455bd6492 -s ours am:
7f00f14d81 am:
3c30346de2 am:
b049f43f9b am:
1b40397eb0 am:
00183554a9 -s ours am:
61d6dd8185 am:
438ed4369d
am:
d59cb81ea9
Change-Id: I2fdc51fea4a88f7b85e936486b84ca5f4b7a78b7
Jeff Sharkey [Fri, 20 Oct 2017 02:18:38 +0000 (02:18 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
ca7ffa06bc -s ours am:
edb6b17ebc -s ours am:
08bd3a75fb am:
9c441159f9 am:
2f8dbe9693 am:
3bb6994a0b -s ours am:
73a4e88df8 am:
832890f6e2 am:
34e4628cfb am:
76d9732106 am:
af70ac2914 -s ours am:
571c8a4507 am:
45829c0c41
am:
c13982c8a8
Change-Id: I13991881ef03c9ae61662e3f36e4da9e33e35264
Android Build Merger (Role) [Fri, 20 Oct 2017 02:08:38 +0000 (02:08 +0000)]
Merge "Fix ClipboardService device lock check for cross profile am:
0595b5a94b am:
9e5a4ed6c3 -s ours am:
1c7cdde2d3 am:
63bb54738d am:
4c7113461f am:
74b3298994 am:
4afdfec2d9 am:
bf5b9d7e8e am:
9f073ee9fd am:
c257b61ec2 am:
21bdeacae7 am:
6ecad744a9 am:
289db3b4f3 am:
bd0619b1c5" into oc-mr1-dev-plus-aosp
Siyamed Sinir [Fri, 20 Oct 2017 02:07:09 +0000 (02:07 +0000)]
Fix ClipboardService device lock check for cross profile am:
0595b5a94b am:
9e5a4ed6c3 -s ours am:
1c7cdde2d3 am:
63bb54738d am:
4c7113461f am:
74b3298994 am:
4afdfec2d9 am:
bf5b9d7e8e am:
9f073ee9fd am:
c257b61ec2 am:
21bdeacae7 am:
6ecad744a9 am:
289db3b4f3
am:
bd0619b1c5
Change-Id: I139a02d16496fc519817787a3e9af86f60eb4d6b
Jeff Sharkey [Fri, 20 Oct 2017 01:59:35 +0000 (01:59 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
1f2a5d3622 -s ours am:
b52056d549 am:
563ea682e7 am:
901c587c6b am:
1455bd6492 -s ours am:
7f00f14d81 am:
3c30346de2 am:
b049f43f9b am:
1b40397eb0 am:
00183554a9 -s ours am:
61d6dd8185 am:
438ed4369d
am:
74552f1b98
Change-Id: Ia74aa97493e816c84b65303210e29caa63a28f09
tiansiming [Fri, 20 Oct 2017 01:57:20 +0000 (01:57 +0000)]
Merge "Remove "result2" in AccountManagerService" am:
eaf4d18bdf
am:
4b4b759272
Change-Id: I1558ff443ffc28a21e80f5752feb535e08152f07
Jeff Sharkey [Fri, 20 Oct 2017 01:51:28 +0000 (01:51 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
ca7ffa06bc -s ours am:
edb6b17ebc -s ours am:
08bd3a75fb am:
9c441159f9 am:
2f8dbe9693 am:
3bb6994a0b -s ours am:
73a4e88df8 am:
832890f6e2 am:
34e4628cfb am:
76d9732106 am:
af70ac2914 -s ours am:
571c8a4507
am:
45829c0c41
Change-Id: If6545cd5d279f973360f34bc792411407a2b037d
Jeff Sharkey [Fri, 20 Oct 2017 01:48:46 +0000 (01:48 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
ca7ffa06bc -s ours am:
edb6b17ebc -s ours am:
08bd3a75fb am:
9c441159f9 am:
2f8dbe9693 am:
3bb6994a0b -s ours am:
73a4e88df8 am:
832890f6e2 am:
34e4628cfb am:
76d9732106 am:
af70ac2914 -s ours am:
571c8a4507
am:
45829c0c41
Change-Id: I9c80ad1cde980004a625ba7a0df579c7432d14ae
tiansiming [Fri, 20 Oct 2017 01:47:15 +0000 (01:47 +0000)]
Merge "Remove "result2" in AccountManagerService"
am:
eaf4d18bdf
Change-Id: I80c362a0250430f5d8948e4815638eab31d8c2b1
Siyamed Sinir [Fri, 20 Oct 2017 01:42:40 +0000 (01:42 +0000)]
Fix ClipboardService device lock check for cross profile am:
0595b5a94b am:
9e5a4ed6c3 -s ours am:
1c7cdde2d3 am:
63bb54738d am:
4c7113461f am:
74b3298994 am:
4afdfec2d9 am:
bf5b9d7e8e am:
9f073ee9fd am:
c257b61ec2 am:
21bdeacae7 am:
6ecad744a9 am:
289db3b4f3
am:
cd30a463c6
Change-Id: Icdcc49677e3e1fac23a284dbd857a74431dc6b21
Jeff Sharkey [Fri, 20 Oct 2017 01:39:17 +0000 (01:39 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
1f2a5d3622 -s ours am:
b52056d549 am:
563ea682e7 am:
901c587c6b am:
1455bd6492 -s ours am:
7f00f14d81 am:
3c30346de2 am:
b049f43f9b am:
1b40397eb0 am:
00183554a9 -s ours am:
61d6dd8185
am:
438ed4369d
Change-Id: Ia7a5b82bc9d5a674fc268c9b1ffe29c985eb4aff
Beverly Tai [Fri, 20 Oct 2017 01:35:34 +0000 (01:35 +0000)]
Merge "Merge "Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1-dev am:
f2b592726d -s ours am:
dfbaa1fd8b am:
d7ece4da2c am:
06bd19c1fb am:
7b1157a92e -s ours am:
bcdb9079ef am:
5fda53b294 am:
791d8a5b16 am:
4dd01948c1 am:
260ef208ac -s ours am:
b6ecd1f88a am:
f2e1ef2297" into oc-dr1-dev-plus-aosp am:
a6b9a27c35" into oc-mr1-dev-plus-aosp
am:
11a7e42c8e -s ours
Change-Id: I867f4fbe0817122c169b946a8d5c00d662e49ef4
Jeff Sharkey [Fri, 20 Oct 2017 01:33:20 +0000 (01:33 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
1f2a5d3622 -s ours am:
b52056d549 am:
563ea682e7 am:
901c587c6b am:
1455bd6492 -s ours am:
7f00f14d81 am:
3c30346de2 am:
b049f43f9b am:
1b40397eb0 am:
00183554a9 -s ours am:
61d6dd8185
am:
438ed4369d
Change-Id: I467f1f279116602880a6533cadf0dc7721bdfe88
Beverly Tai [Fri, 20 Oct 2017 01:31:54 +0000 (01:31 +0000)]
Merge "Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1-dev am:
f2b592726d -s ours am:
dfbaa1fd8b am:
d7ece4da2c am:
06bd19c1fb am:
7b1157a92e -s ours am:
bcdb9079ef am:
5fda53b294 am:
791d8a5b16 am:
4dd01948c1 am:
260ef208ac -s ours am:
b6ecd1f88a am:
f2e1ef2297 am:
edc549d78e" into oc-mr1-dev-plus-aosp
am:
d11e149269 -s ours
Change-Id: I8cb827ab0e34ab8538a88f23616dd27aa7bd3ff5
Treehugger Robot [Fri, 20 Oct 2017 01:29:45 +0000 (01:29 +0000)]
Merge "Remove "result2" in AccountManagerService"
Nan Zhang [Fri, 20 Oct 2017 01:28:41 +0000 (01:28 +0000)]
Merge "Shard framework during Java compilation for target side." am:
6a90c3f793 am:
b06e03c134 am:
6b4f75ec4a
am:
0af34ddfc8
Change-Id: If69b59543f2c364c2f13551e2d952dbc79eb21f4
Jeff Sharkey [Fri, 20 Oct 2017 01:26:22 +0000 (01:26 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
ca7ffa06bc -s ours am:
edb6b17ebc -s ours am:
08bd3a75fb am:
9c441159f9 am:
2f8dbe9693 am:
3bb6994a0b -s ours am:
73a4e88df8 am:
832890f6e2 am:
34e4628cfb am:
76d9732106 am:
af70ac2914 -s ours
am:
571c8a4507
Change-Id: Ie4e871d2017d505461027c376946e2034105062a
Siyamed Sinir [Fri, 20 Oct 2017 01:21:24 +0000 (01:21 +0000)]
Fix ClipboardService device lock check for cross profile am:
0595b5a94b am:
9e5a4ed6c3 -s ours am:
1c7cdde2d3 am:
63bb54738d am:
4c7113461f am:
74b3298994 am:
4afdfec2d9 am:
bf5b9d7e8e am:
9f073ee9fd am:
c257b61ec2 am:
21bdeacae7 am:
6ecad744a9
am:
289db3b4f3
Change-Id: Iecbafde6b2ee313cc7d3b28704b257219266341f
Android Build Merger (Role) [Fri, 20 Oct 2017 01:17:57 +0000 (01:17 +0000)]
Merge "Merge "Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1-dev am:
f2b592726d -s ours am:
dfbaa1fd8b am:
d7ece4da2c am:
06bd19c1fb am:
7b1157a92e -s ours am:
bcdb9079ef am:
5fda53b294 am:
791d8a5b16 am:
4dd01948c1 am:
260ef208ac -s ours am:
b6ecd1f88a am:
f2e1ef2297" into oc-dr1-dev-plus-aosp am:
a6b9a27c35" into oc-mr1-dev-plus-aosp
Siyamed Sinir [Fri, 20 Oct 2017 01:17:09 +0000 (01:17 +0000)]
Fix ClipboardService device lock check for cross profile am:
0595b5a94b am:
9e5a4ed6c3 -s ours am:
1c7cdde2d3 am:
63bb54738d am:
4c7113461f am:
74b3298994 am:
4afdfec2d9 am:
bf5b9d7e8e am:
9f073ee9fd am:
c257b61ec2 am:
21bdeacae7 am:
6ecad744a9
am:
289db3b4f3
Change-Id: I71991fe9cd3b442dff4ce84657cd84936511a8b2
Beverly Tai [Fri, 20 Oct 2017 01:16:27 +0000 (01:16 +0000)]
Merge "Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1-dev am:
f2b592726d -s ours am:
dfbaa1fd8b am:
d7ece4da2c am:
06bd19c1fb am:
7b1157a92e -s ours am:
bcdb9079ef am:
5fda53b294 am:
791d8a5b16 am:
4dd01948c1 am:
260ef208ac -s ours am:
b6ecd1f88a am:
f2e1ef2297" into oc-dr1-dev-plus-aosp
am:
a6b9a27c35
Change-Id: I22b9c537fb0f5e1b1414be25f20b6710d00e2f90
Jeff Sharkey [Fri, 20 Oct 2017 01:11:01 +0000 (01:11 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
1f2a5d3622 -s ours am:
b52056d549 am:
563ea682e7 am:
901c587c6b am:
1455bd6492 -s ours am:
7f00f14d81 am:
3c30346de2 am:
b049f43f9b am:
1b40397eb0 am:
00183554a9 -s ours
am:
61d6dd8185
Change-Id: I9b862fb8aa4858bf57aa390c7d54a65bb19d12fd
Android Build Merger (Role) [Fri, 20 Oct 2017 01:09:44 +0000 (01:09 +0000)]
TreeHugger Robot [Fri, 20 Oct 2017 01:09:08 +0000 (01:09 +0000)]
Merge "Prevent task in recents being empty when activity info in unavailable"
TreeHugger Robot [Fri, 20 Oct 2017 01:08:04 +0000 (01:08 +0000)]
Merge "Add support for dimension, and link with condition and added DurationMetric"
Suprabh Shukla [Fri, 20 Oct 2017 01:04:58 +0000 (01:04 +0000)]
Clearing up invalid entries when SyncStorageEngine starts am:
271702fc28 am:
8b438236ce -s ours am:
159648d6e5 am:
6f0e6952ef am:
8fb52c8d06 am:
cf8fe172a1 am:
55ffaea04b am:
d1150b7e55 am:
a4454ba4a9 am:
29257874f9 am:
02d89a3c0c am:
14164f1bdf am:
7078aaa62a am:
d6e80237d9
am:
d9430fb4fb
Change-Id: Ia2e06492a3ba705a644c26b2dc74e57d03c86ca9