Yohei Yukawa
b2e45a2dc6
Merge "Revert "Avoid IME restart for configChanges"" into sc-dev
2021-03-01 18:30:36 +00:00
Heemin Seog
95ce7d88dd
[automerger skipped] Merge "DO NOT MERGE Intercept back button on user switcher screen" into rvc-qpr-dev am: de0869335a am: 3ad96cbfe1 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13689637
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I746794a634d5fe72f1cccd937199d444e4659083
2021-03-01 18:29:39 +00:00
Heemin Seog
75af6c8108
[automerger skipped] DO NOT MERGE Intercept back button on user switcher screen am: a287650f94 am: c76299428e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13689637
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4e545b9c2e58643df20c9efb1e5b006de7db751c
2021-03-01 18:29:11 +00:00
Taran Singh
712fc24a34
Revert "Avoid IME restart for configChanges"
...
Revert "Add cts for InputMethodService configChanges"
Revert submission 13417792-b/167948419
Reason for revert: Causes bugs like b/181195100
Reverted Changes:
Iff88b768c:Avoid IME restart for configChanges
Ib7ce13340:Add cts for InputMethodService configChanges
Bug: 167948419
Fix: 181195100
Change-Id: I36bca545b09b4f870560964ec61fa6bb344fceaf
2021-03-01 18:28:10 +00:00
TreeHugger Robot
0864b25857
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 1e3abbf022 -s ours am: 0a66a75b91 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13724893
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I07e7779d5da6f9d79c9089d73aa2fe0ccc441809
2021-03-01 18:27:44 +00:00
Lee Shombert
3c039830a4
Merge "Fix the PMS live computer" into sc-dev
2021-03-01 18:17:09 +00:00
Heemin Seog
3ad96cbfe1
Merge "DO NOT MERGE Intercept back button on user switcher screen" into rvc-qpr-dev am: de0869335a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13689637
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I01f2dcbbb43e75cecf7d21dd9967b07087aa8a55
2021-03-01 18:01:59 +00:00
Heemin Seog
c76299428e
DO NOT MERGE Intercept back button on user switcher screen am: a287650f94
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13689637
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iaf68c025d3fab83724ed802fd99826668cf81bf3
2021-03-01 18:01:41 +00:00
Amy Zhang
a1649935f1
Fix the typo in Tuner JNI of onScanMessageExt_1_1.onPriorityReported
...
Test: atest android.media.tv.tuner.cts
Bug: 181242574
Change-Id: Ie1348a0e2489160975d769c21429b971accfb2ea
2021-03-01 17:58:09 +00:00
Greg Daniel
e280ab9e0d
Merge "Remove flushAndSubit from SkiaPipeline renderFrame." into sc-dev
2021-03-01 17:39:11 +00:00
Zimuzo Ezeozue
cebc566145
Merge "Rename onGetAnrDelayMillis to onAnrDelayStarted" into sc-dev
2021-03-01 17:28:34 +00:00
Heemin Seog
de0869335a
Merge "DO NOT MERGE Intercept back button on user switcher screen" into rvc-qpr-dev
2021-03-01 17:28:20 +00:00
TreeHugger Robot
0a66a75b91
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 1e3abbf022 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13724893
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3da87a730af4b63b72948c4a277db06e82439c00
2021-03-01 17:23:38 +00:00
Nataniel Borges
f765ca7883
Merge "Open IME tests should run only in 0 degrees" into sc-dev
2021-03-01 17:10:18 +00:00
TreeHugger Robot
32ab3f75f6
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-03-01 17:02:36 +00:00
TreeHugger Robot
67752d1295
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-03-01 16:58:43 +00:00
Felipe Leme
d7cda89ca5
Merge "2 minor DevicePolicyManagerService improvements." into sc-dev
2021-03-01 16:49:24 +00:00
TreeHugger Robot
1e3abbf022
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2021-03-01 16:48:23 +00:00
TreeHugger Robot
6e2cd62232
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-03-01 16:47:44 +00:00
Felipe Leme
f2a7576696
Merge "Fixed createAndManageUser() for headless system user mode." into sc-dev
2021-03-01 16:46:04 +00:00
Anton Hansson
f288c41d52
Merge "Add more test-cases for <extension-sdk>" into sc-dev
2021-03-01 16:38:43 +00:00
Victor Chang
03c49c1324
Merge "Revert "Clean up LogicalDisplayMapper"" into sc-dev
2021-03-01 16:34:16 +00:00
Hui Yu
2533037dc5
Merge "Call new API setTemporaryAppAllowlist() and specify temp-allowlist reasonCode." into sc-dev
2021-03-01 16:30:58 +00:00
Bill Yi
6d5cc3989b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 41e859a977 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13723060
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie3464fa758b8d45d6ec53da94a9602ad0ddfad9f
2021-03-01 16:04:13 +00:00
Bill Yi
6cdb4f4ff5
Merge changes from topic "presubmit-am-e4fb35a92efe4ced89230034ac1bdb98" into sc-dev
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 09233975ca
Import translations. DO NOT MERGE ANYWHERE
2021-03-01 15:34:22 +00:00
Bill Yi
41e859a977
Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod
2021-03-01 15:34:22 +00:00
Ruslan Tkhakokhov
b56fc740bb
Merge "Update D2D logic in line with new opt-out rules" into sc-dev
2021-03-01 14:53:36 +00:00
Greg Daniel
be2803a817
Remove flushAndSubit from SkiaPipeline renderFrame.
...
Previously we would submit a command buffer for the
frames draws and then immediately submit a second
command buffer that had no commands and just an attached
semaphore. This merges those two submit calls into Skia
into one call.
Test: manual running of system of benches
Bug: 175913056
Change-Id: If0d054960de8b459814cbfa9289756f8ee9d4a93
(cherry picked from commit f16ba60194 )
2021-03-01 13:56:45 +00:00
Bill Yi
a2793870d9
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Iaaee6bce433f32e71f5ff1934e19854dea98fab7
2021-03-01 13:29:54 +00:00
Victor Chang
8085fe75d1
Revert "Clean up LogicalDisplayMapper"
...
Revert submission 13575048-clean_ldm
Reason for revert: http://b/181537022
Reverted Changes:
I69c3478b4:Adjust jumbojack config to fit latest display layo...
I72a4eb667:Clean up LogicalDisplayMapper
Change-Id: I392816dd3870bd1ab969c06e796977a9d39bafda
2021-03-01 13:21:54 +00:00
Zimuzo Ezeozue
7df4e1c5a4
Merge "Add API to notify the system_server when app is blocked on I/O" into sc-dev
2021-03-01 12:41:24 +00:00
Ming-Shin Lu
ea1be96732
Merge "Remove duplicated startInputUncheckedLocked invocation" into sc-dev
2021-03-01 12:21:01 +00:00
Kholoud Mohamed
6c80c464e0
Merge "Added some testAPIs in ContentSuggestionsManager" into sc-dev
2021-03-01 12:06:19 +00:00
Bill Yi
647b13cba0
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Idacdfa77a813b5ea3f877b8c761c3ad9038da708
2021-03-01 03:16:00 -08:00
Zim
c534503ac0
Add API to notify the system_server when app is blocked on I/O
...
The MediaProvider is also the ExternalStorageService and manages all
app I/O on external storage. While handling an apps request, the MP
might block on some long running computations e.g transcoding
Test: Manual
Bug: 170486601
CTS-Coverage-Bug: 181222557
Change-Id: I36b59eb84d8de6b73ed22e82df1093e946e53eab
2021-03-01 10:36:16 +00:00
Zim
aff757666a
Rename onGetAnrDelayMillis to onAnrDelayStarted
...
The system will call into onAnrDelayStarted to notify the
MediaProvider to show a progress dialog in the interim, while an app
is about to ANR on a blocked transcoding session.
See Idb9190a0e6014ce64bf1412c26f6ae03f97e922d for more details
Bug: 170486601
Test: Manual
CTS-Coverage-Bug: 179658703
Change-Id: I6c078ca3221e13cadf003f3504a7f796c7b18388
2021-03-01 10:34:30 +00:00
Bill Yi
50bf7c9b9a
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I8b29ece8b496834f283dc6a477b45f22d15c428f
2021-03-01 10:31:35 +00:00
Ruslan Tkhakokhov
75ee2bf7f1
Update D2D logic in line with new opt-out rules
...
* Ignore android:fullBackupContent for apps targeting Android S+ while
in D2D
* Update LocalTransport::getTransportFlags() to support
FLAG_DEVICE_TO_DEVICE_TRANSFER (required for CTS testing)
Bug: 180523564
Test: atest FullBackupRulesHostSideTest
Change-Id: I115c1c76f4b0d8b486cc9f146ef630fda3ff2a03
2021-03-01 10:26:07 +00:00
Nataniel Borges
96c04955fe
Open IME tests should run only in 0 degrees
...
The test is flaky on 90 degrees at the moment
Test: atest FlickerTests:OpenImeWindowTest
Bug: 162923992
Change-Id: I4dd509e9bc45d6ab9fff930b3bc6f8ae546d88e5
2021-03-01 10:55:51 +01:00
Nathalie Le Clair
bfcab5ff65
Merge "Update CEC key handling documentation" into sc-dev
2021-03-01 09:48:38 +00:00
Xin Li
6451e3f3e7
[automerger skipped] DO NOT MERGE - Mark RQ2A.210105.001 as merged. am: 80d1724769 -s ours am: 61c81af99a -s ours
...
am skip reason: subject contains skip directive
Original change: undetermined
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0de9dd56df19aa59bd0dcd9582854814cdd9e7ca
2021-03-01 09:46:57 +00:00
Lorenzo Colitti
3eb93bf466
Merge "Delete the last remaining user of TestNetworkStackLib." am: 6a01b8d23b am: a49208f178 am: 2479f01e8d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1611874
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iebb7d28407d17d71d5623eef514ee0b4baee372e
2021-03-01 09:46:35 +00:00
Xin Li
61c81af99a
[automerger skipped] DO NOT MERGE - Mark RQ2A.210105.001 as merged. am: 80d1724769 -s ours
...
am skip reason: Change-Id Id1351d1d694e96564317e12c79a2484fd33f762e with SHA-1 a49208f178 is in history
Original change: undetermined
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2912b4d3c8e608139d49ea2739878e4f4775a5ab
2021-03-01 09:03:27 +00:00
Lorenzo Colitti
2479f01e8d
Merge "Delete the last remaining user of TestNetworkStackLib." am: 6a01b8d23b am: a49208f178
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1611874
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ibef70ffb262f8446348ae7cc1cb7fd61a089a007
2021-03-01 09:02:33 +00:00
Remi NGUYEN VAN
949bcca3ad
[automerger skipped] Merge "Split out the connectivity API surface" am: 3d31f1ead0 am: 587784cd4c am: 51b9ccb115 -s ours
...
am skip reason: Change-Id I21c42f032efa6c10e36c749df3183ce9679303a7 with SHA-1 9f223cb0b4 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552658
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0494841fdc78274eda4698e1650be898fc4faf75
2021-03-01 08:50:52 +00:00
Rajeev Kumar
c2b0a8fa2e
Merge "Add basic dumping to AppHibernationService" am: 8596c6e90e am: a395f61ed5 am: 0458084833
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1597057
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Icc956f5662d54e6e5a56bc6fa30aeb06a1c476c2
2021-03-01 08:50:01 +00:00
Xin Li
80d1724769
DO NOT MERGE - Mark RQ2A.210105.001 as merged.
...
Bug: 180401296
Merged-In: Id1351d1d694e96564317e12c79a2484fd33f762e
Change-Id: Ifa2323c69b4f72fb02aeb4330dbbe12b3ddcd172
2021-03-01 00:43:22 -08:00
Bill Yi
be333346b3
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I45f5d57fe0b27b6b103c6af8f6941d6a0f36005e
2021-03-01 08:25:12 +00:00
TreeHugger Robot
143edec54d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 05f68c26dd -s ours am: e4ca4bbc93 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13718301
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I34be0816e6e8629dbcfffbd58c65753346ca74e6
2021-03-01 08:17:53 +00:00
Julien Desprez
90d2dee043
Merge "attempt to run protologtool-tests as unit tests" am: f9e2a9c55a am: 8ae5fd7f1c am: 3043de8cdd
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1601194
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I27f9ad3c9fa9d2aa0fb1d38f04d953fa87278df8
2021-03-01 08:17:35 +00:00