Bill Yi
432eae5d7b
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I716aa1af5ba10de0577da8c6cd471f7c1785b3d4
2021-02-07 18:03:58 +00:00
Bill Yi
797e1e30e7
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ia01c0035522017ff13ded68061fe7890c7a8fa66
2021-02-07 17:33:30 +00:00
Weng Su
05d6fa9bcb
[Security Report] Fix Settings WifiScanModeActivity Overlaid issue
...
- Disallowed non system overlay windows
- Screenshot
https://screenshot.googleplex.com/77fJ9QN6pV4zFYc
Bug: 174047492
Test: manual test
Merged-In: Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff
Change-Id: Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff
(cherry picked from commit d47d8e4fc5
)
2021-02-03 10:00:07 +00:00
Weng Su
32d5d3a3a3
[Security Report] Fix Settings WifiScanModeActivity Overlaid issue
...
- Disallowed non system overlay windows
- Screenshot
https://screenshot.googleplex.com/77fJ9QN6pV4zFYc
Bug: 174047492
Test: manual test
Merged-In: Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff
Change-Id: Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff
(cherry picked from commit d47d8e4fc5
)
2021-02-01 03:45:27 +00:00
Weng Su
faa5f6b5f6
[Security Report] Fix Settings WifiScanModeActivity Overlaid issue
...
- Disallowed non system overlay windows
- Screenshot
https://screenshot.googleplex.com/77fJ9QN6pV4zFYc
Bug: 174047492
Test: manual test
Merged-In: Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff
Change-Id: Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff
(cherry picked from commit d47d8e4fc5
)
2021-02-01 03:42:15 +00:00
Weng Su
58b0f2d5b3
[Security Report] Fix Settings WifiScanModeActivity Overlaid issue
...
- Disallowed non system overlay windows
- Screenshot
https://screenshot.googleplex.com/77fJ9QN6pV4zFYc
Bug: 174047492
Test: manual test
Merged-In: Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff
Change-Id: Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff
(cherry picked from commit d47d8e4fc5
)
2021-02-01 03:39:30 +00:00
Bill Yi
fe25d2494e
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I82cd7cade2ecb3469af36801612b453d714d62bd
2021-01-28 23:59:35 -08:00
Bill Yi
3d1da30897
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ie9d9adce35398e4f2b80e97233034ef15cf5c81b
2021-01-26 09:42:53 -08:00
Bill Yi
83632e4b3d
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I28d06993be719bcde62c00d51d1f9b22389eb746
2021-01-23 23:53:18 -08:00
Bill Yi
2bf6a2bbd2
Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod
2021-01-20 21:52:36 +00:00
Bill Yi
b375f1e2f0
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I24202252f42fa2fd1c401b437ede5f90a561ac6a
2021-01-20 07:54:48 -08:00
Bill Yi
f253392e46
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Iebb51a5fceee6d39e00b2de88c7d19a352411647
2021-01-20 07:06:43 -08:00
Bill Yi
65dbe17add
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I15adf2fb53f5b1622970fe930b779e2d73093256
2021-01-14 21:19:36 -08:00
Bill Yi
1fa997bb14
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ieda9ae4468f5d7d1c45f480780b9893b952c2e02
2021-01-12 22:39:28 -08:00
Bryan Ferris
24390f2449
[automerger skipped] Merge "RESTRICT AUTOMERGE Update String" into pi-dev am: 8a79a4314d
-s ours am: 12033fe425
am: f5477b05d9
-s ours am: 857f330841
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13276368
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1670f28e87a1838b128d47fd09db8688e6d77605
2021-01-08 03:54:30 +00:00
Bryan Ferris
857f330841
[automerger skipped] Merge "RESTRICT AUTOMERGE Update String" into pi-dev am: 8a79a4314d
-s ours am: 12033fe425
am: f5477b05d9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13276368
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I41680fe10178c008dbf5a173f8c73892cb49422d
2021-01-08 03:17:10 +00:00
Bryan Ferris
f5477b05d9
[automerger skipped] Merge "RESTRICT AUTOMERGE Update String" into pi-dev am: 8a79a4314d
-s ours am: 12033fe425
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13276368
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie1e8ff34d2a4976e89d5cbe03db797156dc764e5
2021-01-08 02:56:12 +00:00
Bryan Ferris
12033fe425
[automerger skipped] Merge "RESTRICT AUTOMERGE Update String" into pi-dev am: 8a79a4314d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13276368
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I23717e289650bb8996db1e51e601b78515cdd81b
2021-01-08 02:12:14 +00:00
Bryan Ferris
8a79a4314d
Merge "RESTRICT AUTOMERGE Update String" into pi-dev
2021-01-08 01:35:51 +00:00
TreeHugger Robot
a294dac526
Merge changes Ib9a3c4fa,Idc6ef558 into qt-dev am: c0cd669bef
am: af29a157db
am: 0b9260031d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275409
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0bee116fd12d811e2e3f9ecb181530199605f8b0
2021-01-07 08:35:39 +00:00
Hugh Chen
5a01cc4489
[automerger skipped] RESTRICT AUTOMERGE Update String am: 19aeca103d
am: 5108e1bd83
-s ours am: 13a927cb9c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275409
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I81992f44a83997ab81cc52749f61ed64b5dca98a
2021-01-07 08:35:38 +00:00
TreeHugger Robot
0b9260031d
Merge changes Ib9a3c4fa,Idc6ef558 into qt-dev am: c0cd669bef
am: af29a157db
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275409
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5baf77f1f44a4bcc5c6f6632c3658a1777f5af17
2021-01-07 08:19:36 +00:00
Hugh Chen
13a927cb9c
[automerger skipped] RESTRICT AUTOMERGE Update String am: 19aeca103d
am: 5108e1bd83
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275409
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If6926664e21281b3f9567e430b62837ae09c02cd
2021-01-07 08:19:34 +00:00
TreeHugger Robot
af29a157db
Merge changes Ib9a3c4fa,Idc6ef558 into qt-dev am: c0cd669bef
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275409
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iaf935ec22f8f61936be068b4771af406ae56599b
2021-01-07 08:05:54 +00:00
Hugh Chen
5108e1bd83
RESTRICT AUTOMERGE Update String am: 19aeca103d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275409
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0e4b9032a22e5306c5e10ff54f75dd4739199605
2021-01-07 08:05:52 +00:00
TreeHugger Robot
c0cd669bef
Merge changes Ib9a3c4fa,Idc6ef558 into qt-dev
...
* changes:
RESTRICT AUTOMERGE Update String
RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message
2021-01-07 07:22:54 +00:00
Hugh Chen
8cdb990020
[automerger skipped] RESTRICT AUTOMERGE Update String am: 48ec74592d
-s ours am: 57358903b3
-s ours am: 77d2c798e5
am: 84f9417fa2
-s ours am: fc0292dc19
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275407
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I494046bd04f391b0f5d3859bc40af69e73af330a
2021-01-07 03:23:32 +00:00
Hugh Chen
81ec3d158d
[automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 9037e43fa8
-s ours am: d6bc0a328f
-s ours am: 5036eee733
am: 535f5ba053
-s ours am: d62def70c7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275406
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I16fddbd3bf1edb8f99b0b688dbeb0b0b8c5b3923
2021-01-07 03:23:31 +00:00
TreeHugger Robot
f6277c3e3a
[automerger skipped] Merge "RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message" into pi-dev am: 1a6a1b12ef
-s ours am: c5f7e582b4
am: 5bd40911f5
-s ours am: 6bae86bec6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13276367
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I628383fcd3cd23d8a0de79e7024ca8ee9fa68272
2021-01-07 03:23:19 +00:00
Hugh Chen
fc0292dc19
[automerger skipped] RESTRICT AUTOMERGE Update String am: 48ec74592d
-s ours am: 57358903b3
-s ours am: 77d2c798e5
am: 84f9417fa2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275407
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3dafec35dab7457e6301017b49cd9b3b92491869
2021-01-07 02:40:55 +00:00
Hugh Chen
d62def70c7
[automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 9037e43fa8
-s ours am: d6bc0a328f
-s ours am: 5036eee733
am: 535f5ba053
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275406
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5e04a58a35ea2c11731a8ec2e8661080e28ccd77
2021-01-07 02:40:54 +00:00
TreeHugger Robot
6bae86bec6
[automerger skipped] Merge "RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message" into pi-dev am: 1a6a1b12ef
-s ours am: c5f7e582b4
am: 5bd40911f5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13276367
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1180cd764b23ee4687e353777c68be177c2b71aa
2021-01-07 02:40:47 +00:00
Hugh Chen
84f9417fa2
[automerger skipped] RESTRICT AUTOMERGE Update String am: 48ec74592d
-s ours am: 57358903b3
-s ours am: 77d2c798e5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275407
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I237872bf9d2d67b2da1087ebedd0c753b00bcfd2
2021-01-07 02:16:44 +00:00
Hugh Chen
535f5ba053
[automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 9037e43fa8
-s ours am: d6bc0a328f
-s ours am: 5036eee733
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275406
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I872358cea725ef692d6193a6d09eca966ecc3e8d
2021-01-07 02:16:43 +00:00
TreeHugger Robot
5bd40911f5
[automerger skipped] Merge "RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message" into pi-dev am: 1a6a1b12ef
-s ours am: c5f7e582b4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13276367
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ieb64d2ddbcf8659ff32029b93a266e89ed04cde5
2021-01-07 02:16:37 +00:00
Hugh Chen
77d2c798e5
[automerger skipped] RESTRICT AUTOMERGE Update String am: 48ec74592d
-s ours am: 57358903b3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275407
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8d018bfd516557b7a643842a1538e59053f1706e
2021-01-07 01:56:51 +00:00
Hugh Chen
5036eee733
[automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 9037e43fa8
-s ours am: d6bc0a328f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275406
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iec4bc73ee0fd32c31d67f8bb5fef7b1c1e31e32c
2021-01-07 01:56:50 +00:00
TreeHugger Robot
c5f7e582b4
[automerger skipped] Merge "RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message" into pi-dev am: 1a6a1b12ef
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13276367
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If4601e6a2be1265e01baea5e73f34d7989d6fcad
2021-01-07 01:56:43 +00:00
Hugh Chen
57358903b3
[automerger skipped] RESTRICT AUTOMERGE Update String am: 48ec74592d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275407
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I94614a9cac3555ec44d6cfef6e7af4a6b24f6272
2021-01-07 01:55:50 +00:00
Hugh Chen
d6bc0a328f
[automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 9037e43fa8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275406
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0e109407102ce058e806f3a239882dc8abaa36a7
2021-01-07 01:55:49 +00:00
TreeHugger Robot
1a6a1b12ef
Merge "RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message" into pi-dev
2021-01-07 01:27:50 +00:00
Hugh Chen
c148c76b20
RESTRICT AUTOMERGE Update String am: 085f70d48d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275411
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3c78e392639cd06925ba054dfb7e2980b36d06ef
2021-01-06 23:33:23 +00:00
Hugh Chen
bac6aab059
RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 8ecca02ece
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275410
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I23b2b58f32f48b20313df6a02efc6b6b6fda8e86
2021-01-06 23:33:07 +00:00
Hugh Chen
085f70d48d
RESTRICT AUTOMERGE Update String
...
Remove brackets.
Bug: 176106404
Bug: 167403112
Test: build pass
Change-Id: Ib9a3c4fa3c6ea1ca54244d672bdc3e12d51a719f
2020-12-30 18:35:03 -08:00
Hugh Chen
8ecca02ece
RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message
...
Before this CL, there is a possible phishing attack allowing a malicious
BT device to acquire permissions based on insufficient information
presented to the user in the consent dialog. This could lead to local
escalation of privilege with no additional execution privileges needed.
User interaction is needed for exploitation.
This CL add more prompts presented for users to avoid phishing attacks.
Merge Conflict Notes:
There were a number of entries in strings.xml that did not exist on this
branch. However, as the CL only adds new entries rather than modifying
old ones this should not cause a problem. There were no merge conflicts
in the java files.
Bug: 167403112
Test: send intent to test right prompts message is pop up. make -j42 RunSettingsRoboTests
Change-Id: Idc6ef558b692115bb82ea58cf223f5919b618633
2020-12-30 18:34:43 -08:00
Hugh Chen
19aeca103d
RESTRICT AUTOMERGE Update String
...
Remove brackets.
Bug: 176106404
Bug: 167403112
Test: build pass
Change-Id: Ib9a3c4fa3c6ea1ca54244d672bdc3e12d51a719f
2020-12-30 18:34:05 -08:00
Hugh Chen
bbe765f992
RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message
...
Before this CL, there is a possible phishing attack allowing a malicious
BT device to acquire permissions based on insufficient information
presented to the user in the consent dialog. This could lead to local
escalation of privilege with no additional execution privileges needed.
User interaction is needed for exploitation.
This CL add more prompts presented for users to avoid phishing attacks.
Merge Conflict Notes:
There were a number of entries in strings.xml that did not exist on this
branch. However, as the CL only adds new entries rather than modifying
old ones this should not cause a problem. There were no merge conflicts
in the java files.
Bug: 167403112
Test: send intent to test right prompts message is pop up. make -j42 RunSettingsRoboTests
Change-Id: Idc6ef558b692115bb82ea58cf223f5919b618633
2020-12-30 18:33:52 -08:00
Hugh Chen
ccbe74f555
RESTRICT AUTOMERGE Update String
...
Remove brackets.
Bug: 176106404
Bug: 167403112
Test: build pass
Change-Id: Ib9a3c4fa3c6ea1ca54244d672bdc3e12d51a719f
2020-12-30 18:33:12 -08:00
Hugh Chen
01a50db645
RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message
...
Before this CL, there is a possible phishing attack allowing a malicious
BT device to acquire permissions based on insufficient information
presented to the user in the consent dialog. This could lead to local
escalation of privilege with no additional execution privileges needed.
User interaction is needed for exploitation.
This CL add more prompts presented for users to avoid phishing attacks.
Merge Conflict Notes:
There were a number of entries in strings.xml that did not exist on this
branch. However, as the CL only adds new entries rather than modifying
old ones this should not cause a problem. There were no merge conflicts
in the java files.
Bug: 167403112
Test: send intent to test right prompts message is pop up. make -j42 RunSettingsRoboTests
Change-Id: Idc6ef558b692115bb82ea58cf223f5919b618633
2020-12-30 18:32:58 -08:00
Hugh Chen
48ec74592d
RESTRICT AUTOMERGE Update String
...
Remove brackets.
Bug: 176106404
Bug: 167403112
Test: build pass
Change-Id: Ib9a3c4fa3c6ea1ca54244d672bdc3e12d51a719f
2020-12-30 18:31:39 -08:00