OSDN Git Service
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: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: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: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
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
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: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
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: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"
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
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
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
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
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
Treehugger Robot [Fri, 20 Oct 2017 01:29:45 +0000 (01:29 +0000)]
Merge "Remove "result2" in AccountManagerService"
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 00:59:12 +0000 (00:59 +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
Siyamed Sinir [Fri, 20 Oct 2017 00:58:26 +0000 (00:58 +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
Change-Id: I11a06f501b8278c356e7c2072c00b7d86470a64a
Jeff Sharkey [Fri, 20 Oct 2017 00:57:09 +0000 (00:57 +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
Change-Id: Ie750d6963f29c0f60a6e2e4ef2a0e8fa4201e06a
Beverly Tai [Fri, 20 Oct 2017 00:56:21 +0000 (00:56 +0000)]
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
Change-Id: I4fcd58e1471efc519e2c3bcba2d1bcdca4b747e9
Nick Kralevich [Fri, 20 Oct 2017 00:51:50 +0000 (17:51 -0700)]
more O_CLOEXEC
Test: code compiles.
Change-Id: I4f76258cc607dee6754abbcab5ba5d4c339e69cd
Nan Zhang [Fri, 20 Oct 2017 00:50:31 +0000 (00:50 +0000)]
Merge "Shard framework during Java compilation for target side." am:
6a90c3f793 am:
b06e03c134
am:
6b4f75ec4a
Change-Id: Iba206e39782bf0ac8057470d856251a599a230c9
Jeff Sharkey [Fri, 20 Oct 2017 00:46:57 +0000 (00:46 +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
Change-Id: Idfdb3ab78f68d6b41d99bca533045118cc34574e
Jeff Sharkey [Fri, 20 Oct 2017 00:40:14 +0000 (00:40 +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
Change-Id: I6ff359477121027efd13e82ce530a4fce32d3564
Android Build Merger (Role) [Fri, 20 Oct 2017 00:39:30 +0000 (00:39 +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
Beverly Tai [Fri, 20 Oct 2017 00:36:59 +0000 (00:36 +0000)]
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
Change-Id: I99d77a01bbd5992effb98cc2cec15a27ab78d223
Beverly Tai [Fri, 20 Oct 2017 00:36:59 +0000 (00:36 +0000)]
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
Change-Id: I1d35f22d61dcb6dd29b0815999b4300656d84a19
Suprabh Shukla [Fri, 20 Oct 2017 00:33:21 +0000 (00:33 +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
Change-Id: Id57a09b062896003af97edb7b25b8fd077004586
Jeff Sharkey [Fri, 20 Oct 2017 00:31:27 +0000 (00:31 +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
Change-Id: If7bafe99a0d9563f9c09f5632b6e023ee328ffdb
Nan Zhang [Fri, 20 Oct 2017 00:27:11 +0000 (00:27 +0000)]
Merge "Shard framework during Java compilation for target side." am:
6a90c3f793
am:
b06e03c134
Change-Id: I9ae5c3ae45cac0a53b81043f33af2fd2910e86f8
Siyamed Sinir [Fri, 20 Oct 2017 00:27:10 +0000 (00:27 +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
Change-Id: I3c633755286caa3ae6538581bc05a8374a8ef691
Jeff Sharkey [Fri, 20 Oct 2017 00:22:39 +0000 (00:22 +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
Change-Id: I0b37777cbd94bb4c3bc60315aff3a2ebc324273c
Suprabh Shukla [Fri, 20 Oct 2017 00:21:45 +0000 (00:21 +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:
fa4d0a1d80
Change-Id: Ifaa66862877cbdde99a93f2ba7c59f8f1da8a5f4
Nan Zhang [Fri, 20 Oct 2017 00:17:23 +0000 (00:17 +0000)]
Merge "Shard framework during Java compilation for target side."
am:
6a90c3f793
Change-Id: I1a24f704d3537bde1e4aaef5bd4edf4cc898bb04
Beverly Tai [Fri, 20 Oct 2017 00:17:11 +0000 (00:17 +0000)]
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
Change-Id: Id7edf88371f89d5ff9a4aad06c25cd133eb17415
Siyamed Sinir [Fri, 20 Oct 2017 00:12:31 +0000 (00:12 +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
Change-Id: I5369e96fe95e0db7206c61bb1af5b140a788890a
Jeff Sharkey [Fri, 20 Oct 2017 00:06:43 +0000 (00:06 +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
Change-Id: Ie3d4564dc4d4790f6cae5cbef45c47aa2eb5000a
Jeff Sharkey [Fri, 20 Oct 2017 00:03:14 +0000 (00:03 +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
Change-Id: Id6f534c7fb34dcd7a16478de7a0de80688322d47
Suprabh Shukla [Fri, 20 Oct 2017 00:02:54 +0000 (00:02 +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
Change-Id: Ib2de51e856b8fe7da42c37490cb84bafee9ed2f7
Suprabh Shukla [Fri, 20 Oct 2017 00:01:26 +0000 (00:01 +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
Change-Id: I00826913bfa33d529b3056c7d4a2b4a9215172d8
Beverly Tai [Thu, 19 Oct 2017 23:52:10 +0000 (23:52 +0000)]
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
Change-Id: If5929149e8173cd14c15e9d4d6e513e10f96f876
Jeff Sharkey [Thu, 19 Oct 2017 23:50:34 +0000 (23:50 +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
Change-Id: I4ea13f580157d2985890d2115fdfc0a38f31e614
Siyamed Sinir [Thu, 19 Oct 2017 23:47:49 +0000 (23:47 +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
Change-Id: I6d9c5637245a5e242761d8368aea06a4cbfbd013
Treehugger Robot [Thu, 19 Oct 2017 23:46:18 +0000 (23:46 +0000)]
Merge "Shard framework during Java compilation for target side."
Jeff Sharkey [Thu, 19 Oct 2017 23:46:05 +0000 (23:46 +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
Change-Id: Ib4bfd2cde222e01e876d9b4ffc3a2135037c860d
Suprabh Shukla [Thu, 19 Oct 2017 23:43:16 +0000 (23:43 +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
Change-Id: I6bea094bde1b97604d7769646d9b04f7e6b21ca2
Beverly Tai [Thu, 19 Oct 2017 23:37:21 +0000 (23:37 +0000)]
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
Change-Id: I7426cd9b8f68f80a924662b4870558974bad347b
Jeff Sharkey [Thu, 19 Oct 2017 23:31:46 +0000 (23:31 +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
Change-Id: I79f42935ccfa12f7a5e5d22957a06f50825e2dcf
Siyamed Sinir [Thu, 19 Oct 2017 23:29:06 +0000 (23:29 +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
Change-Id: Iffbe5920dbe7406a8e895901dd8cc097f22c397e
Jeff Sharkey [Thu, 19 Oct 2017 23:26:57 +0000 (23: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
Change-Id: I5b8a2b5df614aa4abe813e48ebf030d15dbf0202
Suprabh Shukla [Thu, 19 Oct 2017 23:22:43 +0000 (23:22 +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
Change-Id: If82c97668497ce72ad29b055b15646291df66157
Jeff Sharkey [Thu, 19 Oct 2017 23:17:45 +0000 (23:17 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
1f2a5d3622 -s ours am:
b52056d549 am:
563ea682e7 am:
901c587c6b
am:
1455bd6492 -s ours
Change-Id: I2e15595d4e8f797d5b5606a5298ac50b83cf581b
Jeff Sharkey [Thu, 19 Oct 2017 23:17:05 +0000 (23:17 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
ca7ffa06bc -s ours am:
edb6b17ebc -s ours am:
08bd3a75fb am:
9c441159f9
am:
2f8dbe9693
Change-Id: I5cd93d250ea8c6cd45616aaafabd0eda68da4538
Siyamed Sinir [Thu, 19 Oct 2017 23:15:25 +0000 (23:15 +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
Change-Id: Ica998b67cb1a0d94767863f17c292eca7083b780
Beverly Tai [Thu, 19 Oct 2017 23:11:55 +0000 (23:11 +0000)]
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
Change-Id: I0678613fd0293afeafa38c4ac9fb0a55fb4b3969
Suprabh Shukla [Thu, 19 Oct 2017 23:09:02 +0000 (23:09 +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
Change-Id: I3852ef99532b956fd3280c49d6722c2aed1d79a6
Jeff Sharkey [Thu, 19 Oct 2017 23:06:16 +0000 (23:06 +0000)]
DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am:
1f2a5d3622 -s ours am:
b52056d549 am:
563ea682e7
am:
901c587c6b
Change-Id: I3e721dc6183024b73b70d1f30363983a7afaf6d1
Siyamed Sinir [Thu, 19 Oct 2017 23:03:18 +0000 (23:03 +0000)]
Fix ClipboardService device lock check for cross profile am:
0595b5a94b am:
9e5a4ed6c3 -s ours am:
1c7cdde2d3 am:
63bb54738d am:
4c7113461f
am:
74b3298994
Change-Id: If2e11ec2b732d2295484d489eabf7ae183c30038