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
TreeHugger Robot
537c730ca2
Merge "Prevent overlay drawing on top of Bluetooth activity dialog" into qt-dev am: 721f43dcdc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13090438
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9c3d91f901bc38554732ff2cc428232f117efea0
2020-12-08 23:27:51 +00:00
TreeHugger Robot
721f43dcdc
Merge "Prevent overlay drawing on top of Bluetooth activity dialog" into qt-dev
2020-12-08 22:56:46 +00:00
Ulya Trafimovich
202ca49dfe
Add <uses-library> information.
...
The required <uses-library> "org.apache.http.legacy" is in the manifest
for Settings. It is necessary to explicitly add it to `uses_libs`
because it is not among the app dependencies (so Soong does not add it
automatically to the manifest_fixer). It also doesn't add it as a
compatibility library because the target API level for the app is not
below 28.
Bug: 132357300
Test: lunch cf_x86_phone-userdebug && m
Test: m out/soong/.intermediates/packages/apps/Settings/Settings/android_common/manifest_check/AndroidManifest.xml
Test: m out/soong/.intermediates/packages/apps/Settings/tests/robotests/SettingsRoboTestStub/android_common/manifest_check/AndroidManifest.xm
Change-Id: Id5d5fe1dff68cf6fce667a00e35710cf0e667d02
2020-12-08 12:09:53 +00:00
tim peng
df9845b438
[automerger skipped] Merge changes from topic "media_output_dialog" into rvc-qpr-dev am: 3cea72fb2b
am: c93b70e3a0
-s ours
...
am skip reason: Change-Id I1038e237113f433c847aff98a45b1dd6089d80a8 with SHA-1 82d45fa032
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13115230
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I14386f71b47d402dd85c1f4e4b6ab8eddedc06fa
2020-12-08 06:48:21 +00:00
timhypeng
5f4826dec0
[automerger skipped] Update rule of launching media output dialog am: 6472c98ffa
am: 3273b4ebb4
-s ours
...
am skip reason: Change-Id I16732f625f100b259d6e53c85db40af0ec1652c5 with SHA-1 eee759ea29
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13115229
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I68f9fcfc2ace6581513f54c44fa4d0df2d05fa5e
2020-12-08 06:48:19 +00:00
timhypeng
76bf99ed57
[automerger skipped] Update OutputSwitcher from MediaOutputSlice to MediaOutputDialog in Settings am: 7127fff467
am: c26d9f3d48
-s ours
...
am skip reason: Change-Id Ib6c86067522925c439f336644e4d027dbae3379c with SHA-1 3084d063f3
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13115228
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ibeb559b38ec768833f710b84a94131a9f536ad90
2020-12-08 06:48:17 +00:00
timhypeng
8531af0b96
[automerger skipped] Add PairNewBluetoothReceiver to launch Bluetooth pairing page am: 6afe358556
am: 3254d59f0f
-s ours
...
am skip reason: Change-Id I16767af3afb05eab7246be133011bc9148909d11 with SHA-1 c3bd801a89
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13115227
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I06aac0a336c661e74443d7c963b78234eb3a72e7
2020-12-08 06:48:14 +00:00
tim peng
c93b70e3a0
Merge changes from topic "media_output_dialog" into rvc-qpr-dev am: 3cea72fb2b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13115230
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia0416c3b3f9ce31ed35ba07363a519b15a4a0d0d
2020-12-08 06:28:52 +00:00
timhypeng
3273b4ebb4
Update rule of launching media output dialog am: 6472c98ffa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13115229
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iaeec1436e45b25fce4a4ef08155d35b8b047d916
2020-12-08 06:28:50 +00:00
timhypeng
c26d9f3d48
Update OutputSwitcher from MediaOutputSlice to MediaOutputDialog in Settings am: 7127fff467
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13115228
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id0fc610e5b5f17f9788fc12b96d2871c20be9725
2020-12-08 06:28:49 +00:00
timhypeng
3254d59f0f
Add PairNewBluetoothReceiver to launch Bluetooth pairing page am: 6afe358556
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13115227
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0bce385da81472db27ebe07634e0ad9f0507e47f
2020-12-08 06:28:46 +00:00
tim peng
3cea72fb2b
Merge changes from topic "media_output_dialog" into rvc-qpr-dev
...
* changes:
Redirect to output switcher panel to the new dialog
Update rule of launching media output dialog
Update OutputSwitcher from MediaOutputSlice to MediaOutputDialog in Settings
Add PairNewBluetoothReceiver to launch Bluetooth pairing page
2020-12-08 05:46:13 +00:00
Remi NGUYEN VAN
f40f71ccf1
Replace isWeaklyValidatedHostname with guava
...
The guava implementation is more accurate than the basic NetworkUtils
implementation.
NetworkUtils is being moved to its own JAR and will not be available
from Settings.
Bug: 174436414
Test: m
Wrote test for isWeaklyValidatedHostname, verified it passes with
guava
Change-Id: I1d01f2beba36009e17f651652e2d7f57be5aa398
2020-12-08 14:02:17 +09:00
TreeHugger Robot
84d4237008
Merge "Fix advanced device icon won't update issue"
2020-12-08 02:29:37 +00:00
tim peng
cf4d295959
[automerger skipped] Merge "Fix java.lang.ArrayIndexOutOfBoundsException in RemoteVolumeGroupController" into rvc-qpr-dev am: de2f2754d9
am: 32ef316678
-s ours
...
am skip reason: Change-Id Ibfc11e1bd99ba2e578b5d9e7dcc9132e372b68dd with SHA-1 1268629fda
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13136219
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1d9bf7bb9ad136975ec302c751cdf792311893f3
2020-12-08 02:18:14 +00:00
tim peng
32ef316678
Merge "Fix java.lang.ArrayIndexOutOfBoundsException in RemoteVolumeGroupController" into rvc-qpr-dev am: de2f2754d9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13136219
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id4c0ebb50dd2caaeabb1f39549a80d1de0890201
2020-12-08 01:09:56 +00:00
tim peng
de2f2754d9
Merge "Fix java.lang.ArrayIndexOutOfBoundsException in RemoteVolumeGroupController" into rvc-qpr-dev
2020-12-08 00:55:21 +00:00
Xiao Ma
379cd8a008
Merge "Update the Warning text about the visibility of device name." into rvc-qpr-dev am: a63d8db293
am: b48fffc33b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13170053
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I151c304b623cdb937eb4a208a3c72cf50440e9eb
2020-12-08 00:52:31 +00:00
Xiao Ma
b48fffc33b
Merge "Update the Warning text about the visibility of device name." into rvc-qpr-dev am: a63d8db293
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13170053
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib822c372af03860a63533ec44638389fb25e2ffb
2020-12-08 00:37:18 +00:00
Xiao Ma
a63d8db293
Merge "Update the Warning text about the visibility of device name." into rvc-qpr-dev
2020-12-08 00:15:53 +00:00
TreeHugger Robot
d3aec37f3a
[automerger skipped] Merge "RESTRICT AUTOMERGE Prevent non-system overlays from showing over notification listener consent dialog" into qt-dev am: a91519976e
am: 2aa9a43701
-s ours am: a9892de23f
am: 85f6ce8e71
am: d6d4c2ac64
am: 7787e22dd3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12998689
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie16930e02e4035de7386f96704c7232317afee18
2020-12-07 21:33:03 +00:00
Eugene Susla
d3e3a6c931
[automerger skipped] RESTRICT AUTOMERGE am: 2e82aa5d05
am: c8d81959a2
-s ours am: bfee0284e1
am: a5da16b1d6
am: bbad7cee9c
am: cd191477c8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12998689
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7fd01ec8b19ba20712ef08de5c8d3af82a274489
2020-12-07 21:32:58 +00:00
Eugene Susla
57109fabe4
[automerger skipped] RESTRICT AUTOMERGE am: 0c870fd7df
-s ours am: 74ca730b4a
-s ours am: 22864c728b
am: 24ec36b6e8
-s ours am: 40961e80cd
am: cf7f335294
am: edad8243b0
am: 39075b350e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13066751
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id4775c57fedc48283efa881b53f9e6b0f6b4152a
2020-12-07 21:29:24 +00:00