Treehugger Robot
810afd3c55
Merge "Change the instrumentation app build target type" am: 4adb372fc7 am: a8fc52d7f5 am: 1ef41dd092
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1522027
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I326dcb8666e867b7e43296c9e6bdcc1cff42bb7a
2020-12-14 21:49:51 +00:00
Diego Vela
3ecd90395a
Merge "Revert "Add <uses-library> information.""
2020-12-14 21:49:14 +00:00
Treehugger Robot
619b06b95f
Merge "Add ytai and elaurent to SoundTriggerService OWNERS" am: c1fca8e84e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1527771
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I459bd1a817859b7307726dac666aaf29b7da50e8
2020-12-14 21:48:38 +00:00
Alison Cichowlas
e432f6c014
Add SystemUI to OWNERS for Sharesheet.
...
Change-Id: I2ecbab59516ae0cb53d47fa819c26336f76d9483
2020-12-14 21:46:41 +00:00
TreeHugger Robot
ef691ab2ff
Merge "Add attachinfo information to ViewRootImpl dump"
2020-12-14 21:42:09 +00:00
Ryan Mitchell
18e538f72d
Merge changes from topic "inc-hard-am" am: 314863c132
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519911
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I58d9a1b68bc80e385c261ebc80b75b41a6fcd628
2020-12-14 21:40:35 +00:00
Treehugger Robot
550156c202
Merge "Add resources owners to core/jni and split-select" am: 2991744d47 am: 578171d320
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1527770
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4c7c306f78522c509709fc532727dbe7e670f365
2020-12-14 21:34:49 +00:00
Treehugger Robot
1ef41dd092
Merge "Change the instrumentation app build target type" am: 4adb372fc7 am: a8fc52d7f5
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1522027
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If9c6a12b7e8f68a13c5c0caa96621e155847ff3a
2020-12-14 21:34:26 +00:00
Ryan Mitchell
9e78098e85
Set resource id correctly when resolve fails am: e7ab62723a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519910
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0e4decf7a7f9b1e4d6c1b6fb45f37d105c15b9a0
2020-12-14 21:34:10 +00:00
Ryan Mitchell
ab46005fe8
Revert^2 "libandroidfw hardening for IncFs" am: 80094e39f9
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519909
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9a570e6b8ef32bebe5477b1d784b07857c165e06
2020-12-14 21:29:26 +00:00
TreeHugger Robot
e1344c3973
Merge "Manual revert of 5s FGS notification enforcement"
2020-12-14 21:28:21 +00:00
Mårten Kongstad
54c5257fb1
idmap2: remove call to obsolete 'idmap2 verify' from valgrind.sh am: ec7e7f5622
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519908
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ida388363c903286801d2833bacb78f6523b44664
2020-12-14 21:25:39 +00:00
Mårten Kongstad
29e7a4394a
idmap2: remove the 'scan' command am: 6532483950
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519907
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If62d07750556e734686a0c1df2f2e533b83c1b1c
2020-12-14 21:20:53 +00:00
Terry Wang
79c45aaa3c
Porting AppSearch jetpack upstream changes to platform
...
Changes included:
#af6646e : Support retrieving the current database's schema
#2696e50 : Unhide the createGlobalSearchSession API.
Bug: 162450968
Test: presubmit
Change-Id: I8e97304fedd446b88393eb6ca5b42c2e210e3271
2020-12-14 13:18:53 -08:00
Diego Vela
6db09a0ad9
Revert "Add <uses-library> information."
...
Revert "Add <uses-library> information."
Revert "Add <uses-library> information."
Revert submission 1427961-uses-libs-23
Reason for revert: Broken build
Bug: 175607244
Reverted Changes:
I6ab699005:Add <uses-library> information.
Id5d5fe1df:Add <uses-library> information.
Id12741c9b:Add <uses-library> information.
I2fe6e09c2:Add <uses-library> information.
Change-Id: Ibe200e1c32cb6153b69da17676842f04cb2e8b1f
2020-12-14 21:14:24 +00:00
Terry Wang
064c925a56
Merge "Remove AppSearchException from java doc of AppSearchSession."
2020-12-14 21:13:42 +00:00
Treehugger Robot
c1fca8e84e
Merge "Add ytai and elaurent to SoundTriggerService OWNERS"
2020-12-14 21:13:35 +00:00
Treehugger Robot
578171d320
Merge "Add resources owners to core/jni and split-select" am: 2991744d47
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1527770
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iddc1fdc40d62553d7179da4ee1ca522f3a4be43b
2020-12-14 21:12:49 +00:00
Treehugger Robot
a8fc52d7f5
Merge "Change the instrumentation app build target type" am: 4adb372fc7
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1522027
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ief315674565dd6ba825b26045522c2c9cdd1b7cc
2020-12-14 21:02:35 +00:00
TreeHugger Robot
d68d7d360e
Merge "Extract the SysUI Icons and Strings"
2020-12-14 20:53:44 +00:00
Lyn Han
ac508816ef
Merge "Dedup onClickListener for clearing silent notifs"
2020-12-14 20:49:43 +00:00
Lyn Han
beca193c1d
Merge "Remove unused code"
2020-12-14 20:46:30 +00:00
Ryan Mitchell
314863c132
Merge changes from topic "inc-hard-am"
...
* changes:
Revert^2 "Cache resolved theme values"
Set resource id correctly when resolve fails
Revert^2 "libandroidfw hardening for IncFs"
idmap2: remove call to obsolete 'idmap2 verify' from valgrind.sh
idmap2: remove the 'scan' command
2020-12-14 20:42:03 +00:00
Treehugger Robot
2991744d47
Merge "Add resources owners to core/jni and split-select"
2020-12-14 20:35:10 +00:00
Lucas Dupin
c3cfd025d0
Remove shadows from shade
...
Removed base elevation from shade, but kept it on overlaping
notifications or heads-up. Othwerise we'd have legibility issues
depending on where the heads-up is rendered.
Test: visual
Bug: 173561906
Change-Id: If4f275437853e394fbd49378f2af489ba1abcead
2020-12-14 12:27:00 -08:00
TreeHugger Robot
83352bf4e1
Merge "Add OWNERS file for display-device-config dirs."
2020-12-14 20:22:29 +00:00
Bill Yi
939ab37eca
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I4af7e05deb90f7f55046f4ff32faaf46ee1a9b23
2020-12-14 12:22:20 -08:00
Wale Ogunwale
062b17a171
Rename splitscreen package to legacysplitscreen
...
Split-screen implementations moving forward would be based on app-pairs
and main/side stage models. So, renaming existing package to avoid
confusion.
Bug: 175416931
Test: They pass!
Change-Id: I55ab1d27fb1c00ba7a58d685ea7eb2840efb9437
2020-12-14 12:13:11 -08:00
Treehugger Robot
4adb372fc7
Merge "Change the instrumentation app build target type"
2020-12-14 20:04:23 +00:00
Dmitry Dementyev
89a8e2163c
Merge "Protect account chooser activities against overlay."
2020-12-14 19:54:15 +00:00
TreeHugger Robot
a1c82b23a7
Merge "Add missing decreaseIndent."
2020-12-14 19:53:29 +00:00
TreeHugger Robot
d282f7d864
Merge "Reset mServiceDisabled when service dies"
2020-12-14 19:50:05 +00:00
Tianjie
00872652cc
Factor out a class to store the rebootEscrow key
...
To support server based RoR, we will communicate with server to
encrypt the time constrained reboot escrow key; and put the
encrypted key on /data. This replaces the call to the reboot
escrow HAL. Add an interface to support both implementations.
Bug: 172780686
Test: atest FrameworksServicesTests:RebootEscrowDataTest \
FrameworksServicesTests:LockSettingsServiceTests \
FrameworksServicesTests:RecoverySystemServiceTest \
FrameworksServicesTests:RebootEscrowManagerTests
Change-Id: Icf10d5771b1efd8197b677158f39fd240c5c4107
2020-12-14 11:42:45 -08:00
Wale Ogunwale
1bf5680b38
Added support for RootTaskDisplayAreaOrganizer
...
Allows shell to have information on the parent container for tasks so it
can do things like attach other surfaces to it. E.g. split-screen
divider.
Also, have DisplayAreaOrganizer ctor take an executor so incoming calls
from the binder threads can be posted to the main thread.
Bug: 175416931
Test: They pass!
Change-Id: Ia3d0b978cf43badd8c495b75708aa027fe9a2aa1
2020-12-14 11:36:44 -08:00
Amos Bianchi
e4a23931cd
Merge "Replace NFC_PAYMENT_COMPONENT with NFC_PAYMENT_DEFAULT_COMPONENT in comment." am: 4f631e337b am: 335da989d5 am: abfd17fce2
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1526999
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0c2efbc11d24e8c661fd16d80e141c40967b0c99
2020-12-14 19:35:30 +00:00
Gavin Corkery
65bf421f1d
[automerger skipped] Merge "Replace broadcast with adding a method in BugreportCallback" am: d45d533b6e am: 7611ac2a5a am: 11c28aeb13 -s ours
...
am skip reason: Change-Id Ibc1a5a8ac308c303399d28eb8c177096b805fdf9 with SHA-1 ec91d7700d is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1507504
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia43d834e90eeea6203973715df880688327479d5
2020-12-14 19:35:13 +00:00
Treehugger Robot
9af5953832
[automerger skipped] Merge "Add a path for GNSS time suggestions" am: 85ebf98dcf am: 4ef13ea0c9 am: c656403bed -s ours
...
am skip reason: Change-Id I5cb12b5545652ed885b72a3170940050ce0628a6 with SHA-1 7af0bcaccd is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1528193
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I6191e5a52c29f2c7394401640d08f7abd92d5951
2020-12-14 19:34:34 +00:00
TreeHugger Robot
12ccc350c4
Merge "Send DROPBOX_ENTRY_ADDED to all users" into rvc-qpr-dev am: 3317653b8c am: a2302b01e4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13211982
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ifc85214040a14620caa2e41942d3fa7e5eea16bb
2020-12-14 19:34:12 +00:00
Ytai Ben-Tsvi
16ed896ea5
Add ytai and elaurent to SoundTriggerService OWNERS
...
Test: n/a
Change-Id: I5c0366f0be49e9d42860694af22550f026f75cbf
2020-12-14 11:33:51 -08:00
Darryl Johnson
9dc71fc5ac
Merge "Add OWNERS file to device state XSD directory."
2020-12-14 19:30:12 +00:00
Tianjie
e315bfa55b
Add namespace in DeviceConfig to support ota teams's features
...
One sample usage is to toggle between server based or HAL based
implementation for resume on reboot.
Bug: 172780686
Test: adb shell device_config put ota server_based_ror_enabled true;
Check the value in system server code
Change-Id: Ia9d3cae788e9316850ce1fc417c12b5fc109b1a3
2020-12-14 11:21:17 -08:00
Nate Myren
65052dd37b
Merge "Add RECORD_AUDIO_OUTPUT app op"
2020-12-14 19:20:30 +00:00
Amos Bianchi
abfd17fce2
Merge "Replace NFC_PAYMENT_COMPONENT with NFC_PAYMENT_DEFAULT_COMPONENT in comment." am: 4f631e337b am: 335da989d5
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1526999
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If90808b1776648bb40ed108fb02bf7bbeac68c7b
2020-12-14 19:19:25 +00:00
Gavin Corkery
11c28aeb13
Merge "Replace broadcast with adding a method in BugreportCallback" am: d45d533b6e am: 7611ac2a5a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1507504
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib170bb6f36a086ac7fcab2c0bfc29153f9335a47
2020-12-14 19:19:08 +00:00
Treehugger Robot
c656403bed
Merge "Add a path for GNSS time suggestions" am: 85ebf98dcf am: 4ef13ea0c9
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1528193
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Idcef60976ab86fb527000594cc6698ae2cd7feb3
2020-12-14 19:18:04 +00:00
TreeHugger Robot
a2302b01e4
Merge "Send DROPBOX_ENTRY_ADDED to all users" into rvc-qpr-dev am: 3317653b8c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13211982
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie800690663f874bef21abee094269abb5ee79a58
2020-12-14 19:17:19 +00:00
Amos Bianchi
335da989d5
Merge "Replace NFC_PAYMENT_COMPONENT with NFC_PAYMENT_DEFAULT_COMPONENT in comment." am: 4f631e337b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1526999
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib95b8b28971d041c11c9d11d00dfe991567612aa
2020-12-14 19:14:59 +00:00
Oli Lan
41a18d3340
Clear flags when a rollback is committed.
...
This adds a call into RescueParty to clear flags relating to all
packages included in a rollback. This is done before the commit occurs
to ensure that the flags are cleared before the rolled-back version of
the package starts up.
Bug: 173120414
Test: atest RollbackManagerTest
Change-Id: I155cba0afc8a77517baa331b801c14ed11c50693
2020-12-14 19:14:44 +00:00
Gavin Corkery
7611ac2a5a
Merge "Replace broadcast with adding a method in BugreportCallback" am: d45d533b6e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1507504
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ied674d7ff891caf26d751b6f15af2db9f0eea08f
2020-12-14 19:11:58 +00:00
Ryan Mitchell
e147d00c9e
Add resources owners to core/jni and split-select
...
Adds the owners of the resources sub-system to own resources related
classes in core/jni and the split-select tool previously owned by
adamlesinski@.
Bug: none
Test: none
Change-Id: I0117b0ccb258fb0b9a3e075dfd81c0351abecd3a
2020-12-14 11:07:19 -08:00