Commit Graph

428402 Commits

Author SHA1 Message Date
Gavin Corkery
0dbbe879cb Merge "Perform userdata backup for all matching rollbacks" into qt-dev am: 33946144bd am: f550948c4c
am: bfea9bb51a

Change-Id: I03ace66a760ea1e74770a7a0838d3f36652d26b0
2019-06-05 08:51:55 -07:00
Gavin Corkery
bfea9bb51a Merge "Perform userdata backup for all matching rollbacks" into qt-dev am: 33946144bd
am: f550948c4c

Change-Id: I0e43b7834bc63ec015425a5b661581ce058ab133
2019-06-05 08:46:51 -07:00
Christian Brunschen
7baed4ac29 Merge "Support handling multiple static mocks." 2019-06-05 15:43:14 +00:00
Gavin Corkery
f550948c4c Merge "Perform userdata backup for all matching rollbacks" into qt-dev
am: 33946144bd

Change-Id: I34ad8d94c90a76f422320dbdd6fbed6318bbe878
2019-06-05 08:40:52 -07:00
Gavin Corkery
33946144bd Merge "Perform userdata backup for all matching rollbacks" into qt-dev 2019-06-05 15:29:22 +00:00
Antoan Angelov
2fe0a50133 Merge "Update docs for EXTRA_PROVISIONING_SKIP_EDUCATION_SCREENS." into qt-dev am: dad55ca4fe am: 5b92640550
am: 553ac409d5

Change-Id: I059749ef472a8a0f65d60a309923bf1231f2adb1
2019-06-05 07:40:02 -07:00
Antoan Angelov
553ac409d5 Merge "Update docs for EXTRA_PROVISIONING_SKIP_EDUCATION_SCREENS." into qt-dev am: dad55ca4fe
am: 5b92640550

Change-Id: I6690506fb20f936dc8dfecc4a472b068fae1dd6a
2019-06-05 07:35:16 -07:00
Antoan Angelov
5b92640550 Merge "Update docs for EXTRA_PROVISIONING_SKIP_EDUCATION_SCREENS." into qt-dev
am: dad55ca4fe

Change-Id: If15fbd686362059e97438769f3010946d6c95261
2019-06-05 07:30:17 -07:00
Antoan Angelov
dad55ca4fe Merge "Update docs for EXTRA_PROVISIONING_SKIP_EDUCATION_SCREENS." into qt-dev 2019-06-05 14:17:39 +00:00
Christian Brunschen
58bfeec99c Support handling multiple static mocks.
This CL introduces a "StaticMockFixture" interface that allows
setting up the classes to be mocked in a StaticMockitoSessionBuilder
and separately setting up the default behaviour of the so-mocked classes,
as well as tearing them down.

It also introduces a StaticMockFixtureRule that takes some number of
StaticMockFixture instances or suppliers thereof, and manages them all
within the same StaticMockitoSession and its builder.

This in turn allows us to use such a StaticMockFixtureRule to orchestrate
the automatic set-up and tear-down of different sets of static mocks, all
within the same StatickMockitoSession, since juggling multiple
StaticMockitoSessions turns out to be tricky and full of pitfalls.

Finally this change refactors TestableDeviceConfig to become a
StaticMockFixture which can then be used together with other static
mocks, and to separately offer a TestableDeviceConfigRule that can be
used when no other static mocks are required to manage the
TestableDeviceConfig on its own.

Change-Id: Icd88736390699e8956cd3d6923636afc0e015440
Test: included in CL.
Bug: 129937393
2019-06-05 14:08:49 +00:00
Louis Chang
36259ba07c Merge "Do not resume activities that were launched behind" into qt-dev am: 35885e0769 am: 6ac48df5fa
am: dc824463fa

Change-Id: Ib34389e8b2695c7c8f96c6933e09bf15fc30ef07
2019-06-05 06:33:54 -07:00
Matt Pietal
928cde09da Merge "Sharesheet - Adjust button bar insets" into qt-dev am: 83375a391c am: 77a4ce2015
am: 3efac1e507

