Commit Graph

421473 Commits

Author SHA1 Message Date
Andrii Kulian
2561483cbf Merge "Always start launcher when empty home stack is being resumed" into qt-dev
am: 331eb26c1c

Change-Id: Icd5215f2dc5bfced82c8863031bda6b2e4650636
2019-06-05 09:54:45 -07:00
Andrii Kulian
331eb26c1c Merge "Always start launcher when empty home stack is being resumed" into qt-dev 2019-06-05 16:38:17 +00:00
Makoto Onuki
f574979713 Merge "Avoid creating multiple death recipients for same observer" into qt-dev
am: a478c5f9aa

Change-Id: I66242d7ce6acdd9850965328ffa79e9b1a2e8f4d
2019-06-05 09:08:37 -07:00
Makoto Onuki
a478c5f9aa Merge "Avoid creating multiple death recipients for same observer" into qt-dev 2019-06-05 15:54:05 +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
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
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
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
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
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
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
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
Bill Yi
5af4271086 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I356f6734d4c95d538271eabbc649bca4d2eb848b
2019-06-04 20:14:30 -07:00
Bill Yi
ecd816bb9c Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: If4bcd8bbd4cfea27f62b11f628420aaff2cd02d3
2019-06-04 20:09:14 -07:00
Brad Ebinger
cb95725b71 Switch DDS during MSIM emergency call
Add carrier config to force DDS switch if device
does not support SUPL on non DDS for emergency and
also does not support control plane fallback.

Test: atest FrameworksTelephonyTests
Merged-In: Ic49e126ae0abfe71edd1fe000c2a0dfd2360dece
Change-Id: Ic49e126ae0abfe71edd1fe000c2a0dfd2360dece
(cherry picked from commit c9654c1b57)
2019-06-05 02:54:52 +00:00
Louis Chang
7cf8460c66 Do not resume activities that were launched behind
Activities was restarted while making it visible, but we shouldn't
resume it if the activity was launched behind.

Bug: 133325849
Test: atest RecentsAnimationTest
      atest ActivityVisibilityTests
      atest ActivityStarterTests

Change-Id: I4324ce443b8ccca9ac256e382507243fc4e30792
2019-06-05 10:18:30 +08:00
Lucas Dupin
525abc5afa Merge "Fix issue where panel opacity could be wrong" into qt-dev
am: 30e9b45cd9

Change-Id: I9ed2270b39ef3566e7c196501c234a0e3dd71bbd
2019-06-04 18:53:20 -07:00
Alex Salo
fc94f97a98 Merge "Don't call ActivityManagerService on main thread" into qt-dev
am: 9a01bb4280

Change-Id: Idbe5e2f729b45f9918c7f0a9f16bccf959427dbc
2019-06-04 18:48:21 -07:00
Mathieu Chartier
f5ae9a62da Merge "Fix some bugs in dumpsys meminfo attribution" into qt-dev
am: 652b445c07

Change-Id: I26dd2413b054c9dae00cc0f4f53e5a99bf81740a
2019-06-04 18:46:31 -07:00
Bill Yi
e4aa0a8d1f [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: 0906e02aa3 -s ours
am skip reason: subject contains skip directive

Change-Id: Icd1105544ab2bf55f3172fa5a34257b7665b628c
2019-06-04 18:44:50 -07:00
Bill Yi
c358eca34b [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: 452be4963c -s ours
am skip reason: subject contains skip directive

Change-Id: I106a94415dac25a75d16ccaf45aa83970d39d15e
2019-06-04 18:43:21 -07:00
Tracy Zhou
a676a30ae5 Merge "Fix the logic of canceling previous scheduled fade in animation." into qt-dev
am: 289583ec1a

Change-Id: Ibf42ec24d16c0510e27673f12700e9493562b759
2019-06-04 18:41:56 -07:00
Hui Yu
33add786a6 Merge "Only set mStartClockTime when device is fully charged." into qt-dev
am: 28d28a4ee5

Change-Id: Ied83bb528362c96477c365b60f00a301d7de39d6
2019-06-04 18:40:22 -07:00
David Sehr
e698002e22 [automerger skipped] Merge "Add system option to disable lock profiling" into qt-dev
am: 10d9320c3a -s ours
am skip reason: change_id Ida5f83e626c82266de69b13dc2def0477cc87b0f with SHA1 26a6427c44 is in history

Change-Id: I0679d8d82dd7fc2fa4f772c01e6c0b0c21f84631
2019-06-04 18:39:03 -07:00
Winson Chung
8d8dcec593 Merge "Expose keyguard showing-but-occluded state to launcher" into qt-dev
am: c8120d6d6a

Change-Id: Iaacee648ff9535231701b07592da69a98d529d14
2019-06-04 18:37:24 -07:00
Jovana Knezevic
dcb4951fea Merge "Removing requirement for FEATURE_DEVICE_ADMIN in DPMS.setActivePasswordState()." into qt-dev
am: e45e09fcee

Change-Id: I5c1599e060dd60126eff28b47304dff8c2d194b8
2019-06-04 18:35:58 -07:00
Mady Mellor
b2bcff6769 Merge "Post finishing after transition in onBackPressed" into qt-dev
am: 57854d3b90

Change-Id: I7969cfef79133979c5b738496ec2a7c2360e9f11
2019-06-04 18:34:24 -07:00
Wale Ogunwale
ef2a04ad41 Merge "Revert "Collect NeededUriGrants without holding locks."" into qt-dev
am: 2aa255a746

Change-Id: I66ed29edc5c3079984ec205d629bb1d3f587a09c
2019-06-04 18:32:53 -07:00
Matt Casey
05e8a22ab1 Merge "Rendering fixes for assist handles." into qt-dev
am: 075baa2e9b

Change-Id: Id6e48daf7de9267873bc335f8847f686a1bfc669
2019-06-04 18:31:29 -07:00
Lorenzo Colitti
e0348e5a6f Merge "Allow passing in acceptUnvalidated without explicitlySelected" into qt-dev
am: e2fb127e41

Change-Id: Ifd9dbc9c83e426e66417247cbf1fa594193e000f
2019-06-04 18:29:51 -07:00
Makoto Onuki
231b70ce96 Merge "Fix slow query log." into qt-dev
am: dee07f5d7f

Change-Id: If0b3a8caf1563fdcf25f8d38e3b5c6b1d183e3a2
2019-06-04 18:27:43 -07:00
Hongyi Zhang
887d09db5f Merge "Fix location API usage for API_ADD_GNSS_MEASUREMENTS_LISTENER" into qt-dev
am: a1d0453641

Change-Id: I572fa4eebc9b4597e1c7af54030d999c41184c93
2019-06-04 18:24:47 -07:00
Victor Hsieh
6ebd3bf5e8 Merge "Skip legacy-fs-verity setup if file already has it" into qt-dev
am: 4fd5870662

Change-Id: Ia74ba2d310e67c025ca76683caa9d93d2fcefc40
2019-06-04 18:14:26 -07:00
TreeHugger Robot
30e9b45cd9 Merge "Fix issue where panel opacity could be wrong" into qt-dev 2019-06-05 01:11:38 +00:00