platform_packages_apps_CertInstaller, branch android10-sidebranch Unnamed repository; edit this file 'description' to name the repository. Merge "DO NOT MERGE - Merge QQ1A.200205.002 into master" am: 57495556bc 2020-02-08T01:41:12+00:00 Automerger Merge Worker android-build-automerger-merge-worker@system.gserviceaccount.com 2020-02-08T01:41:12+00:00 32ef188a4b0f808a87e0d36385e2c4a35083a11a Change-Id: I11b6ce37bada8f962f856110151b007aca6602f1 
Change-Id: I11b6ce37bada8f962f856110151b007aca6602f1
DO NOT MERGE - Merge QQ1A.200205.002 into master am: 8a33ea4a13 2020-02-08T01:38:43+00:00 Automerger Merge Worker android-build-automerger-merge-worker@system.gserviceaccount.com 2020-02-08T01:38:43+00:00 1b813b806920fbb9cb0ed42d1166571ef01d4e4f Change-Id: I8604b9d310902b8d41148043a55d5a485c9d1f3e 
Change-Id: I8604b9d310902b8d41148043a55d5a485c9d1f3e
Merge "DO NOT MERGE - Merge QQ1A.200205.002 into master" 2020-02-08T01:29:23+00:00 Treehugger Robot treehugger-gerrit@google.com 2020-02-08T01:29:23+00:00 57495556bcda388adb8d1fbd198035efa62aaba1 






DO NOT MERGE - Merge QQ1A.200205.002 into master
2020-02-05T18:45:12+00:00

Xin Li
delphij@google.com

2020-02-05T18:45:12+00:00

8a33ea4a133e1f4994860a1408230a12b396e1ce

Bug: 147428392
Change-Id: I69a28f105fe4d2721a81de40db49f3a2619744b2





Bug: 147428392
Change-Id: I69a28f105fe4d2721a81de40db49f3a2619744b2







[automerger skipped] Merge "Import translations. DO NOT MERGE" am: f9c7d973c6 -s ours
2020-02-01T20:37:38+00:00

Automerger Merge Worker
android-build-automerger-merge-worker@system.gserviceaccount.com

2020-02-01T20:37:38+00:00

3cb158868de40fe99a03945d48ef201b142124b1

am skip reason: subject contains skip directive

Change-Id: Ic49a1bcf747a6a9aa62b597a001bd1ac130a7ceb





am skip reason: subject contains skip directive

Change-Id: Ic49a1bcf747a6a9aa62b597a001bd1ac130a7ceb







Merge "Import translations. DO NOT MERGE"
2020-02-01T20:27:41+00:00

Treehugger Robot
treehugger-gerrit@google.com

2020-02-01T20:27:41+00:00

f9c7d973c66ccb8c55a290a0c67284bb1d49979c












Import translations. DO NOT MERGE
2020-02-01T09:41:28+00:00

Bill Yi
byi@google.com

2020-02-01T09:41:28+00:00

5e36c530bc3ca772a6061cdd2ef5e18d764f0f8c

Change-Id: Ie13ecfa4b537ff85ec5953faa78e4b7d3067a585
Auto-generated-cl: translation import





Change-Id: Ie13ecfa4b537ff85ec5953faa78e4b7d3067a585
Auto-generated-cl: translation import







DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master
2020-01-15T23:57:18+00:00

Xin Li
delphij@google.com

2020-01-15T23:57:18+00:00

f804472294a6b97e693b8f8fb7da2acbe94ddd30

Bug: 146167222
Change-Id: I084ed646ade1d4fa67e598ec7b6c9d8f29636705





Bug: 146167222
Change-Id: I084ed646ade1d4fa67e598ec7b6c9d8f29636705







Merge cherrypicks of [9943992, 9944684, 9944054, 9943993, 9944476, 9942363, 9942364, 9942365, 9942367, 9944685, 9944686, 9943217, 9944762, 9944764, 9944481, 9944411, 9944055, 9944056, 9944057] into qt-qpr1-release
2019-12-18T06:24:33+00:00

android-build-team Robot
android-build-team-robot@google.com

2019-12-18T06:24:33+00:00

540f014273e3354e6a073f99b18e8207761530f4

Change-Id: I0a3497e698296c02e5993bd503a594ac24028014





Change-Id: I0a3497e698296c02e5993bd503a594ac24028014







KeyChain: Do not allow hiding Cert Install dialog
2019-12-18T06:23:58+00:00

Eran Messeri
eranm@google.com

2019-10-18T13:15:10+00:00

bdf1dc655cf226d10077e0926049bac0aed0127e

Do not allow apps to float a window on top of the certificate
installation / naming dialog.

This obscures the CA certificate installation dialog and could be used
to trick a user into installing a CA certificate.

This is fixed by adding the HIDE_NON_SYSTEM_OVERLAY_WINDOWS system
flag when the activity is created (onCreate), so that another activity
starting in the foreground would not be able to obscure the dialog.

Bug: 139017101
Test: Manual, with an app that floats a window.
Change-Id: Iff8e678743c3883cf1f7f64390097a768ca00856
(cherry picked from commit afdacb2ec4c5cdc2fb2a9943fa5b48100f4725c8)





Do not allow apps to float a window on top of the certificate
installation / naming dialog.

This obscures the CA certificate installation dialog and could be used
to trick a user into installing a CA certificate.

This is fixed by adding the HIDE_NON_SYSTEM_OVERLAY_WINDOWS system
flag when the activity is created (onCreate), so that another activity
starting in the foreground would not be able to obscure the dialog.

Bug: 139017101
Test: Manual, with an app that floats a window.
Change-Id: Iff8e678743c3883cf1f7f64390097a768ca00856
(cherry picked from commit afdacb2ec4c5cdc2fb2a9943fa5b48100f4725c8)