Commit Graph

347418 Commits

Author SHA1 Message Date
Erik Kline
85d4cbcd2e Merge "Merge changes I3b56e75d,I36255a2c am: 5c7128c070 am: 464d7635b0 am: ff426ec10c" into oc-mr1-dev-plus-aosp
am: d6e29fd1cd

Change-Id: Ife0e40a2c73246658bab77e443e1e09922323c67
2017-10-20 04:08:39 +00:00
Jonathan Basseri
b56a165301 Merge "DO NOT MERGE Revert "Convert ICarrierService to oneway."" into oc-mr1-dev am: 7bd96d32a1
am: cb9dc98cb8  -s ours

Change-Id: I7af86235fb7830d4084a8e9e169977c6776fec00
2017-10-20 03:51:33 +00:00
TreeHugger Robot
5e9e79ccec Merge "Allow datasets without presentation to optimize authentication use case." 2017-10-20 03:45:27 +00:00
Android Build Merger (Role)
d9a98178f3 Merge "Merge "Remove "result2" in AccountManagerService" am: eaf4d18bdf am: 4b4b759272 am: 640a087f91 am: 88e6c96571" 2017-10-20 03:37:28 +00:00
tiansiming
ef1f1e8d9f Merge "Remove "result2" in AccountManagerService" am: eaf4d18bdf am: 4b4b759272 am: 640a087f91
am: 88e6c96571

Change-Id: I0d38e1be07166288c521eae08cf075e25bdeb6fb
2017-10-20 03:35:52 +00:00
Android Build Merger (Role)
893c83a2b8 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" 2017-10-20 03:30:07 +00:00
Jeff Sharkey
159a489093 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
2017-10-20 03:28:30 +00:00
Android Build Merger (Role)
f2a88db473 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" 2017-10-20 03:26:46 +00:00
Jeff Sharkey
8e9fb175b2 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
2017-10-20 03:24:53 +00:00
Android Build Merger (Role)
2a5fc8fb93 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" 2017-10-20 03:23:20 +00:00
Jeff Sharkey
d81a48c784 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
2017-10-20 03:21:23 +00:00
Android Build Merger (Role)
c0868792a2 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" 2017-10-20 03:19:43 +00:00
Siyamed Sinir
46f151177b 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
2017-10-20 03:18:00 +00:00
TreeHugger Robot
73b3d1d3d0 Merge "Make new Autofill API concretes, so they don't break support library." 2017-10-20 03:14:48 +00:00
Android Build Merger (Role)
d6e29fd1cd Merge "Merge changes I3b56e75d,I36255a2c am: 5c7128c070 am: 464d7635b0 am: ff426ec10c" into oc-mr1-dev-plus-aosp 2017-10-20 03:05:55 +00:00
Erik Kline
40fd560508 Merge changes I3b56e75d,I36255a2c am: 5c7128c070 am: 464d7635b0
am: ff426ec10c

Change-Id: I70dd6de78fc7bbec28196283c9b0227d718f1baf
2017-10-20 03:04:28 +00:00
Jonathan Basseri
cb9dc98cb8 Merge "DO NOT MERGE Revert "Convert ICarrierService to oneway."" into oc-mr1-dev
am: 7bd96d32a1

Change-Id: I0566980aa480c50fa785465b08a40ba40d6c7520
2017-10-20 03:01:14 +00:00
Jeff Sharkey
689c29f125 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
2017-10-20 02:54:29 +00:00
Erik Kline
ff426ec10c Merge changes I3b56e75d,I36255a2c am: 5c7128c070
am: 464d7635b0

Change-Id: I691118a7806cbd557b0f490f21bfaadc6d0aaf1d
2017-10-20 02:54:08 +00:00
Jonathan Basseri
7bd96d32a1 Merge "DO NOT MERGE Revert "Convert ICarrierService to oneway."" into oc-mr1-dev 2017-10-20 02:50:35 +00:00
Siyamed Sinir
17fbcb6f95 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
2017-10-20 02:49:46 +00:00
Erik Kline
464d7635b0 Merge changes I3b56e75d,I36255a2c
am: 5c7128c070

