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
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
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
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
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
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
Connor O'Brien
f35f453e93
Merge "Revert "Revert "Clear BPF data in KernelCpuUidTimeReader.removeUid()""" am: a0bbd188e4 am: 9267c31a1c am: fad30e4c7b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1602665
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I47f3e39fa42b7eb377f829bd4c1e255cd0f676cb
2021-03-01 08:17:14 +00:00
Christian Wailes
6c7a166d9e
[automerger skipped] Merge "Add LocalManagerRegistry inside system server." am: 76348ffadf am: 4eb5f086d4 am: 7f037415ea -s ours
...
am skip reason: Change-Id Ib9f14070a665ebd8c582376d7ea044d9b945b6b0 with SHA-1 bd47187f71 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607280
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ifdb9865dee2a05f241a973140f162e58b6efb8bc
2021-03-01 08:16:54 +00:00
Shuo Qian
af645c3188
[automerger skipped] Merge "Add Emergency callback mode shell command" into rvc-qpr-dev-plus-aosp am: ee60579798 -s ours
...
am skip reason: Change-Id If6ca01283a02a4c1f762eaa0f4cd798d48781761 with SHA-1 b201f9b1e6 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13691003
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id655eaab13a3b1527a64fc121dd697855fb4f6c0
2021-03-01 08:16:33 +00:00
Brad Ebinger
d9caa80044
[automerger skipped] Merge "[RCS UCE] Define a new ACCESS_RCS_USER_CAPABILITY_EXCHANGE permission for associated RCS UCE APIs" am: 44d6bdc332 am: f92683b7d1 am: d2fbe50daa -s ours
...
am skip reason: Change-Id I863f2e6e1afffce5e8ea103790cf368c59734029 with SHA-1 215c5e9115 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1555055
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5af4e27bd7cb2f35bf51eb9c968570fb5054bda5
2021-03-01 08:16:14 +00:00
Evgenii Stepanov
73dddeb4ac
[automerger skipped] Merge "Implement memtagMode and nativeHeapZeroInit manifest attrs." am: d600f5067a am: ac811c4025 am: 0ab80262df -s ours
...
am skip reason: Change-Id I6a481a9d2363997bf954f248d08224c79f0c2afb with SHA-1 6415a1505a is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556655
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id4b6c973cec872bdfe98eb8bc4ef0adac63c4cf8
2021-03-01 08:14:32 +00:00
Alex Stetson
059f3e3314
[automerger skipped] Merge "Configure Bluetooth profiles displayed in settings" into rvc-qpr-dev am: f8501da319 -s ours am: dfb10a81c4 -s ours
...
am skip reason: Change-Id I62b8778517730076554ba996cee80862ce72539b with SHA-1 f87daf40c2 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13474716
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib986fb79f01bd19c3fa583c01efa6e17af5aa0d4
2021-03-01 08:14:11 +00:00
Suren Baghdasaryan
074cc33c40
[automerger skipped] Merge "Fix total memtrack Graphics and GL calculations" am: d061730dae am: 355bd7d9b8 am: 44c20b347f -s ours
...
am skip reason: Change-Id I77f06322fbb06ffa33115c1469aba80e59247904 with SHA-1 1c5d763107 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1604881
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I416729c9918336989fd4d065a991b606ede3c63e
2021-03-01 08:13:48 +00:00
Treehugger Robot
699b52d0a8
[automerger skipped] Merge "Rename the font file with PostScript name based file name" am: 5cc4c3ff91 am: b05555721c am: 763ecd2ae7 -s ours
...
am skip reason: Change-Id I829840299b5d138cfec8924ce8f77e1371524a70 with SHA-1 2f0674a7fa is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1606551
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5a39247697ca0f323df2ad56777e90635dc4ed69
2021-03-01 08:13:24 +00:00
Hunter Knepshield
0da42ef255
Merge "[API review] Additional detail in BugreportCallback javadoc." am: 39742a519c am: b79c80ba78 am: 0f5e18a9f0
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607112
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I09da5ada79dc0417e9f40769b924d1834fed3250
2021-03-01 08:12:58 +00:00
Winson Chiu
6b57f8489d
Merge "Add OWNERS for pm.verify.domain" am: 1736ad8bfe am: b87d41ab87 am: 472f02851f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1606753
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib249a8b692299bbe86922b17be39469de4960a33
2021-03-01 08:12:27 +00:00
Andrei-Valentin Onea
b8037bb49a
Merge "Fix deadlock on CompatConfig.mChanges" am: eaf3fd59ff am: 0f53ddc205 am: 75c6b35d4b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1605516
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I31110ae5c28a48ea91c4ef8e56678edfb3c7b250
2021-03-01 08:12:06 +00:00
Lorenzo Colitti
a49208f178
Merge "Delete the last remaining user of TestNetworkStackLib." am: 6a01b8d23b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1611874
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id1351d1d694e96564317e12c79a2484fd33f762e
2021-03-01 08:11:39 +00:00
Vladimir Marko
cde7c9f16f
Merge "Change dirty-image-objects file format." am: 523e3b9b79 am: e70dab7633 am: 87cb8b5efe
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1606454
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I68d174ca59fea49ce1828f0c828b32fbb5d2c214
2021-03-01 08:10:53 +00:00
Junyu Lai
68a5c01ccf
Merge "[FUI08] Create NeworkStateSnapshot" am: 702ca13a66 am: 32e8e9eb24 am: b23e201f01
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1536328
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia5f3cfbdd6f3b23007ea7a2581a75088ed96714f
2021-03-01 08:10:22 +00:00
James Lin
dcba4e14a9
Merge "Update the UCE OPTIONS API" am: a2d03f9eec am: 2f9c50d50a am: ee8b27d293
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1605096
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iad21c56bb2e50433e026ad4abf14427e236b91a3
2021-03-01 08:09:58 +00:00
Zoey Chen
6794dbe262
[automerger skipped] Merge "[Telephony] Implement onDataEnabled callback" am: c8057ecd1c am: ce04917626 am: 4d942da6f9 -s ours
...
am skip reason: Change-Id I1b9fe50e4b805f5117fb6e03438dd0a09fbcfebc with SHA-1 4ad5f0a7c7 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1608055
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I04a1b91748fa0fd6669d5f1b6abcfcda0c5e9bfb
2021-03-01 08:09:34 +00:00
Almaz Mingaleev
4d562f64fd
Merge "Re-throw system server exception." am: 112cd8df86 am: c76d1a4c26 am: 08f03dc59c
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1608233
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib5c9d8adbe377432df0710d8ab473683f6866bd7
2021-03-01 08:08:35 +00:00
Dmitry Dementyev
7d21d719a5
Merge "Migrate recoverablekeystore to KeyStore V2." am: dbf8a7c1bd am: 26085ee2ff am: 25de7c49b8
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1603470
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4c23d408e34d6305784e54b7ef00a258b4ea6fab
2021-03-01 08:07:59 +00:00
Junyu Lai
69b8cbd32e
Merge "Fix copyright license of VpnTransportInfo" am: 594e8def4c am: 9044d1e472 am: bc88904010
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607313
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ibf6ba342dfbc92fc4852b96d1c3f3b3f34cc3322
2021-03-01 08:07:27 +00:00
Janis Danisevskis
fdfc090a98
Merge "Keystore 2.0: Clear Uid/Namesapce" am: a51a74a8c5 am: 6413a11508 am: 36dfffbdbe
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1604089
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I6556ce399ddf4444e7655f05d92861073580c2cf
2021-03-01 08:06:58 +00:00
Daniel Bright
d3cfb31078
[automerger skipped] Merge "Revert^2 "Add CAPABILITY_ALLOWED_NETWORK_TYPES_USED"" am: cc318221a5 am: 9c4102e2a1 am: b50587319e -s ours
...
am skip reason: Change-Id Ie31d32a08b10b8c125f27832e81a3e65b6d8767a with SHA-1 e177c09787 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1606546
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id3effe377205a2a1b37eceb2ec978af31d98f23f
2021-03-01 08:03:08 +00:00
Remi NGUYEN VAN
60891de142
Merge "Fix CaptivePortalDataTest on R" am: fada307ddf am: 04dd0eb01a am: b6f07bbf46
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1605013
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Icd6711e5caafd92bba9f251742fd3c53efeea672
2021-03-01 08:02:39 +00:00
Remi NGUYEN VAN
7cf726658c
Merge "Add public alternative for protectFromVpn" am: 2c49d21ce1 am: 25a7767cc7 am: e456ac2061
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1605094
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If0c46c990def1b6884a6008841f3d5bd912b8650
2021-03-01 08:01:51 +00:00
Louis Chang
71f07b4ed5
[automerger skipped] Merge "Stop keeping freeform activities visible." into rvc-qpr-dev am: f0bd7906d0 -s ours am: 0492435ea2 -s ours
...
am skip reason: Change-Id Ibeeba5ca8b6b60583eec9cbee9b7209ee17b1037 with SHA-1 3f74b33211 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13692967
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0e46fa035a8cb540396df36fbd5995251b8ee98e
2021-03-01 08:01:23 +00:00
Calin Juravle
6eddd02cf3
[automerger skipped] Merge "Migrate deleteOdex functionality to DexManager" am: 41207e284c am: 5383d7a776 am: 6c05b32085 -s ours
...
am skip reason: Change-Id I265f0c60be4f871d09c9513166723e31051ac1a3 with SHA-1 72e090b8df is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1591851
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I362aad77519ade67f5e8b20a7cd918517957cbb4
2021-03-01 08:00:53 +00:00
Tianjie Xu
75ec9ede9b
Merge "Fix a typo for the server blob timeout" am: 5c9ebe31ab am: afb76f685c am: 1ff02233c5
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607353
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic4dba6c64bf9107600bbe6a8935357b2791431bb
2021-03-01 08:00:30 +00:00
Chris Weir
86591e9bbe
Merge "Update tests for PANS network usage metrics" am: b1cba34bfd am: 3d6031160f am: d7b355bf4c
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1578824
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I212c317f744d88bc97b34195e4f86f447fb7bd52
2021-03-01 08:00:07 +00:00
Chris Weir
9a4f2d55e7
Merge "Add support for tracking PANS data usage" am: 90261da202 am: eebeb725a8 am: e30a010ca3
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1578684
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3d586ff455baccbf87f0ffb835af83c90735ba56
2021-03-01 07:59:54 +00:00
Collin Fijalkovich
59c6ca2b2d
[automerger skipped] Merge "Avoid TransferPipe for local dumpCacheInfo calls" am: d43c415293 am: cbeda8a777 am: 93b0c8574e -s ours
...
am skip reason: Change-Id I1e4ab8e1d09b98b379d81079fd26ff2129b5b65a with SHA-1 bde9bc3635 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1595394
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I12b89985cfc77b2efeb5993242e1fba413f4573d
2021-03-01 07:59:29 +00:00
Brian Stack
d4bcdb9668
[automerger skipped] Merge "Remove unnecessary UWB functions" am: 752aee7e04 am: ce702151e8 am: a4c042dc10 -s ours
...
am skip reason: Change-Id I81675429d73486f0b002e76acabaa4883990ab11 with SHA-1 bd03c96317 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1595291
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If6cc07fb0481fa2a4587d6ed165a0e36bdfad921
2021-03-01 07:59:08 +00:00
Danny Epstein
2004833c4d
[automerger skipped] Merge "Configure privapp perms for car activity resolver" into rvc-qpr-dev am: ad312a6c1d am: eed3786c2c -s ours
...
am skip reason: Change-Id If7e5d48ce5d897a2cd90a02eaeda59e71d164520 with SHA-1 8d9eacea3a is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13587640
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3b843fbd3e025f4372e30c4d503886cb611b69cf
2021-03-01 07:58:47 +00:00
Lorenzo Colitti
6a01b8d23b
Merge "Delete the last remaining user of TestNetworkStackLib."
2021-03-01 07:47:47 +00:00
Remi NGUYEN VAN
a3ddd8f9c6
Merge "Configure privapp perms for car activity resolver" into sc-dev
2021-03-01 07:28:30 +00:00
Lorenzo Colitti
55d9c5a693
Delete the last remaining user of TestNetworkStackLib.
...
FrameworksNetIntegrationTests is the last user of this target.
It is not really necessary since it can trivially be replaced by
NetworkStackApiStableLib.
Bug: 167645754
Test: atest FrameworksNetIntegrationTests
Change-Id: Id5e8eb3f58590f4b3cfbcbef66b00acbba77a7a7
2021-03-01 15:12:53 +09:00