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

OSDN Git Service

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Erik Kline [Fri, 20 Oct 2017 02:54:08 +0000 (02:54 +0000)]

Merge changes I3b56e75d,I36255a2c am: 5c7128c070
am: 464d7635b0

Change-Id: I691118a7806cbd557b0f490f21bfaadc6d0aaf1d

commit | commitdiff | tree

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

commit | commitdiff | tree

Erik Kline [Fri, 20 Oct 2017 02:45:14 +0000 (02:45 +0000)]

Merge changes I3b56e75d,I36255a2c
am: 5c7128c070

Change-Id: I8ab4bfa6a069d24b89a6595dbc9ffd5d6dd816ec

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

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

commit | commitdiff | tree

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

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)]

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

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

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

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

Merge "Remove "result2" in AccountManagerService"

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)]

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

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 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

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

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

commit | commitdiff | tree

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

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)]

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

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

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

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

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

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

Change-Id: Iac842a9f018f24c905d4e165362f5bf87470d296

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

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

commit | commitdiff | tree

Suprabh Shukla [Thu, 19 Oct 2017 22:06:31 +0000 (22:06 +0000)]

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

Change-Id: I8600883ef4cad6f8b11fc005fc9cfd62d84aeb08

commit | commitdiff | tree

Beverly Tai [Thu, 19 Oct 2017 22:06:02 +0000 (22:06 +0000)]

Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1-dev am: f2b592726d -s ours am: dfbaa1fd8b am: d7ece4da2c
am: 06bd19c1fb

Change-Id: I6f6cb9cf71ba1584b162d6b18c28c2825323e7be

commit | commitdiff | tree

Siyamed Sinir [Thu, 19 Oct 2017 22:04:10 +0000 (22:04 +0000)]

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

Change-Id: Ie6822b787e5777688faadcf125637b9c66c202de

commit | commitdiff | tree

Suprabh Shukla [Thu, 19 Oct 2017 21:55:31 +0000 (21:55 +0000)]

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

Change-Id: I2d8cdac51baf7b8df6b903f0416e525e9ec44784

commit | commitdiff | tree

Beverly Tai [Thu, 19 Oct 2017 21:50:59 +0000 (21:50 +0000)]

Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1-dev am: f2b592726d -s ours am: dfbaa1fd8b
am: d7ece4da2c

Change-Id: Icfd3af47bed5a40d23d1a48ecbb654625898ca2f

commit | commitdiff | tree

Adam Lesinski [Thu, 19 Oct 2017 21:43:31 +0000 (21:43 +0000)]

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

Change-Id: Ifd3555db424136fe8a8057504df414f41fb020a1

commit | commitdiff | tree

Suprabh Shukla [Thu, 19 Oct 2017 21:41:08 +0000 (21:41 +0000)]

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

Change-Id: Ie4cf94614784c4938776c8c6c37fff64e6cfa240

commit | commitdiff | tree

Beverly Tai [Thu, 19 Oct 2017 21:35:03 +0000 (21:35 +0000)]

Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1-dev am: f2b592726d -s ours
am: dfbaa1fd8b

Change-Id: I3bcc1adb52f00e95ef31dc17fc29b2e0242bc753

commit | commitdiff | tree

jackqdyulei [Thu, 19 Oct 2017 21:31:54 +0000 (21:31 +0000)]

Reuse the BluetoothBatteryDrawable in QS detail
am: 4b7f43bcae

Change-Id: Ie5fd81010fae4660bb0fdd5d6d061fa535d86150

commit | commitdiff | tree

TreeHugger Robot [Thu, 19 Oct 2017 21:31:10 +0000 (21:31 +0000)]

Merge "AAPT2: Ensure strings are sorted by configuration" into oc-mr1-dev

commit | commitdiff | tree

Suprabh Shukla [Thu, 19 Oct 2017 21:25:06 +0000 (21:25 +0000)]

Clearing up invalid entries when SyncStorageEngine starts am: 271702fc28 am: 8b438236ce -s ours
am: 159648d6e5

Change-Id: I34260f4fd841084a9e91b89905d84004efb40b23

commit | commitdiff | tree

Beverly Tai [Thu, 19 Oct 2017 21:18:55 +0000 (21:18 +0000)]

Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1-dev
am: f2b592726d -s ours

Change-Id: Idd1243bb1cddc91f34f6e47e9cea88b72cff29d0

commit | commitdiff | tree

Suprabh Shukla [Thu, 19 Oct 2017 20:57:26 +0000 (20:57 +0000)]

Clearing up invalid entries when SyncStorageEngine starts am: 271702fc28
am: 8b438236ce -s ours

Change-Id: Ib8c3a4e6e8e39e42aa640c9988d0dd2022f486ec

commit | commitdiff | tree

Jonathan Basseri [Thu, 19 Oct 2017 16:22:08 +0000 (16:22 +0000)]

DO NOT MERGE Revert "Convert ICarrierService to oneway."

This reverts commit 49b54d64ca5c2aa08021c2ad747597cdd4486ad8.

Bug: 63400667
Change-Id: Ica0696bf4ae3f9a84f0e4ad6e1207374696e9497

commit | commitdiff | tree

jackqdyulei [Thu, 19 Oct 2017 18:05:09 +0000 (11:05 -0700)]

Reuse the BluetoothBatteryDrawable in QS detail

BluetoothBatteryDrawable creates the drawable lazily using
the latest(and most correct) context. So it could get the
correct color from the theme.

Also add iconScale field in BluetoothBatteryDrawable so the size
of the battery icon could be scaled.

Bug: 67377756
Test: Manual - connected to bluetooth headphone and open the qs
page and detail page. Retest it after changing it to dark theme.
Change-Id: Ic6c871985a89a503221755eed4bc2605ab53f630

frameworks/base

RSS Atom

About OSDN

Find Software

Develop Software

Help