Change-Id: I8ab4bfa6a069d24b89a6595dbc9ffd5d6dd816ec
2017-10-20 02:45:14 +00:00
tiansiming
88e6c96571 Merge "Remove "result2" in AccountManagerService" am: eaf4d18bdf am: 4b4b759272
am: 640a087f91

Change-Id: I89f76114c37fe63556c0813cb860ba01366c98c9
2017-10-20 02:39:59 +00:00
Jeff Sharkey
0f4e6c4736 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
2017-10-20 02:33:30 +00:00
Treehugger Robot
5c7128c070 Merge changes I3b56e75d,I36255a2c
* changes:
  Skeletal IpManager proxying to the new IpClient
  Rename IpManager to IpClient
2017-10-20 02:29:41 +00:00
Etan Cohen
668280db68 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
2017-10-20 02:28:31 +00:00
Android Build Merger (Role)
c10c572530 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 2017-10-20 02:21:16 +00:00
Jeff Sharkey
340a5c94df 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
2017-10-20 02:18:47 +00:00
Jeff Sharkey
a63880c929 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
2017-10-20 02:18:38 +00:00
Android Build Merger (Role)
462128f831 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 2017-10-20 02:08:38 +00:00
Siyamed Sinir
f0cbef9f96 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
2017-10-20 02:07:09 +00:00
Jeff Sharkey
6eeabc69e4 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
2017-10-20 01:59:35 +00:00
tiansiming
640a087f91 Merge "Remove "result2" in AccountManagerService" am: eaf4d18bdf
am: 4b4b759272

Change-Id: I1558ff443ffc28a21e80f5752feb535e08152f07
2017-10-20 01:57:20 +00:00
Jeff Sharkey
9117ad721a 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
2017-10-20 01:51:28 +00:00
Jeff Sharkey
c13982c8a8 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
2017-10-20 01:48:46 +00:00
tiansiming
4b4b759272 Merge "Remove "result2" in AccountManagerService"
am: eaf4d18bdf

Change-Id: I80c362a0250430f5d8948e4815638eab31d8c2b1
2017-10-20 01:47:15 +00:00
Siyamed Sinir
dd77a3da32 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
2017-10-20 01:42:40 +00:00
Jeff Sharkey
d59cb81ea9 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
2017-10-20 01:39:17 +00:00
Beverly Tai
708f1b8cdc 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
2017-10-20 01:35:34 +00:00
Jeff Sharkey
74552f1b98 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
2017-10-20 01:33:20 +00:00
Beverly Tai
0b3fd511ef 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
2017-10-20 01:31:54 +00:00
Treehugger Robot
eaf4d18bdf Merge "Remove "result2" in AccountManagerService" 2017-10-20 01:29:45 +00:00
Nan Zhang
958bb04540 Merge "Shard framework during Java compilation for target side." am: 6a90c3f793 am: b06e03c134 am: 6b4f75ec4a
am: 0af34ddfc8

Change-Id: If69b59543f2c364c2f13551e2d952dbc79eb21f4
2017-10-20 01:28:41 +00:00
Jeff Sharkey
45829c0c41 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
2017-10-20 01:26:22 +00:00
Siyamed Sinir
bd0619b1c5 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
2017-10-20 01:21:24 +00:00
Android Build Merger (Role)
11a7e42c8e 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 2017-10-20 01:17:57 +00:00
Siyamed Sinir
cd30a463c6 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
2017-10-20 01:17:09 +00:00
Beverly Tai
a8a8d47516 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
2017-10-20 01:16:27 +00:00
Jeff Sharkey
438ed4369d 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
2017-10-20 01:11:01 +00:00
Android Build Merger (Role)
f4bd62e292 Merge "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" 2017-10-20 01:09:44 +00:00