Daniel Sandler
d425d4f74f
Merge "resolve merge conflicts of 9c9b26fba6 to master"
2019-06-26 22:18:26 +00:00
Dan Sandler
8300235b66
resolve merge conflicts of 9c9b26fba6 to master
...
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ia32b6803d06a99dc3f75fd63a96302928d29ce1c
2019-06-25 19:18:02 -04:00
Matt Pietal
9c9b26fba6
Merge "Sharesheet: Make max shortcut targets configurable" into qt-dev am: 8f09cd3de1
...
am: 9c9c561e8b
2019-06-25 13:55:32 -07:00
Matt Pietal
9c9c561e8b
Merge "Sharesheet: Make max shortcut targets configurable" into qt-dev
...
am: 8f09cd3de1
2019-06-25 13:12:35 -07:00
Govinda Wasserman
0c68fbda26
Add handle suppression to learned state
...
Also adds a phenotype flag to enable handles in the learned state once
per day.
Test: Tested locally
BUG:132983599
Change-Id: I21e422382e62ee098cd6ff76d6b764db98be0cb7
2019-06-25 18:26:33 +00:00
Eugene Susla
c08af8af49
Merge "Don't throw from PooledLambdaImpl#toString"
2019-06-24 17:16:35 +00:00
Matt Pietal
3ed20a7555
Sharesheet: Make max shortcut targets configurable
...
Allow different values for different devices
Bug: 135617408
Test: Manual
Change-Id: I01c27834d6218b9f5502976ee2a561eb73c364fc
2019-06-24 12:39:17 -04:00
TreeHugger Robot
1077ae03f3
Merge "Start process of next activity with top priority in advance"
2019-06-24 09:00:00 +00:00
Lorenzo Colitti
f80234a9b0
Merge changes If7d41052,I66f263d7,Id45ae956,Iba752fed,I575a7e4f, ... into qt-r1-dev
...
* changes:
Inline readNetworkStatsDetailInternal, make mUseBpfStats final
Remove VPN info arrays from NetworkStats(Observer|Recorder)
NetworkStatsFactory: Take VPNs into account for network/battery stats
Remove duplicate line in clat_simple test file
Remove unused lastStats parameter
Revert "Revert "Take all VPN underlying networks into account when migrating traffic for""
2019-06-24 03:37:23 +00:00
Dave Mankoff
e0321d5809
DO NOT MERGE Allow the new BrightLineFalsingManager to be enabled via PhenoType.
...
Test: atest SystemUITests
Bug: 111394067
Change-Id: I0ab9a72d66bf56a56df2de2ad2d247f299d1b748
Merged-In: I0ab9a72d66bf56a56df2de2ad2d247f299d1b748
2019-06-22 14:19:01 +00:00
Dave Mankoff
a98c6e3e2c
Merge "Allow the new BrightLineFalsingManager to be enabled via PhenoType."
2019-06-22 14:18:24 +00:00
Eugene Susla
7f000e1dd9
Don't throw from PooledLambdaImpl#toString
...
Bug: 134594642
Test: presubmit
Change-Id: Ia0834a76e7ae9a222ec2698dcd989317bb20f2a0
2019-06-21 18:27:24 -07:00
Dave Mankoff
e941dd8918
DO NOT MERGE Allow the new BrightLineFalsingManager to be enabled via PhenoType.
...
am: 84c07e9f1a
2019-06-21 16:40:12 -07:00
Andreas Gampe
4fc0de746f
Merge changes Ie70d0155,I0692a91d,I8c5041a4 am: 4507201da5 am: 70ad27cfb5 am: e4a6ca7231
...
am: 89e543fe54
2019-06-21 14:05:31 -07:00
Andreas Gampe
89e543fe54
Merge changes Ie70d0155,I0692a91d,I8c5041a4 am: 4507201da5 am: 70ad27cfb5
...
am: e4a6ca7231
2019-06-21 13:57:26 -07:00
Andreas Gampe
e4a6ca7231
Merge changes Ie70d0155,I0692a91d,I8c5041a4 am: 4507201da5
...
am: 70ad27cfb5
2019-06-21 13:52:40 -07:00
Dave Mankoff
84c07e9f1a
DO NOT MERGE Allow the new BrightLineFalsingManager to be enabled via PhenoType.
...
Test: atest SystemUITests
Bug: 111394067
Change-Id: I0ab9a72d66bf56a56df2de2ad2d247f299d1b748
2019-06-21 20:43:14 +00:00
Dave Mankoff
92c2bfb6e5
Allow the new BrightLineFalsingManager to be enabled via PhenoType.
...
Test: atest SystemUITests
Bug: 111394067
Change-Id: I0ab9a72d66bf56a56df2de2ad2d247f299d1b748
2019-06-21 19:35:47 +00:00
Benedict Wong
edcd5ad555
Revert "Revert "Take all VPN underlying networks into account when migrating traffic for""
...
This reverts commit d8220c2050a84d9fa572
2019-06-21 01:09:49 +00:00
Andreas Gampe
8695b40720
LockAgent: Add option to synthesize Java crash logging
...
Add the ability to dump a "crash" to logcat.
Test: m
Test: manual
Change-Id: I0692a91df995883e526a718fe95f0d3568ac9328
2019-06-20 16:31:58 -07:00
Neil Fuller
a8b7b88c24
Merge "Merge "Remove unused class" am: 09f6675744 am: 04ecb95ea9 am: 15199a5868" into qt-r1-dev-plus-aosp
...
am: 7d84adaf44
2019-06-20 14:40:55 -07:00
Neil Fuller
d5cbad9f53
Merge "Remove unused class" am: 09f6675744 am: 04ecb95ea9
...
am: 15199a5868
2019-06-20 14:17:53 -07:00
Neil Fuller
15199a5868
Merge "Remove unused class" am: 09f6675744
...
am: 04ecb95ea9
2019-06-20 14:04:12 -07:00
Eugene Susla
0a23feb460
[DO NOT MERGE] Fix race in AbstractSinglePendingRequestRemoteService am: 45fcf147c1
...
am: aee049db67
2019-06-19 20:32:13 -07:00
Eugene Susla
aae1c818e2
[DO NOT MERGE] Fix race in AbstractSinglePendingRequestRemoteService
...
am: 45fcf147c1
2019-06-19 20:26:50 -07:00
Eugene Susla
aee049db67
[DO NOT MERGE] Fix race in AbstractSinglePendingRequestRemoteService
...
am: 45fcf147c1
2019-06-19 20:26:47 -07:00
Eugene Susla
45fcf147c1
[DO NOT MERGE] Fix race in AbstractSinglePendingRequestRemoteService
...
Fixes: 135355306
Test: presubmit
Change-Id: I78d9840a9d7e04cd373c967b259a614990153841
2019-06-20 01:50:48 +00:00
Tim Joines
a618e7d375
Merge "Add config to control full task snapshot scale" into qt-dev am: 10b9def7cb am: 2ca532cd57
...
am: 95eb5e7311
2019-06-19 16:38:11 -07:00
Tim Joines
95eb5e7311
Merge "Add config to control full task snapshot scale" into qt-dev am: 10b9def7cb
...
am: 2ca532cd57
2019-06-19 15:57:45 -07:00
Tim Joines
2b9196611e
Merge "Add config to control full task snapshot scale" into qt-dev
...
am: 10b9def7cb
2019-06-19 15:03:46 -07:00
Tim Joines
2ca532cd57
Merge "Add config to control full task snapshot scale" into qt-dev
...
am: 10b9def7cb
2019-06-19 14:55:32 -07:00
Matt Casey
353402fc4a
Merge "Add ASSIST_TAP_PASSTHROUGH flag." into qt-r1-dev am: 6f66bdb57c
...
am: d92702b4f5
2019-06-19 10:23:12 -07:00
Matt Casey
d92702b4f5
Merge "Add ASSIST_TAP_PASSTHROUGH flag." into qt-r1-dev
...
am: 6f66bdb57c
2019-06-19 10:16:08 -07:00
Matt Casey
e1ff28dabc
Add ASSIST_TAP_PASSTHROUGH flag.
...
Make PhenotypeHelper public.
Bug: 135459244
Test: Manual via adb
Change-Id: I039552bdfde1b0c3ff481af5b4f8813091112391
2019-06-19 09:33:10 -04:00
Winson Chung
ffde2ea8e5
Add config to control full task snapshot scale
...
- Also save the scale with the snapshot data instead of trying to infer it
from the state
- Also recycle the reduced resolution snapshot copy after writing it
Bug: 135150767
Test: atest TaskSnapshotPersisterLoaderTest
Change-Id: I64a9ccf16f3966ad5c6d07ff0b6ce8e9dd710e40
2019-06-18 14:12:25 -07:00
Vishnu Nair
f7645aa9a9
Prevent SurfaceView from drawing over parent surface insets
...
Parent SurfaceView to a bounds layer that enforces a crop preventing it
from drawing over the surface insets. The bounds layer crop is set to the
surface insets and updated when the parent surface size changes or the
parent surface insets change.
If the SurfaceView children are reparented to another client surface
then ensure the SurfaceView relative layer info is updated correctly.
Bug: 132205507
Test: go/wm-smoke
Test: test preserve surfaces codepath with split screen and ensure relative z is preserved
Test: test surfaceview apps, youtube, maps & camera.
Test: try to repro maps pip issue described in bug
Change-Id: I14c2f7603345ad89f0af4db48150b05d8ada602a
2019-06-18 12:49:24 -07:00
Varun Anand
2135806a00
Merge changes Ieb8645ac,I6466ec14,I87deb82b,I995b108e,Ib6521459 am: f4c10e8bc2 am: 48f59a0fdf am: 2471441b2d
...
am: 8775b0a135
2019-06-17 10:59:29 -07:00
Varun Anand
8775b0a135
Merge changes Ieb8645ac,I6466ec14,I87deb82b,I995b108e,Ib6521459 am: f4c10e8bc2 am: 48f59a0fdf
...
am: 2471441b2d
2019-06-17 10:43:22 -07:00
Varun Anand
2471441b2d
Merge changes Ieb8645ac,I6466ec14,I87deb82b,I995b108e,Ib6521459 am: f4c10e8bc2
...
am: 48f59a0fdf
2019-06-17 10:33:53 -07:00
Neil Fuller
fb402670bb
Remove unused class
...
This class is no longer used and can be removed.
Bug: 16550209
Test: build / boot / treehugger
Change-Id: I31b9491a57a1246656bb549aa3435b77ab12b8d6
2019-06-17 16:44:28 +01:00
Lucas Dupin
4e727a813b
Merge "Do not let pattern be dragged" into qt-r1-dev am: 1cab79144c
...
am: d74516fa9e
2019-06-14 10:54:08 -07:00
Lucas Dupin
d74516fa9e
Merge "Do not let pattern be dragged" into qt-r1-dev
...
am: 1cab79144c
2019-06-14 10:38:52 -07:00
Lucas Dupin
1cab79144c
Merge "Do not let pattern be dragged" into qt-r1-dev
2019-06-14 17:25:18 +00:00
Hui Yu
5bd549f1d6
Merge "Fix the missing longwake finish event problem." into qt-dev am: eb5532eac8 am: f832f61e1c
...
am: 9b15a84247
2019-06-13 20:08:16 -07:00
Hui Yu
9b15a84247
Merge "Fix the missing longwake finish event problem." into qt-dev am: eb5532eac8
...
am: f832f61e1c
2019-06-13 19:16:55 -07:00
Hui Yu
9561558259
Merge "Fix the missing longwake finish event problem." into qt-dev
...
am: eb5532eac8
2019-06-13 19:11:28 -07:00
Hui Yu
f832f61e1c
Merge "Fix the missing longwake finish event problem." into qt-dev
...
am: eb5532eac8
2019-06-13 18:56:06 -07:00
TreeHugger Robot
eb5532eac8
Merge "Fix the missing longwake finish event problem." into qt-dev
2019-06-14 01:03:34 +00:00
Lucas Dupin
fc8de93eed
Do not let pattern be dragged
...
Test: drag accross pattern
Test: start dragging from edges
Test: start drawing, drag outside the bounds
Test: repeat on small and large device
Fixes: 132687980
Change-Id: Idab9279dd7cb002cbd43aab0ce1d48f265d39f04
2019-06-13 15:48:49 -07:00
Benedict Wong
a84d9fa572
Revert "Revert "Take all VPN underlying networks into account when migrating traffic for""
...
This reverts commit d8220c2050
2019-06-13 15:36:27 -07:00
