git.osdn.net Git - android-x86/frameworks-base.git/log

(root) / android-x86 / frameworks-base.git / log

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 20 Oct 2017 02:21:16 +0000 (02:21 +0000)]

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 20 Oct 2017 02:08:38 +0000 (02:08 +0000)]

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

tiansiming [Fri, 20 Oct 2017 01:57:20 +0000 (01:57 +0000)]

Merge "Remove "result2" in AccountManagerService" am: eaf4d18bdf
am: 4b4b759272

Change-Id: I1558ff443ffc28a21e80f5752feb535e08152f07

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

tiansiming [Fri, 20 Oct 2017 01:47:15 +0000 (01:47 +0000)]

Merge "Remove "result2" in AccountManagerService"
am: eaf4d18bdf

Change-Id: I80c362a0250430f5d8948e4815638eab31d8c2b1

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Treehugger Robot [Fri, 20 Oct 2017 01:29:45 +0000 (01:29 +0000)]

Merge "Remove "result2" in AccountManagerService"

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 20 Oct 2017 01:17:57 +0000 (01:17 +0000)]

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 20 Oct 2017 01:09:44 +0000 (01:09 +0000)]

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"

commit | commitdiff | tree

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"

commit | commitdiff | tree

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"

commit | commitdiff | tree

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

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 20 Oct 2017 00:59:12 +0000 (00:59 +0000)]

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Suprabh Shukla [Fri, 20 Oct 2017 00:40:18 +0000 (00:40 +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
am: fd58475dcc

Change-Id: Icb4d35307829cf4f16c7a30b46bfa219ede2fb16

commit | commitdiff | tree

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

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 20 Oct 2017 00:39:30 +0000 (00:39 +0000)]

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

TreeHugger Robot [Fri, 20 Oct 2017 00:10:04 +0000 (00:10 +0000)]

Merge changes from topic "health2_healthd_hwbinder"

* changes:
BatteryService serves IBatteryPropertiesRegistrar.
BatteryService: Use android.hardware.health@2.0.

commit | commitdiff | tree

Jeff Sharkey [Fri, 20 Oct 2017 00:06:43 +0000 (00:06 +0000)]

commit | commitdiff | tree

Jeff Sharkey [Fri, 20 Oct 2017 00:03:14 +0000 (00:03 +0000)]

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Jeff Sharkey [Thu, 19 Oct 2017 23:50:34 +0000 (23:50 +0000)]

commit | commitdiff | tree

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

commit | commitdiff | tree

Treehugger Robot [Thu, 19 Oct 2017 23:46:18 +0000 (23:46 +0000)]

Merge "Shard framework during Java compilation for target side."

commit | commitdiff | tree

Jeff Sharkey [Thu, 19 Oct 2017 23:46:05 +0000 (23:46 +0000)]

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Siyamed Sinir [Thu, 19 Oct 2017 23:29:06 +0000 (23:29 +0000)]

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

TreeHugger Robot [Thu, 19 Oct 2017 23:20:52 +0000 (23:20 +0000)]

Merge "mididocs: clarify direction and add BLE-MIDI link"

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Matthew Ng [Thu, 19 Oct 2017 23:04:30 +0000 (16:04 -0700)]

Prevent task in recents being empty when activity info in unavailable

When an app is unavailable to get its activity info, it will not have a
color, title or icon and it would look weird in recents. Therefore skip
adding it to the recents list when this occurs.

Test: manual
Change-Id: I1cf2f7f8ea5ce132159f6aabfbfae31df0187660
Fixes: 64236158

commit | commitdiff | tree

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

commit | commitdiff | tree

Jeff Sharkey [Thu, 19 Oct 2017 22:58:37 +0000 (22:58 +0000)]

DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: ca7ffa06bc -s ours am: edb6b17ebc -s ours am: 08bd3a75fb
am: 9c441159f9

Change-Id: I3533fdd4683cb85f66e107c3b4038f1a7ec97dfc

commit | commitdiff | tree

Beverly Tai [Thu, 19 Oct 2017 22:56:23 +0000 (22: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

Change-Id: Idda35731b13787fb00e0c7474eebc5b7d8660251

commit | commitdiff | tree

Roozbeh Pournader [Thu, 19 Oct 2017 22:55:57 +0000 (22:55 +0000)]

Merge "Replace JNI portion of AndroidBidi with calls to ICU4J"

commit | commitdiff | tree

Suprabh Shukla [Thu, 19 Oct 2017 22:54:42 +0000 (22:54 +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

Change-Id: Ie24e5fc3ab442ca5c51ca79687d417ae563d631c

commit | commitdiff | tree

Siyamed Sinir [Thu, 19 Oct 2017 22:51:30 +0000 (22:51 +0000)]

Fix ClipboardService device lock check for cross profile am: 0595b5a94b am: 9e5a4ed6c3 -s ours am: 1c7cdde2d3 am: 63bb54738d
am: 4c7113461f

Change-Id: If52cdfdbd9e3eee06a109a5b4f1bff82d9506b73

commit | commitdiff | tree

Jeff Sharkey [Thu, 19 Oct 2017 22:44:02 +0000 (22:44 +0000)]

DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 1f2a5d3622 -s ours am: b52056d549
am: 563ea682e7

Change-Id: I393058caae6a8cc446597509b20241723f22a238

commit | commitdiff | tree

Yao Chen [Mon, 16 Oct 2017 17:33:26 +0000 (10:33 -0700)]

Add support for dimension, and link with condition and added DurationMetric

Now we support following metrics:
  <Duration> of [app holding a wake lock], while [*this app*] is [in background] [AND] [screen is off]
  [Slice] the output by [app name, wake lock name], with bucket size [30sec]

+ Also added onDumpReport() api in MetricsManager, it can be called from client to fetch the data from
  statsd

+ Also added command line tool to dump the StatsLogReport from all metrics for debugging.

+ Synced proto from google3. with a pending cl (cr/172359050)

TODO: We need to add tons of tests to test the Metrics. I will work on it after this CL so people
can be unblocked.

I locally test the duration metric with wake lock with an app that generates StatsLog events.

Test: statsd_test

      and manual test, and run:

      adb shell cmd stats dump-report
      We have a default config, which contains a metrics to count PROCESS_START event sliced by
      package name.

Change-Id: I4838cc6cf025c143b7e84f43040703a78121fd25

commit | commitdiff | tree

Suprabh Shukla [Thu, 19 Oct 2017 22:40:05 +0000 (22:40 +0000)]

commit | commitdiff | tree

Beverly Tai [Thu, 19 Oct 2017 22:39:14 +0000 (22:39 +0000)]

commit | commitdiff | tree

Siyamed Sinir [Thu, 19 Oct 2017 22:34:08 +0000 (22:34 +0000)]

Fix ClipboardService device lock check for cross profile am: 0595b5a94b am: 9e5a4ed6c3 -s ours am: 1c7cdde2d3
am: 63bb54738d

Change-Id: Ie5bd667854712446924704bc839e80bb66d06a63

commit | commitdiff | tree

Jeff Sharkey [Thu, 19 Oct 2017 22:32:13 +0000 (22:32 +0000)]

DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: ca7ffa06bc -s ours am: edb6b17ebc -s ours
am: 08bd3a75fb

Change-Id: I18e61b7280df672c91bb076f3ed894f895e075a0

commit | commitdiff | tree

Jeff Sharkey [Thu, 19 Oct 2017 22:25:25 +0000 (22:25 +0000)]

DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 1f2a5d3622 -s ours
am: b52056d549

Change-Id: I520162dc90c1855d0a6324e62507f78d6ce5b329

commit | commitdiff | tree

Suprabh Shukla [Thu, 19 Oct 2017 22:25:04 +0000 (22:25 +0000)]

Clearing up invalid entries when SyncStorageEngine starts am: 271702fc28 am: 8b438236ce -s ours am: 159648d6e5 am: 6f0e6952ef am: 8fb52c8d06 am: cf8fe172a1
am: 55ffaea04b

Change-Id: I10a7a16d5463e4cbf7880b1979541ea82a56ddd3

commit | commitdiff | tree

Adam Lesinski [Thu, 19 Oct 2017 22:23:58 +0000 (22:23 +0000)]

Merge "AAPT2: Ensure strings are sorted by configuration" into oc-mr1-dev am: 8da74b1bfd
am: 5fae742a1e

Change-Id: I7dfb1a020b1c3da9e0af5a7096fda0775751eab3

commit | commitdiff | tree

Beverly Tai [Thu, 19 Oct 2017 22:20:11 +0000 (22:20 +0000)]

commit | commitdiff | tree

Siyamed Sinir [Thu, 19 Oct 2017 22:16:30 +0000 (22:16 +0000)]

Fix ClipboardService device lock check for cross profile am: 0595b5a94b am: 9e5a4ed6c3 -s ours
am: 1c7cdde2d3

Change-Id: Iee9737ebbb5e9f3d476ddb54d9ae9898b2d01d14

commit | commitdiff | tree

Jeff Sharkey [Thu, 19 Oct 2017 22:14:01 +0000 (22:14 +0000)]

DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: ca7ffa06bc -s ours
am: edb6b17ebc -s ours

Change-Id: Ie31aff669dfbabd860c123d4448362af4903973d

commit | commitdiff | tree

Jeff Sharkey [Thu, 19 Oct 2017 22:10:20 +0000 (22:10 +0000)]

DO NOT MERGE. KEY_INTENT shouldn't grant permissions.
am: 1f2a5d3622 -s ours

Change-Id: I2bf88a0e4808e7d3db67e7944696121c284ed7ae

frameworks/base

RSS Atom

About OSDN

Find Software

Develop Software

Help