OSDN Git Service
Julia Reynolds [Mon, 18 Jun 2018 14:11:26 +0000 (14:11 +0000)]
Merge "Fix notification interruption stats"
Android Build Merger (Role) [Mon, 18 Jun 2018 13:12:56 +0000 (13:12 +0000)]
[automerger] Merge "WiFi: Add configs for SAR support of body sensors" into pi-dev am:
ef4a56f9e4 am:
bba3c54256
Change-Id: Ia5fc6a5bef9664456dccf594798f2ccc53975720
Ahmed ElArabawy [Mon, 18 Jun 2018 13:12:22 +0000 (06:12 -0700)]
Merge "WiFi: Add configs for SAR support of body sensors" into pi-dev
am:
ef4a56f9e4
Change-Id: I623d20464db6ebd8efe589987606f23c870d6283
Android Build Merger (Role) [Mon, 18 Jun 2018 13:05:41 +0000 (13:05 +0000)]
[automerger] Merge changes from topic "am-
aabaca13-84ab-4de5-bfa1-
2add13867c06" into oc-dev am:
3c047ea7fa am:
3cca4e7b06 am:
d4a1791bd7 am:
42fb737d13 am:
abac6b84c1
Change-Id: I4af26a8ef76833a741ef62f21bcb42adbed6d5b2
Android Build Merger (Role) [Mon, 18 Jun 2018 13:05:21 +0000 (13:05 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
422582d9c4 skipped:
b06ba83b23 am:
437da4c13d -s ours am:
f57c14b641 -s ours am:
bc1dc5c368 -s ours am:
8d70303da7 -s ours skipped:
13d94b91d2
Change-Id: I614fa2aebd202c9478ff782f4762cd22eb8a87af
Bill Yi [Mon, 18 Jun 2018 13:04:41 +0000 (06:04 -0700)]
Merge changes from topic "am-
aabaca13-84ab-4de5-bfa1-
2add13867c06" into oc-dev am:
3c047ea7fa am:
3cca4e7b06 am:
d4a1791bd7
am:
42fb737d13
Change-Id: I38f6349a440fb068af4a6382c11b0914e30e6047
Android Build Merger (Role) [Mon, 18 Jun 2018 12:57:30 +0000 (12:57 +0000)]
Merge "Merge "WiFi: Add configs for SAR support of body sensors" into pi-dev am:
ef4a56f9e4 am:
77d5344926"
Bill Yi [Mon, 18 Jun 2018 12:56:01 +0000 (05:56 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
422582d9c4 skipped:
b06ba83b23 am:
437da4c13d -s ours am:
f57c14b641 -s ours am:
bc1dc5c368 -s ours
am:
8d70303da7 -s ours
Change-Id: I8fc6b85610ce5747d02053c587c4e8cd05be4a42
Android Build Merger (Role) [Mon, 18 Jun 2018 12:55:32 +0000 (12:55 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
cbc81e618d skipped:
693ad9800b am:
cb1a10f5b6 -s ours am:
d996012ef5 -s ours am:
97ee183747 -s ours am:
15123e0230 -s ours skipped:
86b491a574
Change-Id: Ib1f7efbe4b2dbacfdcf6c64d94416a11c7feed3f
Ahmed ElArabawy [Mon, 18 Jun 2018 12:55:20 +0000 (05:55 -0700)]
Merge "WiFi: Add configs for SAR support of body sensors" into pi-dev am:
ef4a56f9e4
am:
77d5344926
Change-Id: I89f4fc12b5a566a060cbdc88debad2c5108e0b72
Bill Yi [Mon, 18 Jun 2018 12:55:01 +0000 (05:55 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
cbc81e618d skipped:
693ad9800b am:
cb1a10f5b6 -s ours am:
d996012ef5 -s ours am:
97ee183747 -s ours
am:
15123e0230 -s ours
Change-Id: Ide3590768b6e472991376ced275114191a3f552d
Android Build Merger (Role) [Mon, 18 Jun 2018 12:54:28 +0000 (12:54 +0000)]
[automerger] Merge "Skip null values in Utils.safeForeach" into pi-dev am:
c5901f5a06 am:
547d43e878
Change-Id: I319ccd1f3da743a286b7fc451743ce22906b4bef
Beverly [Mon, 18 Jun 2018 12:54:05 +0000 (05:54 -0700)]
Merge "Skip null values in Utils.safeForeach" into pi-dev
am:
c5901f5a06
Change-Id: I7a715578f6e715262ccb294d2e5ea2326ae1c075
Android Build Merger (Role) [Mon, 18 Jun 2018 12:49:52 +0000 (12:49 +0000)]
[automerger] Merge "Don't back up Assist Gesture setup/sensitivity" into pi-dev am:
a74fbef8ce am:
114e58a6f9
Change-Id: I72e82a69c75b1ad155dcb8c657175248b68442ab
Kevin Chyn [Mon, 18 Jun 2018 12:49:12 +0000 (05:49 -0700)]
Merge "Don't back up Assist Gesture setup/sensitivity" into pi-dev
am:
a74fbef8ce
Change-Id: I28f349b3674126a85731489fd8119b41385934a7
Android Build Merger (Role) [Mon, 18 Jun 2018 12:44:53 +0000 (12:44 +0000)]
[automerger] Merge "Hiding replied notification icons from AOD" into pi-dev am:
37e96a8fa5 am:
fb0a932ccc
Change-Id: I6633bfc08619d736664eae529fcec03763edbd1d
Selim Cinek [Mon, 18 Jun 2018 12:44:33 +0000 (05:44 -0700)]
Merge "Hiding replied notification icons from AOD" into pi-dev
am:
37e96a8fa5
Change-Id: Iee5f8b80ead2427af699f72aad297617b2fc3329
Ahmed ElArabawy [Mon, 18 Jun 2018 12:40:36 +0000 (05:40 -0700)]
Merge "WiFi: Add configs for SAR support of body sensors" into pi-dev
am:
ef4a56f9e4
Change-Id: I360dc4b35d2b6acf956fd442299df330d54cbb5d
Android Build Merger (Role) [Mon, 18 Jun 2018 12:40:14 +0000 (12:40 +0000)]
[automerger] Merge changes I90451c14,I9fb27a0a into pi-dev am:
b91dd1d944 am:
f000c614dc
Change-Id: If0984fc32694d47900095e278922834ddc36aa63
Adrian Roos [Mon, 18 Jun 2018 12:39:20 +0000 (05:39 -0700)]
Merge changes I90451c14,I9fb27a0a into pi-dev
am:
b91dd1d944
Change-Id: I0e33553729a96e597b8e6f8e741b6cae37504175
Ahmed ElArabawy [Mon, 18 Jun 2018 12:26:40 +0000 (12:26 +0000)]
Merge "WiFi: Add configs for SAR support of body sensors" into pi-dev
Chalard Jean [Mon, 18 Jun 2018 11:17:19 +0000 (04:17 -0700)]
Merge changes I4b1bca8b,Idb7d2f28,I4825e632 am:
84d4e535ae am:
ea044ca373
am:
52688e800f
Change-Id: If2794c9ff81ecad4b30a5c7c2578c1ee7e8c85b9
Chalard Jean [Mon, 18 Jun 2018 11:07:09 +0000 (04:07 -0700)]
Merge changes I4b1bca8b,Idb7d2f28,I4825e632 am:
84d4e535ae
am:
ea044ca373
Change-Id: Iea011d1dc5df03b58fcbb9dcbd4833b20cb5b5a8
Chalard Jean [Mon, 18 Jun 2018 10:06:05 +0000 (03:06 -0700)]
Merge changes I4b1bca8b,Idb7d2f28,I4825e632
am:
84d4e535ae
Change-Id: I7278ffe7ca8e25b040d6bce7fb880ccf0984f6ee
Chalard Jean [Mon, 18 Jun 2018 09:00:40 +0000 (09:00 +0000)]
Merge changes I4b1bca8b,Idb7d2f28,I4825e632
* changes:
[PT09] Add javadoc comments to all ProxyTracker methods/members.
[PT08] Move setDefaultProxy to ProxyTracker
[PT07] Small cleanup of setGlobalProxy
Kazuki Takise [Mon, 18 Jun 2018 08:55:09 +0000 (08:55 +0000)]
Merge "Add always on top feature support"
Andreas Gampe [Mon, 18 Jun 2018 08:37:04 +0000 (01:37 -0700)]
Merge "Apf: Avoid constant overflow" am:
5b99659943 am:
4afe1f957b
am:
a2f5d7481c
Change-Id: I5b33123f2044cc00c5516be8bcbe82591c78b670
Andreas Gampe [Mon, 18 Jun 2018 08:28:52 +0000 (01:28 -0700)]
Merge "Apf: Avoid constant overflow" am:
5b99659943
am:
4afe1f957b
Change-Id: Id2e62fe7d34d88633ae9cd4c9a01c6a5a1eed838
Andreas Gampe [Mon, 18 Jun 2018 08:20:28 +0000 (01:20 -0700)]
Merge "Apf: Avoid constant overflow"
am:
5b99659943
Change-Id: Iacf849e3739f24cd430e6210a2e6a1c67ae0614f
Bill Yi [Mon, 18 Jun 2018 07:53:52 +0000 (00:53 -0700)]
Merge changes from topic "am-
aabaca13-84ab-4de5-bfa1-
2add13867c06" into oc-dev am:
3c047ea7fa am:
3cca4e7b06 am:
d4a1791bd7 am:
42fb737d13
am:
4e1d045e01
Change-Id: I5a7715e5fd51cc8b7a81fefe517e1604b34e4520
Bill Yi [Mon, 18 Jun 2018 07:44:01 +0000 (00:44 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
422582d9c4 skipped:
b06ba83b23 am:
437da4c13d -s ours am:
f57c14b641 -s ours am:
bc1dc5c368 -s ours am:
8d70303da7 -s ours
am:
a146e04799 -s ours
Change-Id: Id09240de883f1199f59159af89e683ee09b5983a
Bill Yi [Mon, 18 Jun 2018 07:39:33 +0000 (00:39 -0700)]
Merge changes from topic "am-
aabaca13-84ab-4de5-bfa1-
2add13867c06" into oc-dev am:
3c047ea7fa am:
3cca4e7b06 am:
d4a1791bd7
am:
42fb737d13
Change-Id: I11dcf3e181aaa1c425eb47bc66a1d754804ed1a2
Bill Yi [Mon, 18 Jun 2018 07:30:00 +0000 (00:30 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
422582d9c4 skipped:
b06ba83b23 am:
437da4c13d -s ours am:
f57c14b641 -s ours am:
bc1dc5c368 -s ours
am:
8d70303da7 -s ours
Change-Id: I37882b0f82989f3d257a3f206fa9d3867713e57e
Bill Yi [Mon, 18 Jun 2018 07:23:36 +0000 (00:23 -0700)]
Merge changes from topic "am-
aabaca13-84ab-4de5-bfa1-
2add13867c06" into oc-dev am:
3c047ea7fa am:
3cca4e7b06
am:
d4a1791bd7
Change-Id: I165a9d006345b6624877fc3b453ceb2b0baa83fb
Bill Yi [Mon, 18 Jun 2018 07:15:09 +0000 (00:15 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
422582d9c4 skipped:
b06ba83b23 am:
437da4c13d -s ours am:
f57c14b641 -s ours
am:
bc1dc5c368 -s ours
Change-Id: Ied727ed9887bc299b944611f1caed5896d8e81ce
Bill Yi [Mon, 18 Jun 2018 07:09:08 +0000 (00:09 -0700)]
Merge changes from topic "am-
aabaca13-84ab-4de5-bfa1-
2add13867c06" into oc-dev am:
3c047ea7fa
am:
3cca4e7b06
Change-Id: Ifaa547b16411e79759647dd9cc53ea76526f5e5d
Bill Yi [Mon, 18 Jun 2018 07:02:54 +0000 (00:02 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
422582d9c4 skipped:
b06ba83b23 am:
437da4c13d -s ours
am:
f57c14b641 -s ours
Change-Id: Id5433baa969e08bd0253cb921bdaa541a1eaad3a
Bill Yi [Mon, 18 Jun 2018 06:55:44 +0000 (23:55 -0700)]
Merge changes from topic "am-
aabaca13-84ab-4de5-bfa1-
2add13867c06" into oc-dev
am:
3c047ea7fa
Change-Id: Ie97567da2988d921748f9b4ca86f658a5222f43b
Bill Yi [Mon, 18 Jun 2018 06:54:30 +0000 (23:54 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
cbc81e618d skipped:
693ad9800b am:
cb1a10f5b6 -s ours am:
d996012ef5 -s ours am:
97ee183747 -s ours am:
15123e0230 -s ours
am:
db9728b756 -s ours
Change-Id: I1e0ba0f8a4abff0ecd6a7b0523693e832870f1cd
Bill Yi [Mon, 18 Jun 2018 06:53:27 +0000 (23:53 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
422582d9c4 skipped:
b06ba83b23
am:
437da4c13d -s ours
Change-Id: I8227403ab7fa849fcc096d3a0acfa583843abf3b
Bill Yi [Mon, 18 Jun 2018 06:50:41 +0000 (23:50 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
cbc81e618d skipped:
693ad9800b am:
cb1a10f5b6 -s ours am:
d996012ef5 -s ours am:
97ee183747 -s ours
am:
15123e0230 -s ours
Change-Id: I1f7790c7a09b36424a524fa3010dd2b6fe43fc1e
Bill Yi [Mon, 18 Jun 2018 06:33:25 +0000 (23:33 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
cbc81e618d skipped:
693ad9800b am:
cb1a10f5b6 -s ours am:
d996012ef5 -s ours
am:
97ee183747 -s ours
Change-Id: I606378e5028548c5189a9fe554a868512112578c
TreeHugger Robot [Mon, 18 Jun 2018 06:27:04 +0000 (06:27 +0000)]
Merge changes from topic "am-
aabaca13-84ab-4de5-bfa1-
2add13867c06" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
422582d9c4 skipped:
b06ba83b23
[automerger skipped] Import translations. DO NOT MERGE skipped:
422582d9c4
Import translations. DO NOT MERGE
Bill Yi [Mon, 18 Jun 2018 06:26:21 +0000 (23:26 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
cbc81e618d skipped:
693ad9800b am:
cb1a10f5b6 -s ours
am:
d996012ef5 -s ours
Change-Id: Idcb8df6ed5993f00170408e685080aa525f291e1
TreeHugger Robot [Mon, 18 Jun 2018 06:22:15 +0000 (06:22 +0000)]
Merge "Remove unused parameter from TSMS IPC"
Bill Yi [Mon, 18 Jun 2018 06:18:56 +0000 (23:18 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
cbc81e618d skipped:
693ad9800b
am:
cb1a10f5b6 -s ours
Change-Id: Ib5adcfbe4afabfee3e391ec528272f210b408a10
Treehugger Robot [Mon, 18 Jun 2018 06:16:23 +0000 (06:16 +0000)]
Merge "Apf: Avoid constant overflow"
Kazuki Takise [Thu, 31 May 2018 06:32:19 +0000 (15:32 +0900)]
Add always on top feature support
Add basic functionalities for always on top feature.
- Add a new flag to WindowConfiguration to represent a task wanting to
be on top.
- Update the logic on changing the z-order of windows to make sure
always on top windows are placed above other windows.
Bug:
69370884
Test: go/wm-smoke
Test: atest DisplayContentTests
Test: Used ArcCompanionLibDemo app to verify that when always-on-top is
set, the app is above the other Android apps and Chrome windows.
Change-Id: Ie8edeb8ceeed0b9ec154b6031ed6cbe7ecc65b12
Yohei Yukawa [Mon, 18 Jun 2018 03:52:37 +0000 (20:52 -0700)]
Remove unused parameter from TSMS IPC
TextServicesManager always sets null to the "locale" parameter in
ITextServicesManager#getCurrentSpellCheckerSubtype then
TextServicesManagerService always ignores that parameter. It can be
safely removed.
Bug:
110275412
Test: Manually verified that spell checker still works
Change-Id: I5d85089899b0bd077f69971d77095859086a8d52
Wale Ogunwale [Tue, 8 May 2018 16:25:50 +0000 (09:25 -0700)]
Switched ActivityRecord.service to ActivityTaskManagerService (5/n)
Objects that contain or represent activities like ActivityRecord can
no longer rely on ActivityManagerService as it is going to be in a
different package.
Test: Existing tests pass
Test: go/wm-smoke-auto
Bug:
80414790
Change-Id: I7eabc9b80e494367d79ff7452c88ba82ff216bcd
Wale Ogunwale [Sun, 17 Jun 2018 20:41:31 +0000 (20:41 +0000)]
Merge "Moved mRecentTasks to ActivityManagerTaskService (4/n)"
Wale Ogunwale [Mon, 7 May 2018 22:00:49 +0000 (15:00 -0700)]
Moved mRecentTasks to ActivityManagerTaskService (4/n)
Test: Existing tests pass
Test: go/wm-smoke-auto
Bug:
80414790
Change-Id: I7e48eaf66200f689757578461076e9288b862b33
Android Build Merger (Role) [Sun, 17 Jun 2018 12:14:12 +0000 (12:14 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
422582d9c4 skipped:
b06ba83b23
Change-Id: Iae0ad51f828f91b8211e0671900f2ffa1265c655
Android Build Merger (Role) [Sun, 17 Jun 2018 12:14:05 +0000 (12:14 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
422582d9c4
Change-Id: I3f93da28223af89a03736689e7f35a723b864ff5
Bill Yi [Sun, 17 Jun 2018 12:13:32 +0000 (05:13 -0700)]
Import translations. DO NOT MERGE
Change-Id: I681a0e79a709f3cabf8b661ec5229480d99dd840
Auto-generated-cl: translation import
Android Build Merger (Role) [Sun, 17 Jun 2018 10:03:39 +0000 (10:03 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
cbc81e618d skipped:
693ad9800b
Change-Id: I387f439df9441d64a658344837e4a2bd0f88a128
Android Build Merger (Role) [Sun, 17 Jun 2018 10:03:31 +0000 (10:03 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
cbc81e618d
Change-Id: I6a3ddad855bdc4ae74eab3e6e2cd42290176aab4
Bill Yi [Sun, 17 Jun 2018 10:02:56 +0000 (03:02 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ied5693d3e59e24f43a7a1577471819c269c7d6df
Auto-generated-cl: translation import
Christopher Ferris [Sat, 16 Jun 2018 06:56:14 +0000 (23:56 -0700)]
[automerger skipped] Merge "Merge "Use the malloc debug heap dumper." am:
0ec0c17596 am:
84c9e9a787" into pi-dev-plus-aosp
am:
da5fb6eac7 -s ours
Change-Id: If0cfb06266b5d75dc50d900117a154b94823853b
Christopher Ferris [Sat, 16 Jun 2018 06:32:04 +0000 (23:32 -0700)]
[automerger skipped] Merge "Use the malloc debug heap dumper." am:
0ec0c17596 am:
84c9e9a787
am:
4d5ba2e496 -s ours
Change-Id: I4f1d4939e3b45b57dea8b8af2392501351e2b84b
Beverly [Sat, 16 Jun 2018 06:14:36 +0000 (23:14 -0700)]
Merge "Skip null values in Utils.safeForeach" into pi-dev am:
c5901f5a06
am:
e0d3e1c2d5
Change-Id: I9d1d3756c508771551b727755a1cab86e2aa4afb
Kevin Chyn [Sat, 16 Jun 2018 06:07:17 +0000 (23:07 -0700)]
Merge "Merge "Don't back up Assist Gesture setup/sensitivity" into pi-dev am:
a74fbef8ce" into pi-dev-plus-aosp
am:
fe611a5700
Change-Id: I1aba793c0c71573e06d52f14aec823a4f6d3ad93
Android Build Merger (Role) [Sat, 16 Jun 2018 05:58:39 +0000 (05:58 +0000)]
Merge "Merge "Use the malloc debug heap dumper." am:
0ec0c17596 am:
84c9e9a787" into pi-dev-plus-aosp
Christopher Ferris [Sat, 16 Jun 2018 05:58:09 +0000 (22:58 -0700)]
Merge "Use the malloc debug heap dumper." am:
0ec0c17596
am:
84c9e9a787
Change-Id: I96c46291cc73c021945c370c7bb33164bc0a3a0b
Colin Cross [Sat, 16 Jun 2018 05:56:59 +0000 (22:56 -0700)]
Merge "Fix ManifestMerger issues" am:
684b5f038b am:
c5e5b64b04
am:
6c40e4745d
Change-Id: Ide97a39158b8ec9310ded188fa9f75c6795fc2b5
Beverly [Sat, 16 Jun 2018 05:55:05 +0000 (22:55 -0700)]
Merge "Skip null values in Utils.safeForeach" into pi-dev
am:
c5901f5a06
Change-Id: I60c1ee2c2036b883a456d916e26576bb206a39ec
Android Build Merger (Role) [Sat, 16 Jun 2018 05:50:04 +0000 (05:50 +0000)]
Merge "Merge "Don't back up Assist Gesture setup/sensitivity" into pi-dev am:
a74fbef8ce" into pi-dev-plus-aosp
Kevin Chyn [Sat, 16 Jun 2018 05:49:30 +0000 (22:49 -0700)]
Merge "Don't back up Assist Gesture setup/sensitivity" into pi-dev
am:
a74fbef8ce
Change-Id: Ib14cc5a35991dec3623ecf2dfdb72cbbccd7e53e
Colin Cross [Sat, 16 Jun 2018 05:46:10 +0000 (22:46 -0700)]
Merge "Fix ManifestMerger issues" am:
684b5f038b
am:
c5e5b64b04
Change-Id: I4b8e51aaec1f825e4ccf7ccbc60e61b82e05c509
Christopher Ferris [Sat, 16 Jun 2018 05:41:30 +0000 (22:41 -0700)]
Merge "Use the malloc debug heap dumper."
am:
0ec0c17596
Change-Id: I0f0d6a01a4a0d55f18e3f7b7ac7c64534d4b8f54
TreeHugger Robot [Sat, 16 Jun 2018 03:16:06 +0000 (03:16 +0000)]
Merge "Skip null values in Utils.safeForeach" into pi-dev
TreeHugger Robot [Sat, 16 Jun 2018 00:44:22 +0000 (00:44 +0000)]
Merge "WM: Fix seamless rotation"
TreeHugger Robot [Sat, 16 Jun 2018 00:28:17 +0000 (00:28 +0000)]
Merge "Don't back up Assist Gesture setup/sensitivity" into pi-dev
TreeHugger Robot [Sat, 16 Jun 2018 00:10:10 +0000 (00:10 +0000)]
Merge "[Notif] Reset falsing check for blocking helper"
Colin Cross [Fri, 15 Jun 2018 23:59:21 +0000 (16:59 -0700)]
Merge "Fix ManifestMerger issues"
am:
684b5f038b
Change-Id: I4a551483dd3f0093f11b557a8ee6e6a99cace256
Selim Cinek [Fri, 15 Jun 2018 23:45:00 +0000 (16:45 -0700)]
Merge "Hiding replied notification icons from AOD" into pi-dev am:
37e96a8fa5
am:
0dac634ed0
Change-Id: I774d517aa5312c149c256c3955022fa28933cda9
Adrian Roos [Fri, 15 Jun 2018 23:39:35 +0000 (16:39 -0700)]
[automerger skipped] Merge changes I90451c14,I9fb27a0a into pi-dev am:
b91dd1d944
am:
22ffb55de6 -s ours
Change-Id: I29096c00ca57a4b872f31f3c79bf75239bef56be
Adrian Roos [Thu, 7 Jun 2018 13:29:34 +0000 (15:29 +0200)]
WM: Fix seamless rotation
With the introduction of the surface hierarchy, the seamless rotation
behavior in WSA is no longer correct: it also applies the WindowState's
offset, which leads to that being applied twice.
Instead of doing that, we simply rotate the WSA surface within the place
that WindowState dictates now.
Finally, the location of the WindowState itself also needs to be
transformed into the new orientation.
Fixes:
109927566
Test: atest CoordinateTransformsTest
Test: atest 'WindowStateTests#testSeamlesslyRotateWindow'
Change-Id: I9fb27a0a8a2bddc6ec88a4fcce6d6ea00929fb91
(cherry picked from commit
41f7e9d10306603c7a4410938e77418f13f6e939)
TreeHugger Robot [Fri, 15 Jun 2018 23:10:50 +0000 (23:10 +0000)]
Merge "Removed TODO introduced in ag/
4344061"
TreeHugger Robot [Fri, 15 Jun 2018 22:53:18 +0000 (22:53 +0000)]
Merge "Make oneway calls from AFM to AFMS."
TreeHugger Robot [Fri, 15 Jun 2018 22:28:27 +0000 (22:28 +0000)]
Merge "Fix missing entries in TSMS dump"
Selim Cinek [Fri, 15 Jun 2018 21:53:49 +0000 (14:53 -0700)]
Merge "Hiding replied notification icons from AOD" into pi-dev
am:
37e96a8fa5
Change-Id: I60a5aa171261b97b4f6de41515332fa93016eb8d
Adrian Roos [Fri, 15 Jun 2018 21:48:23 +0000 (14:48 -0700)]
Merge changes I90451c14,I9fb27a0a into pi-dev
am:
b91dd1d944
Change-Id: I58459846d6cb79d616b4bd9c83450dc911e5115c
Wale Ogunwale [Fri, 15 Jun 2018 21:47:46 +0000 (14:47 -0700)]
Removed TODO introduced in ag/
4344061
After further digging, we determined that the workaround is the
best way forward.
Change-Id: If046cdd16a22f0eec63a611eb21ce5e4c875896d
Fixes:
110159357
Test: N/A
TreeHugger Robot [Fri, 15 Jun 2018 21:44:28 +0000 (21:44 +0000)]
Merge "Update user on user switched for color inversion"
Felipe Leme [Wed, 6 Jun 2018 23:27:56 +0000 (16:27 -0700)]
Make oneway calls from AFM to AFMS.
AFM should not block the UI thread when calling AFMS; this CL is a
"low-hanging fruit" change that makes oneway call from the existing functions
that return void.
Test: mmma -j ./frameworks/base/apct-tests/perftests/autofill/ && \
adb install -r $OUT/data/app/AutofillPerfTests/AutofillPerfTests.apk && \
adb shell am instrument -w -e class android.view.autofill.LoginTest \
com.android.perftests.autofill/android.support.test.runner.AndroidJUnitRunner
Test: CtsAutoFillServiceTestCases
Bug:
73536867
Change-Id: I09e84b797153cd02d3c02262994a2be1f38639ea
Christopher Ferris [Fri, 15 Jun 2018 21:36:42 +0000 (21:36 +0000)]
Merge "Use the malloc debug heap dumper."
TreeHugger Robot [Fri, 15 Jun 2018 21:26:31 +0000 (21:26 +0000)]
Merge "Fixed an issue where the shadow wasn't rounded properly"
Yohei Yukawa [Fri, 15 Jun 2018 21:09:31 +0000 (14:09 -0700)]
Fix missing entries in TSMS dump
This CL fixes another regression that was introduced when we enabled
multiple users to use spell checker APIs at the same time [1].
Somehow TextServicesManagerService#mOnGoingSessionRequests were not
fully dumped into dumpsys due to an unnecessary '++j' in the loop.
[1]: I06c27ef834203a21cc445dc126602c799384527b
06a2624049f09e1ad68f8ab74fdb525aacd5c1e5
Bug:
63041121
Test: Manually verified that 'adb shell dumpsys textservices' dumps
all the elements in #mOnGoingSessionRequests.
Change-Id: Ia26ab1c8ca19e74aaefb8562fb06ff64c3d8d677
Treehugger Robot [Fri, 15 Jun 2018 20:47:30 +0000 (20:47 +0000)]
Merge "Fix ManifestMerger issues"
Selim Cinek [Fri, 15 Jun 2018 20:44:08 +0000 (20:44 +0000)]
Merge "Hiding replied notification icons from AOD" into pi-dev
Adrian Roos [Fri, 15 Jun 2018 20:28:13 +0000 (20:28 +0000)]
Merge changes I90451c14,I9fb27a0a into pi-dev
* changes:
DO NOT MERGE WM: correctly draw the rounded corner / cutout overlay during rotation
WM: Fix seamless rotation
Rohan Shah [Thu, 14 Jun 2018 20:14:18 +0000 (13:14 -0700)]
[Notif] Reset falsing check for blocking helper
Currently, if you long press on the notif in lock screen and then are
interacting with the blocking helper UI (NotificationInfo), the content
automatically closes after 8 seconds even if you've hit stop/undo/etc.
Instead of letting this happen, reset the timeout.
Test: Manually that it doesn't timeout after 8s on LS after update
Bug:
110213459
Change-Id: I0169a7749b718714595bd7239375308f30bf4c43
Christopher Ferris [Wed, 13 Jun 2018 20:19:57 +0000 (13:19 -0700)]
Use the malloc debug heap dumper.
Instead of having the malloc debug heap dump code live in frameworks
code, call into malloc debug to do the dump.
Test: Ran am dumpheap -n <PID> <FILE> of a process with and without
Test: malloc debug enabled.
Change-Id: I7911a3ee7dcbc79dd11003a24e27ff99c8301d43
Merged-In: I7911a3ee7dcbc79dd11003a24e27ff99c8301d43
(cherry picked from commit
38e2c3bc9c50770aa5efce47f90fbcfcdda523de)
Christopher Ferris [Fri, 15 Jun 2018 19:19:25 +0000 (19:19 +0000)]
Merge "Use the malloc debug heap dumper."
TreeHugger Robot [Fri, 15 Jun 2018 18:48:36 +0000 (18:48 +0000)]
Merge "Remove log spam in MediaRouter"
TreeHugger Robot [Fri, 15 Jun 2018 18:07:52 +0000 (18:07 +0000)]
Merge changes Idad77721,I9717ac4b
* changes:
Split internal interface activities from current AM interface (3/n)
Cancel Pip animation if stack is already removed
Eric Laurent [Fri, 15 Jun 2018 18:06:47 +0000 (11:06 -0700)]
Merge "audioservice: fix a2dp connection race condition" into pi-dev am:
706303541e
am:
94dce7ac8b
Change-Id: I001c3b390be7ee4e5522a5fd2599c9f34e6a7686
Android Build Merger (Role) [Fri, 15 Jun 2018 18:00:07 +0000 (18:00 +0000)]
[automerger] Merge "audioservice: fix a2dp connection race condition" into pi-dev am:
706303541e am:
c9abc289a0
Change-Id: Iabc86b907a6a430b824e876bab44b8cee192a71a
Eric Laurent [Fri, 15 Jun 2018 17:59:08 +0000 (10:59 -0700)]
Merge "audioservice: fix a2dp connection race condition" into pi-dev
am:
706303541e
Change-Id: I7ce96cb90aad6c826bbeb7be0e80950f2a89b517
OSDN Git Service
