Bill Yi
51221d77f7
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I830341ac6e908b358eb878baa11e62ebbf4fcfd9
2021-05-07 16:53:34 +00:00
TreeHugger Robot
fdcf96ee99
[automerger skipped] Merge "[DO NOT MERGE] Modify Wi-Fi details settings to restricted style" into rvc-dev am: 21ab21168b
-s ours
...
am skip reason: Merged-In I5f857b2079e0f550e4be601d27dd54dac56b2f57 with SHA-1 1f24c6a968
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14352145
Change-Id: Ia495305891c49e3ffee19d7bee3f0107f6085ad3
2021-05-06 06:52:02 +00:00
TreeHugger Robot
21ab21168b
Merge "[DO NOT MERGE] Modify Wi-Fi details settings to restricted style" into rvc-dev
2021-05-06 06:30:13 +00:00
Weng Su
2e9640d5b0
[automerger skipped] [DO NOT MERGE] Modify Wi-Fi details settings to restricted style am: 1f24c6a968
am: 632eb0d54a
-s ours am: 41b7d11496
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14352149
Change-Id: Ifcf837b36c99311ada4c7e1655dbd8a6b6ac6ad7
2021-05-06 00:41:08 +00:00
Weng Su
41b7d11496
[automerger skipped] [DO NOT MERGE] Modify Wi-Fi details settings to restricted style am: 1f24c6a968
am: 632eb0d54a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14352149
Change-Id: I76f3b2ce80dd10bffb768862de34bc94b1f3d4b2
2021-05-06 00:16:30 +00:00
Weng Su
632eb0d54a
[DO NOT MERGE] Modify Wi-Fi details settings to restricted style am: 1f24c6a968
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14352149
Change-Id: I45816ca240725b57db5a68ac1b960dab5b8f1b0b
2021-05-05 23:59:31 +00:00
Bill Yi
fe0e09fdb4
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I08b788ccb14010924b696e28eba8bcc600a5be5b
2021-05-04 00:10:14 +00:00
TreeHugger Robot
01aeea2e4a
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2021-04-30 02:21:29 +00:00
Bill Yi
090db24c56
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I10014f28a6678e3510e293bde00e2ccd909406f7
2021-04-29 20:58:45 +00:00
Bill Yi
98cbf6d0a9
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I2c4d8200a195a4c1ec9b7d140254085e6762219d
2021-04-29 20:55:07 +00:00
Weng Su
1f24c6a968
[DO NOT MERGE] Modify Wi-Fi details settings to restricted style
...
- Show restricted text in guest mode
- Screenshot:
https://screenshot.googleplex.com/6nYcmazMM46TxaB
Bug: 177573895
Test: manual test
make RunSettingsRoboTests \
ROBOTEST_FILTER=WifiNetworkDetailsFragmentTest
Change-Id: I5f857b2079e0f550e4be601d27dd54dac56b2f57
Merged-In: I5f857b2079e0f550e4be601d27dd54dac56b2f57
2021-04-29 14:38:27 +00:00
Weng Su
649bed1524
[DO NOT MERGE] Modify Wi-Fi details settings to restricted style
...
- Show restricted text in guest mode
- Screenshot:
https://screenshot.googleplex.com/6nYcmazMM46TxaB
Bug: 177573895
Test: manual test
make RunSettingsRoboTests \
ROBOTEST_FILTER=WifiNetworkDetailsFragmentTest
Change-Id: I5f857b2079e0f550e4be601d27dd54dac56b2f57
Merged-In: I5f857b2079e0f550e4be601d27dd54dac56b2f57
2021-04-29 13:11:33 +00:00
Tsung-Mao Fang
697a73dfdf
[automerger skipped] Prevent HTML Injection on the Device Admin request screen am: 80c3f6d4d8
am: 26f3013c32
-s ours am: 4d7853f35c
-s ours am: 4c05b195d7
-s ours am: a66212e11d
-s ours
...
am skip reason: Merged-In I53b460b12da918e022d2f2934f114d205dbaadb0 with SHA-1 52f9039d5c
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14167794
Change-Id: Iff3503de805075b9645a9f3b9a046460b35ce5ef
2021-04-29 07:22:15 +00:00
Tsung-Mao Fang
a66212e11d
[automerger skipped] Prevent HTML Injection on the Device Admin request screen am: 80c3f6d4d8
am: 26f3013c32
-s ours am: 4d7853f35c
-s ours am: 4c05b195d7
-s ours
...
am skip reason: Merged-In I53b460b12da918e022d2f2934f114d205dbaadb0 with SHA-1 52f9039d5c
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14167794
Change-Id: I8cf58ae2e0a0632dc97b2cb049225959fd570828
2021-04-29 07:06:42 +00:00
Tsung-Mao Fang
4c05b195d7
[automerger skipped] Prevent HTML Injection on the Device Admin request screen am: 80c3f6d4d8
am: 26f3013c32
-s ours am: 4d7853f35c
-s ours
...
am skip reason: Merged-In I53b460b12da918e022d2f2934f114d205dbaadb0 with SHA-1 52f9039d5c
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14167794
Change-Id: I08c75393a497f2d3784ea89376c5a0d0abf7517e
2021-04-29 06:51:51 +00:00
Tsung-Mao Fang
4d7853f35c
[automerger skipped] Prevent HTML Injection on the Device Admin request screen am: 80c3f6d4d8
am: 26f3013c32
-s ours
...
am skip reason: Merged-In I53b460b12da918e022d2f2934f114d205dbaadb0 with SHA-1 52f9039d5c
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14167794
Change-Id: I1433418c4c0ffbf0e0337f6a03c03c22d594d349
2021-04-29 06:38:45 +00:00
Tsung-Mao Fang
26f3013c32
Prevent HTML Injection on the Device Admin request screen am: 80c3f6d4d8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14167794
Change-Id: Iac38c0d7f7517c8d4ecac036e73524d37c66fb6e
2021-04-29 06:21:38 +00:00
TreeHugger Robot
697411518c
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2021-04-27 15:50:33 +00:00
TreeHugger Robot
4fd6557446
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2021-04-27 15:48:51 +00:00
Tsung-Mao Fang
9d5a7aa322
Prevent HTML Injection on the Device Admin request screen am: 52f9039d5c
am: 6ac45a7ceb
am: f470b78ff2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14167797
Change-Id: I64550f7d57fd8c4cd2a142188ed78e9bb49f1c9f
2021-04-27 12:54:02 +00:00
Tsung-Mao Fang
f470b78ff2
Prevent HTML Injection on the Device Admin request screen am: 52f9039d5c
am: 6ac45a7ceb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14167797
Change-Id: I4dd08163fb97a16c88aa23bdc39851b327034940
2021-04-27 12:30:50 +00:00
Tsung-Mao Fang
6ac45a7ceb
Prevent HTML Injection on the Device Admin request screen am: 52f9039d5c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14167797
Change-Id: I80b527b2bb891b3944a11ceecf296fdefaefff72
2021-04-27 12:15:53 +00:00
Bill Yi
1296c998dc
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ifb1673ddffb724df5b7a587e9dd9a761b9820b3b
2021-04-27 11:36:37 +00:00
Bill Yi
abedd5d55a
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I8a23676662f760eca22337c8cee2b1df7b348ccc
2021-04-27 11:33:06 +00:00
TreeHugger Robot
75de88c1d6
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2021-04-23 16:37:19 +00:00
Bill Yi
83921b7427
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I1cdc0d542f75078c9e53d9a2cdc5fd1af12d23d8
2021-04-23 11:30:58 +00:00
Bill Yi
7201890895
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ic5cc7bbb24715e6845f855156e63d3518e274d6b
2021-04-23 11:27:37 +00:00
TreeHugger Robot
b2185f5ede
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2021-04-21 08:21:52 +00:00
Bill Yi
258d71bdb5
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I78ea5296db70d652825abe7a8838613027945e53
2021-04-21 07:13:04 +00:00
Bill Yi
34ce6187c8
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ia246265007d3858abdac7c9c5d368c607afd5a15
2021-04-21 07:09:42 +00:00
TreeHugger Robot
6a691cbc1a
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2021-04-19 22:11:59 +00:00
Bill Yi
4edd6f1d2e
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I0eb5c765212e06835518338f632653cd97764b16
2021-04-19 20:59:50 +00:00
Bill Yi
e7ff773ec9
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I63b71ebf8f57a8effa4345bb1b00dbf35c2b1b3e
2021-04-19 20:56:11 +00:00
Tsung-Mao Fang
80c3f6d4d8
Prevent HTML Injection on the Device Admin request screen
...
The root issue is that CharSequence is an interface.
String implements that interface, however, Spanned class
too which is a rich text format that can store HTML code.
The solution is enforce to use String type which won't include
any HTML function.
Test: Rebuilt apk and see the string without HTML style.
Bug: 179042963
Change-Id: I53b460b12da918e022d2f2934f114d205dbaadb0
Merged-In: I53b460b12da918e022d2f2934f114d205dbaadb0
2021-04-14 12:19:21 +00:00
Tsung-Mao Fang
52f9039d5c
Prevent HTML Injection on the Device Admin request screen
...
The root issue is that CharSequence is an interface.
String implements that interface, however, Spanned class
too which is a rich text format that can store HTML code.
The solution is enforce to use String type which won't include
any HTML function.
Test: Rebuilt apk and see the string without HTML style.
Bug: 179042963
Change-Id: I53b460b12da918e022d2f2934f114d205dbaadb0
Merged-In: I53b460b12da918e022d2f2934f114d205dbaadb0
(cherry picked from commit 0bf3c98b2f
)
2021-04-14 12:16:57 +00:00
TreeHugger Robot
8ec57d3e30
[automerger skipped] Merge "Hide non-system overlay window on ActivityPicker" into pi-dev am: d2ee0db550
-s ours am: c3edd0b379
-s ours am: 00e30fba67
-s ours am: be6b904ec5
-s ours
...
am skip reason: skip tag Change-Id I6e2845cc19dc012cba2933318a067bbb8db90a23 with SHA-1 8a9fafb37d
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14108645
Change-Id: I92487706addaddda44613b00903c4dd5c862de3a
2021-04-09 18:52:26 +00:00
TreeHugger Robot
be6b904ec5
[automerger skipped] Merge "Hide non-system overlay window on ActivityPicker" into pi-dev am: d2ee0db550
-s ours am: c3edd0b379
-s ours am: 00e30fba67
-s ours
...
am skip reason: skip tag Change-Id I6e2845cc19dc012cba2933318a067bbb8db90a23 with SHA-1 8a9fafb37d
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14108645
Change-Id: I8dae5afba2b9b3ad00a1c7d8ec0d254abd706901
2021-04-09 18:10:21 +00:00
TreeHugger Robot
00e30fba67
[automerger skipped] Merge "Hide non-system overlay window on ActivityPicker" into pi-dev am: d2ee0db550
-s ours am: c3edd0b379
-s ours
...
am skip reason: skip tag Change-Id I6e2845cc19dc012cba2933318a067bbb8db90a23 with SHA-1 8a9fafb37d
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14108645
Change-Id: I0f596d744078240f574e6f998cbb7dd9e8d09dfd
2021-04-09 17:27:01 +00:00
TreeHugger Robot
c3edd0b379
[automerger skipped] Merge "Hide non-system overlay window on ActivityPicker" into pi-dev am: d2ee0db550
-s ours
...
am skip reason: skip tag Change-Id I6e2845cc19dc012cba2933318a067bbb8db90a23 with SHA-1 8a9fafb37d
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14108645
Change-Id: Ie4514dfe4f245139b9733d903f8f36ed29af998c
2021-04-09 16:50:18 +00:00
TreeHugger Robot
d2ee0db550
Merge "Hide non-system overlay window on ActivityPicker" into pi-dev
2021-04-09 15:58:30 +00:00
Arc Wang
636e70fbf2
Hide non-system overlay window on ActivityPicker
...
To improve security.
Bug: 181962311
Test: manual
Show an AlertDialog and observe if it will hide after below command.
adb shell am start -a android.intent.action.PICK_ACTIVITY -n com.android.settings/.ActivityPicker
Change-Id: I43bb0f47a96719c61c5beb4ddf486b14cbdd6ee8
Merged-In: I6e2845cc19dc012cba2933318a067bbb8db90a23
2021-04-07 10:06:45 +08:00
TreeHugger Robot
ec2f5b30a3
[automerger skipped] Merge "Hide non-system overlay window on ActivityPicker" into oc-mr1-dev am: f43af46d1d
-s ours am: a5715ed5c9
-s ours am: 04c2f0b19a
-s ours am: 47c4492d09
-s ours am: 8ad7f62a65
-s ours
...
am skip reason: skip tag Change-Id I6e2845cc19dc012cba2933318a067bbb8db90a23 with SHA-1 855b1f428d
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13835812
Change-Id: Ia5e57f1a3b06ef105cf209df0f70c05783e05471
2021-04-06 16:02:14 +00:00
TreeHugger Robot
8ad7f62a65
[automerger skipped] Merge "Hide non-system overlay window on ActivityPicker" into oc-mr1-dev am: f43af46d1d
-s ours am: a5715ed5c9
-s ours am: 04c2f0b19a
-s ours am: 47c4492d09
-s ours
...
am skip reason: skip tag Change-Id I6e2845cc19dc012cba2933318a067bbb8db90a23 with SHA-1 855b1f428d
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13835812
Change-Id: Ic3d1e0553dee77abe9930df9f70423f41048af21
2021-04-06 15:20:44 +00:00
Arc Wang
fe3572be66
Merge "Revert "Hide non-system overlay window on ActivityPicker"" into pi-dev am: bcc7f89f85
am: 89d14a36dc
am: 30ab86df65
am: 767f72b09b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14103366
Change-Id: I9fe6a78f1970d85fd30ee3d69b465de523ffddbc
2021-04-06 15:01:42 +00:00
TreeHugger Robot
47c4492d09
[automerger skipped] Merge "Hide non-system overlay window on ActivityPicker" into oc-mr1-dev am: f43af46d1d
-s ours am: a5715ed5c9
-s ours am: 04c2f0b19a
-s ours
...
am skip reason: skip tag Change-Id I6e2845cc19dc012cba2933318a067bbb8db90a23 with SHA-1 855b1f428d
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13835812
Change-Id: I03ab6cfd3dcf31340f4beacc1782881db3fa7bde
2021-04-06 14:40:35 +00:00
Arc Wang
767f72b09b
Merge "Revert "Hide non-system overlay window on ActivityPicker"" into pi-dev am: bcc7f89f85
am: 89d14a36dc
am: 30ab86df65
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14103366
Change-Id: I5a1cc56ebca9f1f9dc289a4622b4db22a62a6f73
2021-04-06 14:19:47 +00:00
TreeHugger Robot
04c2f0b19a
[automerger skipped] Merge "Hide non-system overlay window on ActivityPicker" into oc-mr1-dev am: f43af46d1d
-s ours am: a5715ed5c9
-s ours
...
am skip reason: skip tag Change-Id I6e2845cc19dc012cba2933318a067bbb8db90a23 with SHA-1 855b1f428d
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13835812
Change-Id: Ic9924a9f19a55616cc0c754a4d7dbda9e02143bb
2021-04-06 14:02:52 +00:00
Arc Wang
30ab86df65
Merge "Revert "Hide non-system overlay window on ActivityPicker"" into pi-dev am: bcc7f89f85
am: 89d14a36dc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14103366
Change-Id: I02b3f057bfb03aa1e2d57ba0ce22854df6690bd9
2021-04-06 13:37:25 +00:00
TreeHugger Robot
a5715ed5c9
[automerger skipped] Merge "Hide non-system overlay window on ActivityPicker" into oc-mr1-dev am: f43af46d1d
-s ours
...
am skip reason: skip tag Change-Id I6e2845cc19dc012cba2933318a067bbb8db90a23 with SHA-1 855b1f428d
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13835812
Change-Id: Ife137461365b88bc33cc7e22d72ef4c6b2926357
2021-04-06 13:18:07 +00:00
Arc Wang
89d14a36dc
Merge "Revert "Hide non-system overlay window on ActivityPicker"" into pi-dev am: bcc7f89f85
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14103366
Change-Id: Iec105d8ee74d6d2c869072866c4caffbd40d9a19
2021-04-06 13:01:40 +00:00