Change-Id: I0897972a9435ff25c428e23978c2ee9993d8f3d0
2019-06-05 06:28:52 -07:00
Louis Chang
dc824463fa Merge "Do not resume activities that were launched behind" into qt-dev am: 35885e0769
am: 6ac48df5fa

Change-Id: I8e393c8d81fed0dca811e3aa3781978809fdb5a9
2019-06-05 06:28:50 -07:00
Louis Chang
6ac48df5fa Merge "Do not resume activities that were launched behind" into qt-dev
am: 35885e0769

Change-Id: Ia94bd35304d3062148085d76cd333c5f99a1adfc
2019-06-05 06:23:51 -07:00
Matt Pietal
3efac1e507 Merge "Sharesheet - Adjust button bar insets" into qt-dev am: 83375a391c
am: 77a4ce2015

Change-Id: I706e05838e6d2e49f0263c7635d1c2c0add021b6
2019-06-05 06:23:50 -07:00
Matt Pietal
77a4ce2015 Merge "Sharesheet - Adjust button bar insets" into qt-dev
am: 83375a391c

Change-Id: I7a3c30dd216d2b5ad39327244cca4797e8eae28b
2019-06-05 06:19:14 -07:00
TreeHugger Robot
35885e0769 Merge "Do not resume activities that were launched behind" into qt-dev 2019-06-05 13:17:33 +00:00
TreeHugger Robot
83375a391c Merge "Sharesheet - Adjust button bar insets" into qt-dev 2019-06-05 13:02:51 +00:00
Gavin Corkery
237dd8123b Perform userdata backup for all matching rollbacks
Currently, the snapshot of userdata is performed by traversing
the list of rollbacks and matching based on the package name, returning
once a match is found and the userdata has been backed up. There may
be cases where multiple rollbacks match this package name, so we should
not return until we have checked all rollbacks.

Bug: 134485920
Test: atest RollbackTest
Test: atest StagedRollbackTest
Change-Id: If6051ba11b2163e282e7bb61ff02e669ba1079ab
2019-06-05 13:39:26 +01:00
Tiger Huang
e87acb2211 Merge "Fix a bug about missing committing app visibility" into qt-dev am: c5d71fc809 am: 9d27ea7688
am: 279d00016b

Change-Id: I93219c347f7ce03ef621922ee819f2d4a9446057
2019-06-05 05:17:40 -07:00
Tiger Huang
279d00016b Merge "Fix a bug about missing committing app visibility" into qt-dev am: c5d71fc809
am: 9d27ea7688

Change-Id: I2e039a5001f5fe5a024a33e535c20099a9d2dce4
2019-06-05 05:12:38 -07:00
Tiger Huang
9d27ea7688 Merge "Fix a bug about missing committing app visibility" into qt-dev
am: c5d71fc809

Change-Id: Ie3576830999c64057df9afecf94a8f273a6f036e
2019-06-05 05:07:39 -07:00
Michael Wright
d5191e2501 Merge "Uncanonicalize URIs when searching for audio-coupled haptics." into qt-dev am: eeffe0c9dd am: 2a0fe26b6c
am: 47dcb39014

Change-Id: I0ff242a8e2970c6b7b89f103f35ccf55ee236791
2019-06-05 05:07:38 -07:00
Michael Wright
47dcb39014 Merge "Uncanonicalize URIs when searching for audio-coupled haptics." into qt-dev am: eeffe0c9dd
am: 2a0fe26b6c

Change-Id: If778b441cc54d6f6f7cc930a925b1fd8c76bb62f
2019-06-05 04:56:17 -07:00
Michael Wright
2a0fe26b6c Merge "Uncanonicalize URIs when searching for audio-coupled haptics." into qt-dev
am: eeffe0c9dd

