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
Arc Wang
eeb0bcc1b7
Merge "Hide non-system overlay window on ActivityPicker" into qt-dev am: 9513326e44
am: e1660daab4
am: 83d11bebe2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13835815
Change-Id: Ie359d84b40c5b7a706f40c8a1c905c8d9c02afab
2021-04-06 12:56:35 +00:00
TreeHugger Robot
f43af46d1d
Merge "Hide non-system overlay window on ActivityPicker" into oc-mr1-dev
2021-04-06 12:51:12 +00:00
Arc Wang
bcc7f89f85
Merge "Revert "Hide non-system overlay window on ActivityPicker"" into pi-dev
2021-04-06 12:37:52 +00:00
Arc Wang
83d11bebe2
Merge "Hide non-system overlay window on ActivityPicker" into qt-dev am: 9513326e44
am: e1660daab4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13835815
Change-Id: Ic9a7c0fb856096e02a20f40fa723a00b62d92819
2021-04-06 12:35:26 +00:00
Arc Wang
eb2ac6e455
Revert "Hide non-system overlay window on ActivityPicker"
...
This reverts commit 855b1f428d
.
Reason for revert: <b/184623294>
Change-Id: Ie1eb6f86feda56d6444971fa5dfd2c11357fab01
2021-04-06 12:29:38 +00:00
Arc Wang
e1660daab4
Merge "Hide non-system overlay window on ActivityPicker" into qt-dev am: 9513326e44
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13835815
Change-Id: I19629b5e098a176da1fe21e020deb8a78c6069ad
2021-04-06 11:43:37 +00:00
Arc Wang
9513326e44
Merge "Hide non-system overlay window on ActivityPicker" into qt-dev
2021-04-06 11:03:29 +00:00
Arc Wang
8a9fafb37d
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: I6e2845cc19dc012cba2933318a067bbb8db90a23
Merged-In: I6e2845cc19dc012cba2933318a067bbb8db90a23
(cherry picked from commit 3b4853e109
)
2021-04-06 11:02:10 +00:00
TreeHugger Robot
a2a7d18353
Merge "Hide non-system overlay window on ActivityPicker" into pi-dev am: 7a09c0613f
am: d0957376c0
am: e4749c3458
am: 1dcc4ee8a1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13835814
Change-Id: I5038e3f5ed5963b4bfebd3aa643ce9de4296aed9
2021-04-06 10:19:22 +00:00
TreeHugger Robot
1dcc4ee8a1
Merge "Hide non-system overlay window on ActivityPicker" into pi-dev am: 7a09c0613f
am: d0957376c0
am: e4749c3458
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13835814
Change-Id: Id2b2b68996481b1a177a284ef99dbd44bff0946b
2021-04-06 09:59:08 +00:00
TreeHugger Robot
e4749c3458
Merge "Hide non-system overlay window on ActivityPicker" into pi-dev am: 7a09c0613f
am: d0957376c0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13835814
Change-Id: I3a5f7ae870c60965676dc776120dc220c336b471
2021-04-06 09:37:39 +00:00
TreeHugger Robot
d0957376c0
Merge "Hide non-system overlay window on ActivityPicker" into pi-dev am: 7a09c0613f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13835814
Change-Id: If51aba7cfb3495b42335d90a1600734da17d4d42
2021-04-06 09:00:52 +00:00
TreeHugger Robot
a577227b97
Merge "Hide non-system overlay window on ActivityPicker" into rvc-dev am: 759dc67158
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13835816
Change-Id: Iaff23732bf96920b8c58e810d9a2a305ff3c274e
2021-04-06 08:55:53 +00:00
TreeHugger Robot
7e3e9ed32a
Merge "Hide non-system overlay window on ActivityPicker" into rvc-qpr-dev
2021-04-06 08:24:45 +00:00
TreeHugger Robot
7a09c0613f
Merge "Hide non-system overlay window on ActivityPicker" into pi-dev
2021-04-06 08:23:13 +00:00
TreeHugger Robot
759dc67158
Merge "Hide non-system overlay window on ActivityPicker" into rvc-dev
2021-04-06 08:22:07 +00:00
Pavel Grafov
18c04f023a
Prevent disconnecting admin-configured VPN am: 735a216da3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13931528
Change-Id: Ib7ccf10cba6c1f494bb4dcb7a711aa5a218f9dd8
2021-04-02 18:57:25 +00:00
TreeHugger Robot
9258e9ee9d
Merge "Only display single line for title" into rvc-qpr-dev
2021-04-01 16:18:08 +00:00
Tsung-Mao Fang
bfb68fa6fe
Merge "Revert "Only display single line for title"" into rvc-qpr-dev
2021-04-01 15:56:19 +00:00
Pavel Grafov
735a216da3
Prevent disconnecting admin-configured VPN
...
First, if the VPN is configured by an admin, the preference is
disabled and tapping on it will results in a policy disclouser
dialog.
In addition restriction checks in the dialog also check if the
VPN is admin-configured.
Bug: 179975048
Test: Manual, setting VPN in profile and primary user and via DPM API.
Test: make RunSettingsRoboTests -j
Merged-In: Id59d2ac2782e83601bc3093d3a092faea36ff5d9
Change-Id: Id59d2ac2782e83601bc3093d3a092faea36ff5d9
2021-04-01 12:39:32 +01:00
Tsung-Mao Fang
f7ae52bed6
Only display single line for title
...
When a malicious device admin app’s name includes
a bunch of CRLF characters, it will cause incorrect shows
and selection confusion in Settings Device admin apps listView.
Test: Built the apk and saw single line title.
Bug: 169936038
Change-Id: I98d9a93bfdc792017124dda52a59d25a6462079e
Merged-In: I98d9a93bfdc792017124dda52a59d25a6462079e
2021-04-01 05:48:04 +00:00
Tsung-Mao Fang
ba9215cbda
Revert "Only display single line for title"
...
This reverts commit 121041cf58
.
Reason for revert: Some use cases don't need single line design. see b/184108687
Fix: 184108687
Change-Id: I1d095ae198cf2fd73eef39caf93895c7d96ca7f7
2021-04-01 04:14:03 +00:00
TreeHugger Robot
d9eda0aed1
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2021-03-30 06:24:26 +00:00
Bill Yi
0b2ae5a68f
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I5ede9d88bd047f9d7a5f2f932736593beda3d3af
2021-03-29 19:58:30 -07:00
Bill Yi
bb332bcf06
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ibc4689e62ec0e346015676571e920106ac05960a
2021-03-29 19:09:43 -07:00
TreeHugger Robot
b004856084
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2021-03-27 07:00:50 +00:00
Bill Yi
9d39189020
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I255c64ba434ed52927c5ba5e93d2c04a9c455efc
2021-03-26 22:00:29 -07:00
Bill Yi
93b834142b
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ie8e82cf7a7a752585e7e9e396004b0e88581b705
2021-03-26 21:11:53 -07:00