Ulyana Trafimovich
b10b31bcad
Merge "Add <uses-library> information." am: 4bb99a788a
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1427665
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I86e3713c8ba955f4c655d3ea25f7c07b248ce3d8
2020-12-10 10:34:10 +00:00
Ulyana Trafimovich
4bb99a788a
Merge "Add <uses-library> information."
2020-12-10 10:19:15 +00:00
Manish Singh
7a418b240e
Merge "Remove transcoding for apps from Settings."
2020-12-10 07:50:17 +00:00
Jiashen Wang
a0a5165c72
Fix minor issue for DeleteEuiccSubscriptionDialogActivity
...
Bug: 170508680
Test: Manually tested
Change-Id: I656b16f6ca568cd9f5dcbf9a0b031f1ee6f71b49
2020-12-09 23:27:04 -08:00
Jeremy Goldman
d6a29ea707
Precommit hook added to Settings, preventing the creation of new Robolectric tests.
...
Test: repo upload .
Change-Id: If31d79a7bf6a18f4c52692ffab4981056c14eaba
2020-12-10 14:40:49 +08:00
TreeHugger Robot
04322e2202
Merge "Add mutability flag to WifiSlice."
2020-12-10 06:37:36 +00:00
tim peng
cd7fda21a0
[automerger skipped] Merge "Add FLAG_RECEIVER_FOREGROUND to run redirect intent at foreground priority" into rvc-qpr-dev am: 656867b4de
am: b36ec713ce
-s ours
...
am skip reason: Change-Id Idf6b07fb5918c487956fd1485d409c3161525f1b with SHA-1 9f66bd0be8
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13136220
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic9db78419a22da6a76d1f1bd2808e85e16aa076d
2020-12-10 06:24:41 +00:00
tim peng
b36ec713ce
Merge "Add FLAG_RECEIVER_FOREGROUND to run redirect intent at foreground priority" into rvc-qpr-dev am: 656867b4de
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13136220
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5e1054e999a39a7a91ad9fa04f874b12370b8a89
2020-12-10 05:53:28 +00:00
tim peng
656867b4de
Merge "Add FLAG_RECEIVER_FOREGROUND to run redirect intent at foreground priority" into rvc-qpr-dev
2020-12-10 05:30:42 +00:00
Xin Li
836df5eb3a
[automerger skipped] Merge "DO NOT MERGE - Merge Android R QPR1" am: 6e252c4cd5
-s ours am: ee06524dbe
-s ours am: fb437d54d9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1521297
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I51ed09738078268db94c92729d9d448aefe037a1
2020-12-10 03:58:48 +00:00
Xin Li
fb437d54d9
[automerger skipped] Merge "DO NOT MERGE - Merge Android R QPR1" am: 6e252c4cd5
-s ours am: ee06524dbe
-s ours
...
am skip reason: Change-Id Id2d9c4f56beae280e6299b6695185577a1521345 with SHA-1 07ccb42665
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1521297
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9b33cb519a95d18ba7d64d90db3b10e3a9afe211
2020-12-10 03:46:48 +00:00
Robert Luo
8da41d2eda
Migrate media output switcher metrics - 3/n
...
Bug: 172181610
Test: run statsd_testdrive 277 and check the
output correctness after content switching.
Change-Id: I5abb471452ec92670d220b2472eadbe77e243653
Merged-In: I5abb471452ec92670d220b2472eadbe77e243653
2020-12-10 11:10:45 +08:00
Xin Li
ee06524dbe
[automerger skipped] Merge "DO NOT MERGE - Merge Android R QPR1" am: 6e252c4cd5
-s ours
...
am skip reason: Change-Id Id2d9c4f56beae280e6299b6695185577a1521345 with SHA-1 07ccb42665
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1521297
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0e2389a3b1ff505dc0a8cc84b1d9b21dd7f6c01b
2020-12-10 03:05:02 +00:00
Robert Luo
ce694271f2
Merge "Migrate media output switcher metrics - 3/n"
2020-12-10 02:36:59 +00:00
Xin Li
6e252c4cd5
Merge "DO NOT MERGE - Merge Android R QPR1"
2020-12-10 02:18:22 +00:00
Hai Zhang
1453ca6ebf
Don't depend on shadow IRoleManager.
...
Because we are moving role into module, and IRoleManager can not be an
API.
Bug: 158736025
Test: DefaultSmsShortcutPreferenceControllerTest
Change-Id: I1af5eb6dfd35458ac7b40b049f6653cbe4be168d
2020-12-09 16:22:50 -08:00
TreeHugger Robot
f9806b21d7
Merge "Add bluetooth package to permission request intent" into oc-mr1-dev am: 504b96d76c
am: 2117006bc6
am: cfdae774cd
am: 635029b87f
am: f49e9d2196
am: 0b89867372
am: 79bf00aac3
am: 317aa9e772
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13088581
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7032ec5a56e823efa93d1692c025f56fe33346a1
2020-12-09 15:22:25 +00:00
Jakub Pawlowski
449c3ed02b
[automerger skipped] Prevent overlay drawing on top of Bluetooth activity dialog am: b29c036522
am: c721dc5bad
-s ours am: b15b6450fa
-s ours am: d35af468b7
-s ours am: 24c8adbd0d
-s ours am: c488511160
-s ours am: ad9f74366f
-s ours am: e0dfc703da
-s ours
...
am skip reason: Change-Id I04ebe580db2b299af2bd5e44e0b0f20bd42f8535 with SHA-1 b29c036522
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13090436
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7acf1c88da040feb71e65685f45d39b041302424
2020-12-09 15:22:11 +00:00
TreeHugger Robot
317aa9e772
Merge "Add bluetooth package to permission request intent" into oc-mr1-dev am: 504b96d76c
am: 2117006bc6
am: cfdae774cd
am: 635029b87f
am: f49e9d2196
am: 0b89867372
am: 79bf00aac3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13088581
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic2a7d0a9ebb8f0840a18f6997bd512f720e35a71
2020-12-09 14:50:28 +00:00
Jakub Pawlowski
e0dfc703da
[automerger skipped] Prevent overlay drawing on top of Bluetooth activity dialog am: b29c036522
am: c721dc5bad
-s ours am: b15b6450fa
-s ours am: d35af468b7
-s ours am: 24c8adbd0d
-s ours am: c488511160
-s ours am: ad9f74366f
-s ours
...
am skip reason: Change-Id I04ebe580db2b299af2bd5e44e0b0f20bd42f8535 with SHA-1 4f7edf692f
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13090436
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic77851a94af2e13604dd1bc690efd7a005269a8a
2020-12-09 14:49:00 +00:00
TreeHugger Robot
6172a98b2b
Merge "Add bluetooth package to permission request intent" into oc-mr1-dev am: 504b96d76c
am: 2117006bc6
am: cfdae774cd
am: 635029b87f
am: f49e9d2196
am: 423bcb4fbe
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13088581
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I01cfff4403d6e3499ae2608e34b9184b6358097f
2020-12-09 14:31:49 +00:00
Jakub Pawlowski
ee15060001
[automerger skipped] Prevent overlay drawing on top of Bluetooth activity dialog am: b29c036522
am: c721dc5bad
-s ours am: b15b6450fa
-s ours am: d35af468b7
-s ours am: 24c8adbd0d
-s ours am: 454083902f
-s ours
...
am skip reason: Change-Id I04ebe580db2b299af2bd5e44e0b0f20bd42f8535 with SHA-1 4f7edf692f
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13090436
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2e9e2e450889fcbbb2d6255d4846632fef8d6dcb
2020-12-09 14:31:40 +00:00
TreeHugger Robot
79bf00aac3
Merge "Add bluetooth package to permission request intent" into oc-mr1-dev am: 504b96d76c
am: 2117006bc6
am: cfdae774cd
am: 635029b87f
am: f49e9d2196
am: 0b89867372
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13088581
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iadf73a6dac422ef24851c603a1e5cd1ab8c0dcf2
2020-12-09 14:31:38 +00:00
Jakub Pawlowski
ad9f74366f
[automerger skipped] Prevent overlay drawing on top of Bluetooth activity dialog am: b29c036522
am: c721dc5bad
-s ours am: b15b6450fa
-s ours am: d35af468b7
-s ours am: 24c8adbd0d
-s ours am: c488511160
-s ours
...
am skip reason: Change-Id I04ebe580db2b299af2bd5e44e0b0f20bd42f8535 with SHA-1 4f7edf692f
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13090436
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I82517ee38de45ef7b2e2ea36d8efa3b6c7f106f6
2020-12-09 14:31:28 +00:00
TreeHugger Robot
423bcb4fbe
Merge "Add bluetooth package to permission request intent" into oc-mr1-dev am: 504b96d76c
am: 2117006bc6
am: cfdae774cd
am: 635029b87f
am: f49e9d2196
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13088581
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iac17f46d6ed605e17f9ea8d996f058846ad3f1c8
2020-12-09 14:04:31 +00:00
Jakub Pawlowski
454083902f
[automerger skipped] Prevent overlay drawing on top of Bluetooth activity dialog am: b29c036522
am: c721dc5bad
-s ours am: b15b6450fa
-s ours am: d35af468b7
-s ours am: 24c8adbd0d
-s ours
...
am skip reason: Change-Id I04ebe580db2b299af2bd5e44e0b0f20bd42f8535 with SHA-1 4f7edf692f
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13090436
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia4fb96312fed59ecf22f57b25693350f6e23fd01
2020-12-09 14:04:17 +00:00
TreeHugger Robot
0b89867372
Merge "Add bluetooth package to permission request intent" into oc-mr1-dev am: 504b96d76c
am: 2117006bc6
am: cfdae774cd
am: 635029b87f
am: f49e9d2196
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13088581
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I81cd1495fd0beb356554d5a86daa30214d0d27d0
2020-12-09 14:03:32 +00:00
Jakub Pawlowski
c488511160
[automerger skipped] Prevent overlay drawing on top of Bluetooth activity dialog am: b29c036522
am: c721dc5bad
-s ours am: b15b6450fa
-s ours am: d35af468b7
-s ours am: 24c8adbd0d
-s ours
...
am skip reason: Change-Id I04ebe580db2b299af2bd5e44e0b0f20bd42f8535 with SHA-1 4f7edf692f
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13090436
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iff5d3ed58db08fa24afb1deb482ac2e12e9f3a0f
2020-12-09 14:03:14 +00:00
TreeHugger Robot
f49e9d2196
Merge "Add bluetooth package to permission request intent" into oc-mr1-dev am: 504b96d76c
am: 2117006bc6
am: cfdae774cd
am: 635029b87f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13088581
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I36f99bfb1e5eee253bb4ce030d7000cb40c2ff63
2020-12-09 13:49:10 +00:00
Jakub Pawlowski
24c8adbd0d
[automerger skipped] Prevent overlay drawing on top of Bluetooth activity dialog am: b29c036522
am: c721dc5bad
-s ours am: b15b6450fa
-s ours am: d35af468b7
-s ours
...
am skip reason: Change-Id I04ebe580db2b299af2bd5e44e0b0f20bd42f8535 with SHA-1 4f7edf692f
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13090436
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9e6c8911bbb7a22386468a0d077826151f7faceb
2020-12-09 13:48:57 +00:00
Yi-Ling Chuang
49cda22b76
Add mutability flag to WifiSlice.
...
Starting Android S, PendeingIntent should have a explicit mutability
flag to avoid vulnerability.
Fixes: 172204181
Test: 1. adb shell am start -a
android.settings.panel.action.INTERNET_CONNECTIVITY and play on the wifi
panel.
2. Enable contextualWifiSlice and play on it.
3. Adjust volume on the volume panel.
Change-Id: I23f03cae8c481d9f5836b7fb967f734e9c99cd65
2020-12-09 21:35:15 +08:00
TreeHugger Robot
635029b87f
Merge "Add bluetooth package to permission request intent" into oc-mr1-dev am: 504b96d76c
am: 2117006bc6
am: cfdae774cd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13088581
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iad91ec439965d52c652f79ce4d6fe3b125631f79
2020-12-09 13:03:53 +00:00
Jakub Pawlowski
d35af468b7
[automerger skipped] Prevent overlay drawing on top of Bluetooth activity dialog am: b29c036522
am: c721dc5bad
-s ours am: b15b6450fa
-s ours
...
am skip reason: Change-Id I04ebe580db2b299af2bd5e44e0b0f20bd42f8535 with SHA-1 4f7edf692f
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13090436
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I245a20b64373500c886a47d18da39500fd248c0f
2020-12-09 13:03:47 +00:00
TreeHugger Robot
cfdae774cd
Merge "Add bluetooth package to permission request intent" into oc-mr1-dev am: 504b96d76c
am: 2117006bc6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13088581
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If3605d2b4dbad8b7b4979b644c89352ee8449ba1
2020-12-09 12:17:08 +00:00
Jakub Pawlowski
b15b6450fa
[automerger skipped] Prevent overlay drawing on top of Bluetooth activity dialog am: b29c036522
am: c721dc5bad
-s ours
...
am skip reason: Change-Id I04ebe580db2b299af2bd5e44e0b0f20bd42f8535 with SHA-1 4f7edf692f
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13090436
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I26950e18ca79bb70e0a91492997242934ec19641
2020-12-09 12:16:57 +00:00
TreeHugger Robot
2117006bc6
Merge "Add bluetooth package to permission request intent" into oc-mr1-dev am: 504b96d76c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13088581
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7d7dcaefd10f297c9e268d8f9d8bf666d98b08fd
2020-12-09 12:08:40 +00:00
TreeHugger Robot
504b96d76c
Merge "Add bluetooth package to permission request intent" into oc-mr1-dev
2020-12-09 12:06:33 +00:00
Jakub Pawlowski
c721dc5bad
Prevent overlay drawing on top of Bluetooth activity dialog am: b29c036522
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13090436
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I956e8906633af45f12617dabbec4e060c14502f2
2020-12-09 11:32:56 +00:00
TreeHugger Robot
e6768c1776
Merge "[Provider Model] Saved networks Settings UI change"
2020-12-09 09:23:53 +00:00
Jakub Pawlowski
b29c036522
Prevent overlay drawing on top of Bluetooth activity dialog
...
Bug: 168504491
Merged-In: I04ebe580db2b299af2bd5e44e0b0f20bd42f8535
Change-Id: I04ebe580db2b299af2bd5e44e0b0f20bd42f8535
2020-12-09 08:00:22 +00:00
Xin Li
540fd7333f
DO NOT MERGE - Merge Android R QPR1
...
Bug: 172690556
Merged-In: Id2d9c4f56beae280e6299b6695185577a1521345
Change-Id: Ice3069b89e1a47121d1920aa3e45fbddbed5678e
2020-12-08 23:49:38 -08:00
Robert Luo
2b6fd92de9
Migrate media output switcher metrics - 2/n
...
Bug: 172181610
Test: run statsd_testdrive 277 and check the
output correctness after content switching.
Change-Id: I5abb471452ec92670d220b2472eadbe77e243653
Merged-In: I5abb471452ec92670d220b2472eadbe77e243653
2020-12-09 15:42:56 +08:00
Manish Singh
8b5f7d8f75
Remove transcoding for apps from Settings.
...
Now that we read the transcode_compat_manifest from DeviceConfig, we
don't need the app-level transcoding settings in Media transcoding
settings.
BUG=169327180
Test: manual testing.
Change-Id: Iea0c02820cb850c98d6c8f23ce828fa3d163bd80
2020-12-09 01:49:09 +00:00
TreeHugger Robot
bf03ae8cea
Merge "Prevent overlay drawing on top of Bluetooth activity dialog" into qt-dev am: 721f43dcdc
am: 537c730ca2
am: 4c4f83eb21
am: db48b810b6
am: f7f1781146
am: 3a150908c3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13090438
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I79072429c6566eeaf99b41d6e68d6d5acca30e84
2020-12-09 01:21:51 +00:00
TreeHugger Robot
3a150908c3
Merge "Prevent overlay drawing on top of Bluetooth activity dialog" into qt-dev am: 721f43dcdc
am: 537c730ca2
am: 4c4f83eb21
am: db48b810b6
am: f7f1781146
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13090438
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7414cd5ed7a804b1cf6a31dc57d6c0197219b386
2020-12-09 00:55:13 +00:00
TreeHugger Robot
8911c5b632
Merge "Prevent overlay drawing on top of Bluetooth activity dialog" into qt-dev am: 721f43dcdc
am: 537c730ca2
am: 4c4f83eb21
am: f0322276a7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13090438
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0e3add9dbe9dd2f5544ae64889282d1235add8c2
2020-12-09 00:48:28 +00:00
TreeHugger Robot
f7f1781146
Merge "Prevent overlay drawing on top of Bluetooth activity dialog" into qt-dev am: 721f43dcdc
am: 537c730ca2
am: 4c4f83eb21
am: db48b810b6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13090438
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I42ad211ac7f3341c38d7b7f992b19e3ae52c9373
2020-12-09 00:32:11 +00:00
TreeHugger Robot
f0322276a7
Merge "Prevent overlay drawing on top of Bluetooth activity dialog" into qt-dev am: 721f43dcdc
am: 537c730ca2
am: 4c4f83eb21
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13090438
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic5656366002952b9d279910e7e6d6dc217602b1a
2020-12-09 00:16:48 +00:00
TreeHugger Robot
db48b810b6
Merge "Prevent overlay drawing on top of Bluetooth activity dialog" into qt-dev am: 721f43dcdc
am: 537c730ca2
am: 4c4f83eb21
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13090438
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id38617a0c134feeb458a734a86c57360108fdd15
2020-12-09 00:16:09 +00:00
TreeHugger Robot
4c4f83eb21
Merge "Prevent overlay drawing on top of Bluetooth activity dialog" into qt-dev am: 721f43dcdc
am: 537c730ca2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13090438
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic39ad9f7212cdb757f79c61e23c84ac614e73fed
2020-12-08 23:58:02 +00:00