Change-Id: If35ea6e4c2864f83f22a50f02b14cc62747157d1
2019-06-05 04:51:19 -07:00
TreeHugger Robot
c5d71fc809 Merge "Fix a bug about missing committing app visibility" into qt-dev 2019-06-05 11:45:42 +00:00
TreeHugger Robot
eeffe0c9dd Merge "Uncanonicalize URIs when searching for audio-coupled haptics." into qt-dev 2019-06-05 11:31:25 +00:00
Matt Pietal
78fdbd492f Sharesheet - Adjust button bar insets
Button bar insets were set before the inset callback. Add a call to
layout the button bar during the inset callback.

Bug: 134472146
Test: Steps from defect
Change-Id: I0246f06315cd05343002071dd6d217d41e0059ca
2019-06-05 07:09:17 -04:00
Jorim Jaggi
ce2a9deec1 Merge "Do not hold lock when trying to get snapshot" into qt-dev am: beee882cdf am: 22af845b32
am: de84e40444

Change-Id: Iea01d700fa008aeeaf17c583f09520935532f398
2019-06-05 03:22:31 -07:00
Jorim Jaggi
de84e40444 Merge "Do not hold lock when trying to get snapshot" into qt-dev am: beee882cdf
am: 22af845b32

Change-Id: I14bca9512f308232541c59cddf9ca87115226c49
2019-06-05 03:17:28 -07:00
Jorim Jaggi
22af845b32 Merge "Do not hold lock when trying to get snapshot" into qt-dev
am: beee882cdf

Change-Id: Icbd4457f3cfdfe3798f46322f98e626bd6477916
2019-06-05 03:12:30 -07:00
Tiger Huang
c9d0d00392 Fix a bug about missing committing app visibility
If we have pending transitions, committing visibility would be delayed
until the opening apps are all drawn. However, the original logic in
AppWindowToken.transferStartingWindow would just remove the app from
mOpeningApps which caused the app visibility would not be committed.

This CL doesn't remove the app from mOpeningApps while transferring the
starting window. Instead, we set a flag to indicate that we no longer
need to apply an animation to the app. In this way, the app visibility
will be committed.

Fix: 131180307
Test: atest WindowManagerSmokeTest
Test: Steps in the bug
Change-Id: Ia84d73136dcbda07ae055b91f5a038e1bc070d2a
2019-06-05 18:02:04 +08:00
Jorim Jaggi
beee882cdf Merge "Do not hold lock when trying to get snapshot" into qt-dev 2019-06-05 10:00:16 +00:00
Brad Ebinger
cf552bff32 [automerger skipped] Merge "Switch DDS during MSIM emergency call" into qt-dev am: fcc6df7c6d -s ours am: 347156030d -s ours
am: b5d8547d0f -s ours
am skip reason: change_id Ic49e126ae0abfe71edd1fe000c2a0dfd2360dece with SHA1 cb95725b71 is in history

Change-Id: Id5bfd08c74720db0f69c54d5ed91cf6b2e56244f
2019-06-05 01:53:01 -07:00
Brad Ebinger
5cbfa77774 [automerger skipped] Switch DDS during MSIM emergency call am: 1faea364d3 -s ours am: d90074cc39 -s ours
am: 564afd93a1 -s ours
am skip reason: change_id Ic49e126ae0abfe71edd1fe000c2a0dfd2360dece with SHA1 cb95725b71 is in history

