Neil Fuller
a8b7b88c24
Merge "Merge "Remove unused class" am: 09f6675744 am: 04ecb95ea9 am: 15199a5868" into qt-r1-dev-plus-aosp
...
am: 7d84adaf44
Change-Id: I771fadd49889a0906a304c20d5ad5f7a7e25e3bb
2019-06-20 14:40:55 -07:00
Neil Fuller
d5cbad9f53
Merge "Remove unused class" am: 09f6675744 am: 04ecb95ea9
...
am: 15199a5868
Change-Id: I35170185229a0e00f8b8f22f9560e49d844972c6
2019-06-20 14:17:53 -07:00
Neil Fuller
15199a5868
Merge "Remove unused class" am: 09f6675744
...
am: 04ecb95ea9
Change-Id: I2f9c971db885bf7309438f2f44b18de4df62a709
2019-06-20 14:04:12 -07:00
Eugene Susla
0a23feb460
[DO NOT MERGE] Fix race in AbstractSinglePendingRequestRemoteService am: 45fcf147c1
...
am: aee049db67
Change-Id: Id106829fd802a7efd92562648508b14fa32bce50
2019-06-19 20:32:13 -07:00
Eugene Susla
aae1c818e2
[DO NOT MERGE] Fix race in AbstractSinglePendingRequestRemoteService
...
am: 45fcf147c1
Change-Id: I8283708a92b86721426bf35888f486883189319a
2019-06-19 20:26:50 -07:00
Eugene Susla
aee049db67
[DO NOT MERGE] Fix race in AbstractSinglePendingRequestRemoteService
...
am: 45fcf147c1
Change-Id: Ia01a95311ee3b38be9a9ce8aa97039294f8a66c2
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
Change-Id: I7466888328a6c31ecc0e97b3a068c5ca8f3b9edd
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
Change-Id: Ia5cee2b1bbb5507f10604cb9e722f816d31b30e6
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
Change-Id: I6e07c1e6d9aa300e42e27daa10ad048af56fc40b
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
Change-Id: Ic834d26d4f2196a390feb8b2268d42e87d8a9ab1
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
Change-Id: I7d65f2955dd06f81f115dd960ae69fbf5048b3a5
2019-06-19 10:23:12 -07:00
Matt Casey
d92702b4f5
Merge "Add ASSIST_TAP_PASSTHROUGH flag." into qt-r1-dev
...
am: 6f66bdb57c
Change-Id: I53a64b281d2f3a78ad7a6fc011a7b01be25cfb8f
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
Change-Id: I8415a7c91158cce99e91e6054ed4f40e44563b89
2019-06-17 10:59:29 -07:00
Varun Anand
8775b0a135
Merge changes Ieb8645ac,I6466ec14,I87deb82b,I995b108e,Ib6521459 am: f4c10e8bc2 am: 48f59a0fdf
...
am: 2471441b2d
Change-Id: I16884eef6e2b8d64031363cfb4adacc4a0a9ead7
2019-06-17 10:43:22 -07:00
Varun Anand
2471441b2d
Merge changes Ieb8645ac,I6466ec14,I87deb82b,I995b108e,Ib6521459 am: f4c10e8bc2
...
am: 48f59a0fdf
Change-Id: I960e94b03b29282ae2b03f78a19ed2692bd88e05
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
Change-Id: Ia835025e83a35963006e491768a4319e3c34e153
2019-06-14 10:54:08 -07:00
Lucas Dupin
d74516fa9e
Merge "Do not let pattern be dragged" into qt-r1-dev
...
am: 1cab79144c
Change-Id: Ic0da5806f78a0fdc026c504e9f8a96bef4e862d3
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
Change-Id: I37fe407275142e361decb0bf129e9ac8ef3ab850
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
Change-Id: I33f89a30e0daccaa40c938997e984ad1099cb2a3
2019-06-13 19:16:55 -07:00
Hui Yu
9561558259
Merge "Fix the missing longwake finish event problem." into qt-dev
...
am: eb5532eac8
Change-Id: I4f1b554cbf5f9da1b7a922ce89b77537b6be6667
2019-06-13 19:11:28 -07:00
Hui Yu
f832f61e1c
Merge "Fix the missing longwake finish event problem." into qt-dev
...
am: eb5532eac8
Change-Id: Ie082baea99603bba6847da9cfdd959f6f5d01461
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 .
Reason for revert: Fix available for deadlocks.
Bug: 134244752
Change-Id: Ib65214598837289bd39dbf040b56ab7835f893ba
2019-06-13 15:36:27 -07:00
Hui Yu
5b4edd6038
Fix the missing longwake finish event problem.
...
When starting a new batteystats history file, before inserting a new
CMD_CURRENT_TIME HistoryItem at beginning of the history
buffer, make a copy of the current HistoryItem. Otherwise the current
HistoryItem could be overriden by the CMD_CURRENT_TIME and we lose
a HistoryItem.
In b/130083227, the longwake start event happends before opening the new
history file, after CMD_CURRENT_TIME event, the longwake finish event
is missing. The fix is to make a copy of current HistoryItem before
adding CMD_CURRENT_TIME event.
Change-Id: I5048f98b6b47f54336fb01e354fb5a6284c84b43
Fix: 130083227
Test: b/130083227 can be reproduced by createFakeHistoryEvents() call,
missing longwake finish event can be seen after "TIME:" record. With the
fix, no more missing longwake finish event after "TIME:" record.
“adb shell dumpsys batterystats --history-create-events 50000” to
create enough events to start new history files,
“adb shell dumpsys batterystats --history” to observe all history records.
2019-06-13 10:42:48 -07:00
Paul Crowley
3b7cc8a0e5
Merge "Create String before bundling AsyncTask" into qt-dev am: 3d0fbc98f8 am: 681ac74bd0
...
am: 63016e88c2
Change-Id: I43a36a7a5cfb1eb96ebcde17412cd10c8cc2b6a8
2019-06-12 18:15:04 -07:00
Paul Crowley
63016e88c2
Merge "Create String before bundling AsyncTask" into qt-dev am: 3d0fbc98f8
...
am: 681ac74bd0
Change-Id: I0d9ac43c8577ad632a9cd3300e804ec564019aeb
2019-06-12 16:54:27 -07:00
Paul Crowley
681ac74bd0
Merge "Create String before bundling AsyncTask" into qt-dev
...
am: 3d0fbc98f8
Change-Id: I9eec3eed0a5f8088976f9d86ab69fa4292597b68
2019-06-12 16:47:59 -07:00
Paul Crowley
81e014ce88
Merge "Create String before bundling AsyncTask" into qt-dev
...
am: 3d0fbc98f8
Change-Id: If2610098bef68780782e0a11014b97efd0f38a70
2019-06-12 16:46:17 -07:00
TreeHugger Robot
3d0fbc98f8
Merge "Create String before bundling AsyncTask" into qt-dev
2019-06-12 23:35:30 +00:00
Christian Wailes
6206fea8d3
Merge "Removes unused code from the SystemServer/Zygote classes." into qt-dev am: 7983bfb3e6
...
am: 63af175cf3
Change-Id: Ie595da6c0c53573aeeedd06621f445674a53725a
2019-06-12 13:12:25 -07:00
Christian Wailes
2997615e73
Merge "Removes unused code from the SystemServer/Zygote classes." into qt-dev
...
am: 7983bfb3e6
Change-Id: If63d2cbe8b3ba2061276826f88496db8ea283510
2019-06-12 13:09:40 -07:00
Christian Wailes
63af175cf3
Merge "Removes unused code from the SystemServer/Zygote classes." into qt-dev
...
am: 7983bfb3e6
Change-Id: Icd72a60403a1cec0db1dc72251ab241c7aa60d41
2019-06-12 13:06:29 -07:00
Christian Wailes
7983bfb3e6
Merge "Removes unused code from the SystemServer/Zygote classes." into qt-dev
2019-06-12 19:45:41 +00:00
Jorim Jaggi
be9b13765a
Merge "Draw legacy nav bar background directly" into qt-dev am: 324cdd4ae0 am: c2b065cf90
...
am: 7145077860
Change-Id: I766e9709d0c6e5886076a7c7bae29f561366bbaa
2019-06-12 11:48:35 -07:00
Jorim Jaggi
7145077860
Merge "Draw legacy nav bar background directly" into qt-dev am: 324cdd4ae0
...
am: c2b065cf90
Change-Id: If80e9ace51c78ad7814e60a6dfa0a00454420091
2019-06-12 11:36:10 -07:00
Jorim Jaggi
c2b065cf90
Merge "Draw legacy nav bar background directly" into qt-dev
...
am: 324cdd4ae0
Change-Id: Iaf32f0a0c5d72008240eb1588273f1dde7633148
2019-06-12 11:23:28 -07:00
Jorim Jaggi
e335ed3ca4
Merge "Draw legacy nav bar background directly" into qt-dev
...
am: 324cdd4ae0
Change-Id: I3291e2788df951510c5abf3a23df226d5174a5c5
2019-06-12 11:22:27 -07:00
Christian Wailes
013c7d23df
Merge "Improved timekeeping logic for USAP Pool refill mechanism."
2019-06-12 17:12:09 +00:00
Jorim Jaggi
86d30ff8e3
Draw legacy nav bar background directly
...
If we only use a view for it, it may not be visible depending on
what the app will do with the DecorView, i.e. set a weird clip
region. To fix that, we also draw the legacy navigation bar
background separately in a post-draw callback.
Test: TikTok
Test: Material app is still able to set bar color
Fixes: 131211797
Change-Id: Id744b98780f8f7f6dcd3482803a680a8f93be4c5
2019-06-12 18:19:41 +02:00
Lucas Dupin
4b8540a4f6
Merge "Fix unreadable clock" into qt-dev
...
am: c442c8e5f5
Change-Id: Ifc3d184fbd856df515bfa527028c8e736572e14e
2019-06-11 23:50:31 -07:00
Lucas Dupin
c442c8e5f5
Merge "Fix unreadable clock" into qt-dev
2019-06-12 06:24:52 +00:00
Lucas Dupin
d6dc382ba9
Fix unreadable clock am: 89233c49aa
...
am: 648b5d4b3b
Change-Id: I3fa8be16f2baf15e8f22251ffa6b41a147b621c3
2019-06-11 21:36:25 -07:00
Lucas Dupin
648b5d4b3b
Fix unreadable clock
...
am: 89233c49aa
Change-Id: Ib2dff9f3dbc0359daf297d349bf8671969db9e7e
2019-06-11 21:31:22 -07:00