Andras Kloczl
7ed616c466
[automerger skipped] Prevent using invalid result uri during multi user image change am: e0f8214e80 -s ours am: c40b15712c -s ours am: a95829294d -s ours
...
am skip reason: Change-Id I3e6f6200e82e86d6a2085652906ad2d0d44814f5 with SHA-1 798bdd90b0 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13815795
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I53017d6891c267f1023198cd5e53887d15c30aeb
2021-03-11 11:03:54 +00:00
Andras Kloczl
a95829294d
[automerger skipped] Prevent using invalid result uri during multi user image change am: e0f8214e80 -s ours am: c40b15712c -s ours
...
am skip reason: Change-Id I3e6f6200e82e86d6a2085652906ad2d0d44814f5 with SHA-1 798bdd90b0 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13815795
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4017e71f1c6b9f6a1eee1cde5d8c3534fa4a4ed5
2021-03-11 10:42:06 +00:00
Andras Kloczl
6355d222cd
[automerger skipped] Prevent using invalid result uri during multi user image change am: 798bdd90b0 -s ours am: 373b53a7cc -s ours
...
am skip reason: Change-Id I3e6f6200e82e86d6a2085652906ad2d0d44814f5 with SHA-1 e36357b20c is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13815796
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I745498eef55d159e98e6d1b2d549fc20a05c59e4
2021-03-11 10:28:59 +00:00
Andras Kloczl
7f3b720d75
Prevent using invalid result uri during multi user image change am: e36357b20c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13815797
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If1a8977045597d896bd58ace3f2319aefbd86858
2021-03-11 10:28:52 +00:00
Andras Kloczl
c40b15712c
[automerger skipped] Prevent using invalid result uri during multi user image change am: e0f8214e80 -s ours
...
am skip reason: Change-Id I3e6f6200e82e86d6a2085652906ad2d0d44814f5 with SHA-1 798bdd90b0 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13815795
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I155c9ce1031960174f802c15102d3c2a3619bfb6
2021-03-11 10:24:25 +00:00
Andras Kloczl
373b53a7cc
[automerger skipped] Prevent using invalid result uri during multi user image change am: 798bdd90b0 -s ours
...
am skip reason: Change-Id I3e6f6200e82e86d6a2085652906ad2d0d44814f5 with SHA-1 e36357b20c is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13815796
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3c374ecf934e3356f6d656908dab6f02ab215763
2021-03-11 10:24:17 +00:00
Andras Kloczl
e0f8214e80
Prevent using invalid result uri during multi user image change
...
Test: manual
Bug: 172939189
Change-Id: I3e6f6200e82e86d6a2085652906ad2d0d44814f5
Merged-In: I3e6f6200e82e86d6a2085652906ad2d0d44814f5
Merged-In: Id2e598878b3250e8b3590905c6def561e2437d55
Merged-In: I15e15ad88b768a5b679de32c5429d921d850a3cb
2021-03-11 00:15:46 +00:00
Andras Kloczl
798bdd90b0
Prevent using invalid result uri during multi user image change
...
Test: manual
Bug: 172939189
Change-Id: I3e6f6200e82e86d6a2085652906ad2d0d44814f5
Merged-In: I3e6f6200e82e86d6a2085652906ad2d0d44814f5
Merged-In: Id2e598878b3250e8b3590905c6def561e2437d55
Merged-In: I15e15ad88b768a5b679de32c5429d921d850a3cb
2021-03-11 00:15:27 +00:00
Andras Kloczl
e36357b20c
Prevent using invalid result uri during multi user image change
...
Test: manual
Bug: 172939189
Change-Id: I3e6f6200e82e86d6a2085652906ad2d0d44814f5
Merged-In: I3e6f6200e82e86d6a2085652906ad2d0d44814f5
Merged-In: Id2e598878b3250e8b3590905c6def561e2437d55
Merged-In: I15e15ad88b768a5b679de32c5429d921d850a3cb
2021-03-11 00:14:59 +00:00
Weng Su
422280c10d
[automerger skipped] [Security Report] Fix Settings WifiScanModeActivity Overlaid issue am: 32d5d3a3a3 -s ours am: efb2543e93 -s ours am: 385b5cafd2 -s ours am: 8aa56318f8 -s ours
...
am skip reason: Change-Id Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff with SHA-1 58b0f2d5b3 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13448946
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Idad0d4683f21d80027e0891b1d14c1dd6b71245f
2021-03-05 20:19:15 +00:00
Weng Su
8aa56318f8
[automerger skipped] [Security Report] Fix Settings WifiScanModeActivity Overlaid issue am: 32d5d3a3a3 -s ours am: efb2543e93 -s ours am: 385b5cafd2 -s ours
...
am skip reason: Change-Id Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff with SHA-1 58b0f2d5b3 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13448946
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7896b97e36005b6f3b28f448a2e2ede6d373259f
2021-03-05 19:39:23 +00:00
Weng Su
385b5cafd2
[automerger skipped] [Security Report] Fix Settings WifiScanModeActivity Overlaid issue am: 32d5d3a3a3 -s ours am: efb2543e93 -s ours
...
am skip reason: Change-Id Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff with SHA-1 faa5f6b5f6 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13448946
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9ae7ce98bd42db5528d78be0e8a72b86a5de9ee9
2021-03-05 18:44:22 +00:00
Weng Su
efb2543e93
[automerger skipped] [Security Report] Fix Settings WifiScanModeActivity Overlaid issue am: 32d5d3a3a3 -s ours
...
am skip reason: Change-Id Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff with SHA-1 faa5f6b5f6 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13448946
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0d012e372d801b90f303a5138eed04d13dd1300a
2021-03-05 18:12:04 +00:00
Weng Su
66be7c55a2
[automerger skipped] [Security Report] Fix Settings WifiScanModeActivity Overlaid issue am: faa5f6b5f6 -s ours am: 9da6b6f4ae -s ours am: b2af05bf21 -s ours
...
am skip reason: Change-Id Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff with SHA-1 58b0f2d5b3 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13448945
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic21478386815ca5cd2f7513faf586d42963506e3
2021-03-05 05:59:16 +00:00
Weng Su
b2af05bf21
[automerger skipped] [Security Report] Fix Settings WifiScanModeActivity Overlaid issue am: faa5f6b5f6 -s ours am: 9da6b6f4ae -s ours
...
am skip reason: Change-Id Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff with SHA-1 58b0f2d5b3 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13448945
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I909b96de08c455dd659c8cf9fbf19f52722622e7
2021-03-05 05:07:57 +00:00
TreeHugger Robot
f0c01c5368
[automerger skipped] Merge "[Security Report] Fix Settings WifiScanModeActivity Overlaid issue" into rvc-dev am: e0a922612f -s ours
...
am skip reason: Change-Id Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff with SHA-1 05d6fa9bcb is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13432624
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iffb7e0ebc39de25f279ecf75d3eee8491c3f3bbb
2021-03-05 04:30:53 +00:00
Weng Su
2a0cad3a2a
[Security Report] Fix Settings WifiScanModeActivity Overlaid issue am: 05d6fa9bcb am: f71502fb10
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13468308
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1acaa4a03d9f40baa0a8382e40d31c00b5154465
2021-03-05 04:30:04 +00:00
Weng Su
9da6b6f4ae
[automerger skipped] [Security Report] Fix Settings WifiScanModeActivity Overlaid issue am: faa5f6b5f6 -s ours
...
am skip reason: Change-Id Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff with SHA-1 05d6fa9bcb is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13448945
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I120f48d18c1591b5d1e1b1182e4ce06d9babbb7a
2021-03-05 04:24:50 +00:00
TreeHugger Robot
e0a922612f
Merge "[Security Report] Fix Settings WifiScanModeActivity Overlaid issue" into rvc-dev
2021-03-04 23:48:51 +00:00
Weng Su
f71502fb10
[Security Report] Fix Settings WifiScanModeActivity Overlaid issue am: 05d6fa9bcb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13468308
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I578a0db27ddf400017d53edadcb13938f398210b
2021-03-04 23:05:59 +00:00
Bill Yi
e1c109b18f
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I92331438bfe6ec4d779d6238a9892f6d1cb72de1
2021-02-12 08:02:38 +00:00
Bill Yi
4934aa0168
Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod
2021-02-08 15:44:47 +00:00
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