Change-Id: Icd73b752d0d712e492ae8e87d7a2bb0c57d8d52c
2019-06-05 01:44:50 -07:00
Bill Yi
e0472dbd0c [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: d10a92f20c -s ours am: 7ff21652bc -s ours
am: 07ffaa8403 -s ours
am skip reason: subject contains skip directive

Change-Id: I2ea91a9db10a7bd0bc7cc6a4e2de0be56b16a54d
2019-06-05 01:43:41 -07:00
Bill Yi
5b193f44a3 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 9d6d37ad3a -s ours am: 84c120a610 -s ours
am: c2bcc4f7c1 -s ours
am skip reason: subject contains skip directive

Change-Id: I11bc0426f7d2890a892b01f1fe7eaa816d68846a
2019-06-05 01:41:48 -07:00
Brad Ebinger
b5d8547d0f [automerger skipped] Merge "Switch DDS during MSIM emergency call" into qt-dev am: fcc6df7c6d -s ours
am: 347156030d -s ours
am skip reason: change_id Ic49e126ae0abfe71edd1fe000c2a0dfd2360dece with SHA1 cb95725b71 is in history

Change-Id: I128f15ba27a8e00b171e6761aeb62f2de56799ea
2019-06-05 01:31:19 -07:00
Brad Ebinger
564afd93a1 [automerger skipped] Switch DDS during MSIM emergency call am: 1faea364d3 -s ours
am: d90074cc39 -s ours
am skip reason: change_id Ic49e126ae0abfe71edd1fe000c2a0dfd2360dece with SHA1 cb95725b71 is in history

Change-Id: I4751556ab8432a7f972447c30040ce4616c8d8cd
2019-06-05 01:28:34 -07:00
Bill Yi
07ffaa8403 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: d10a92f20c -s ours
am: 7ff21652bc -s ours
am skip reason: subject contains skip directive

Change-Id: I7199d9e4e13077d22d045d0531fab7552d7f0f13
2019-06-05 01:27:11 -07:00
Bill Yi
c2bcc4f7c1 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 9d6d37ad3a -s ours
am: 84c120a610 -s ours
am skip reason: subject contains skip directive

Change-Id: Icc0afd688ddff4cd22509215ba5ddd3225579811
2019-06-05 01:25:19 -07:00
Brad Ebinger
347156030d [automerger skipped] Merge "Switch DDS during MSIM emergency call" into qt-dev
am: fcc6df7c6d -s ours
am skip reason: change_id Ic49e126ae0abfe71edd1fe000c2a0dfd2360dece with SHA1 cb95725b71 is in history

Change-Id: Ic23e9f325da7be8aee66ff0491a2a68cb706d990
2019-06-05 01:15:46 -07:00
Brad Ebinger
d90074cc39 [automerger skipped] Switch DDS during MSIM emergency call
am: 1faea364d3 -s ours
am skip reason: change_id Ic49e126ae0abfe71edd1fe000c2a0dfd2360dece with SHA1 cb95725b71 is in history

Change-Id: Ia5fab5c0adcf7648f7a11853e33d2adca73ea932
2019-06-05 01:11:42 -07:00
Bill Yi
7ff21652bc [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: d10a92f20c -s ours
am skip reason: subject contains skip directive

Change-Id: I5f252cfd0b8139b027a0059f842fe654c6d24c0a
2019-06-05 01:10:25 -07:00
Bill Yi
84c120a610 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: 9d6d37ad3a -s ours
am skip reason: subject contains skip directive

Change-Id: I72274c61df8e631ed5bb826b7825566c8f175615
2019-06-05 01:08:19 -07:00
TreeHugger Robot
fcc6df7c6d Merge "Switch DDS during MSIM emergency call" into qt-dev 2019-06-05 05:08:02 +00:00
TreeHugger Robot
d10a92f20c Merge "Import translations. DO NOT MERGE" into qt-dev 2019-06-05 04:40:45 +00:00
TreeHugger Robot
9d6d37ad3a Merge "Import translations. DO NOT MERGE" into qt-dev 2019-06-05 04:40:36 +00:00
Lorenzo Colitti
a533959911 Merge "Allow passing in acceptUnvalidated without explicitlySelected" 2019-06-05 04:35:45 +00:00
Brad Ebinger
406acfa000 [automerger skipped] Switch DDS during MSIM emergency call am: cb95725b71
am: e65bd999c3 -s ours
am skip reason: change_id Ic49e126ae0abfe71edd1fe000c2a0dfd2360dece with SHA1 c9654c1b57 is in history

Change-Id: I52e735d5054f97c295a7566e2a6e8c2456356bd7
2019-06-04 21:14:52 -07:00