Hugh Chen
|
064bf9dd81
|
[automerger skipped] RESTRICT AUTOMERGE Update string am: 3d6641a468 -s ours am: 9316df9560 -s ours am: 368ba20c95 -s ours am: d9fc75875e -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016140
Change-Id: I92ba93b2dccd7fd440b303c241c564af03721944
|
2021-06-28 06:57:32 +00:00 |
|
Hugh Chen
|
d9fc75875e
|
[automerger skipped] RESTRICT AUTOMERGE Update string am: 3d6641a468 -s ours am: 9316df9560 -s ours am: 368ba20c95 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016140
Change-Id: I389f623a1ac3a900c6c896ce363d3db1ca8a03d7
|
2021-06-28 06:47:48 +00:00 |
|
Hugh Chen
|
368ba20c95
|
[automerger skipped] RESTRICT AUTOMERGE Update string am: 3d6641a468 -s ours am: 9316df9560 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016140
Change-Id: I3967969e09f69542cc461ca818d5024e7fe33f48
|
2021-06-28 06:37:08 +00:00 |
|
Hugh Chen
|
0cfe42b287
|
[automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 65e3c68e6f -s ours am: 505cc44596 -s ours am: 3fcb9c9811 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021918
Change-Id: Ibf35314504458240ec753c062f284225508701bd
|
2021-06-28 06:19:08 +00:00 |
|
Hugh Chen
|
367921a80d
|
[automerger skipped] RESTRICT AUTOMERGE Update string am: 79ae54ca2d -s ours am: 1fe494db11 -s ours am: 9f4308daa2 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016139
Change-Id: I315047b2c175ac29474ad3b0a261d26d2745e4d8
|
2021-06-28 06:19:04 +00:00 |
|
Hugh Chen
|
499cfe303f
|
[automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: fa504b8e01 am: d351303e36 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021917
Change-Id: I3a2ddb2b2f8a2050dc017d2e3b4d9cf840d3a7dc
|
2021-06-28 06:18:59 +00:00 |
|
Hugh Chen
|
87426af532
|
[automerger skipped] RESTRICT AUTOMERGE Update string am: 7ce80425ee am: 3f493a3078 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016137
Change-Id: I8d89f0ac05df88cd680a15e8c64c2133b1619e53
|
2021-06-28 06:18:56 +00:00 |
|
Hugh Chen
|
9316df9560
|
[automerger skipped] RESTRICT AUTOMERGE Update string am: 3d6641a468 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016140
Change-Id: Ic3ca73d1126a07c955e10b7871b9ccec0038b60d
|
2021-06-28 06:14:38 +00:00 |
|
Hugh Chen
|
3fcb9c9811
|
[automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 65e3c68e6f -s ours am: 505cc44596 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021918
Change-Id: I265d8d2c13c97463ba2d9449e68925199b90be3c
|
2021-06-28 06:14:35 +00:00 |
|
Hugh Chen
|
9f4308daa2
|
[automerger skipped] RESTRICT AUTOMERGE Update string am: 79ae54ca2d -s ours am: 1fe494db11 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016139
Change-Id: Ia1ad9ee7da0a972a3a97aca68d2fb8b6f3061d24
|
2021-06-28 06:14:30 +00:00 |
|
Hugh Chen
|
505cc44596
|
[automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 65e3c68e6f -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021918
Change-Id: Ic4237a93471f2064896492eb607447620c0fc21a
|
2021-06-28 06:07:26 +00:00 |
|
Hugh Chen
|
1fe494db11
|
[automerger skipped] RESTRICT AUTOMERGE Update string am: 79ae54ca2d -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016139
Change-Id: If38bb4a7880b0771648410c2dc11285e07008b34
|
2021-06-28 06:07:20 +00:00 |
|
Hugh Chen
|
d351303e36
|
RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: fa504b8e01
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021917
Change-Id: I311472b1f9d27cc4a7da875150741f0eb51e573f
|
2021-06-28 06:06:01 +00:00 |
|
Hugh Chen
|
3f493a3078
|
RESTRICT AUTOMERGE Update string am: 7ce80425ee
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016137
Change-Id: I9c8fabb01ea2cf69b2714523b361f50a5a597561
|
2021-06-28 06:05:58 +00:00 |
|
Hugh Chen
|
3d6641a468
|
RESTRICT AUTOMERGE Update string
1. Replace "An untrusted Bluetooth device" to "A Bluetooth device".
2. Replace "Deny" to "Don't allow"
https://docs.google.com/document/d/18bVSIAyX4MNpNeCvxqyZu7CXcBUcdV0pnh-gzVprjqU/edit?ts=60709637
Bug: 167403112
Test: send intent to test right prompts message is pop up.
make -j42 RunSettingsRoboTests
Change-Id: I38da15d4b1fb08671f6352458cbf3f735b4083bc
(cherry picked from commit 38fc9a91b5)
|
2021-06-18 04:02:42 +00:00 |
|
Hugh Chen
|
65e3c68e6f
|
RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message
This CL add more prompts presented for users to avoid phishing attacks.
Screenshot:
https://screenshot.googleplex.com/p5PZbphN46ddPFV.png
https://screenshot.googleplex.com/6Q2wKfPbNQmTtx8.png
https://screenshot.googleplex.com/987VpYgNUZL2K4T.png
https://screenshot.googleplex.com/9eVg6SAGScVXU8U.png
Bug: 167403112
Test: manually test
Change-Id: Iadec059b662fd91754ad573bbe688702cdd3c9af
(cherry picked from commit 10e4599219)
|
2021-06-18 03:50:33 +00:00 |
|
Hugh Chen
|
79ae54ca2d
|
RESTRICT AUTOMERGE Update string
1. Replace "An untrusted Bluetooth device" to "A Bluetooth device".
2. Replace "Deny" to "Don't allow"
https://docs.google.com/document/d/18bVSIAyX4MNpNeCvxqyZu7CXcBUcdV0pnh-gzVprjqU/edit?ts=60709637
Bug: 167403112
Test: send intent to test right prompts message is pop up.
make -j42 RunSettingsRoboTests
Change-Id: I38da15d4b1fb08671f6352458cbf3f735b4083bc
(cherry picked from commit 38fc9a91b5)
|
2021-06-18 03:50:24 +00:00 |
|
Hugh Chen
|
fa504b8e01
|
RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message
This CL add more prompts presented for users to avoid phishing attacks.
Screenshot:
https://screenshot.googleplex.com/p5PZbphN46ddPFV.png
https://screenshot.googleplex.com/6Q2wKfPbNQmTtx8.png
https://screenshot.googleplex.com/987VpYgNUZL2K4T.png
https://screenshot.googleplex.com/9eVg6SAGScVXU8U.png
Bug: 167403112
Test: manually test
Change-Id: Iadec059b662fd91754ad573bbe688702cdd3c9af
(cherry picked from commit 10e4599219)
|
2021-06-18 03:34:32 +00:00 |
|
Hugh Chen
|
7ce80425ee
|
RESTRICT AUTOMERGE Update string
1. Replace "An untrusted Bluetooth device" to "A Bluetooth device".
2. Replace "Deny" to "Don't allow"
https://docs.google.com/document/d/18bVSIAyX4MNpNeCvxqyZu7CXcBUcdV0pnh-gzVprjqU/edit?ts=60709637
Bug: 167403112
Test: send intent to test right prompts message is pop up.
make -j42 RunSettingsRoboTests
Change-Id: I38da15d4b1fb08671f6352458cbf3f735b4083bc
(cherry picked from commit 38fc9a91b5)
|
2021-06-18 03:34:00 +00:00 |
|
Hugh Chen
|
a5046f219a
|
RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message
This CL add more prompts presented for users to avoid phishing attacks.
Screenshot:
https://screenshot.googleplex.com/p5PZbphN46ddPFV.png
https://screenshot.googleplex.com/6Q2wKfPbNQmTtx8.png
https://screenshot.googleplex.com/987VpYgNUZL2K4T.png
https://screenshot.googleplex.com/9eVg6SAGScVXU8U.png
Bug: 167403112
Test: manually test
Change-Id: Iadec059b662fd91754ad573bbe688702cdd3c9af
(cherry picked from commit 10e4599219)
|
2021-06-18 03:16:31 +00:00 |
|
Hugh Chen
|
9356205dfc
|
RESTRICT AUTOMERGE Update string
1. Replace "An untrusted Bluetooth device" to "A Bluetooth device".
2. Replace "Deny" to "Don't allow"
https://docs.google.com/document/d/18bVSIAyX4MNpNeCvxqyZu7CXcBUcdV0pnh-gzVprjqU/edit?ts=60709637
Bug: 167403112
Test: send intent to test right prompts message is pop up.
make -j42 RunSettingsRoboTests
Change-Id: I38da15d4b1fb08671f6352458cbf3f735b4083bc
(cherry picked from commit 38fc9a91b5)
|
2021-06-18 02:46:16 +00:00 |
|
Jakub Pawlowski
|
8ae86914d6
|
[automerger skipped] Prevent drawing on top of DevicePickerActivity am: 9d99e0b3ff am: d6ed1528cb -s ours am: 8797825bc1 -s ours am: 31c29a0791 -s ours
am skip reason: Merged-In I8b27b397bce1708a42b96b1b647c64e23142c468 with SHA-1 68f799a4c6 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14487882
Change-Id: I1cd894a5924c4afc52256d85f9a19da5a2cede22
|
2021-05-12 20:36:51 +00:00 |
|
Jakub Pawlowski
|
c714533fd2
|
Merge "Prevent drawing on top of DevicePickerActivity" into qt-dev am: 3a2ab54f36 am: 52ea712e3b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14487883
Change-Id: I47b6e2b3de493030adfd49bfeb4aabaf16046771
|
2021-05-12 20:36:41 +00:00 |
|
Jakub Pawlowski
|
31c29a0791
|
[automerger skipped] Prevent drawing on top of DevicePickerActivity am: 9d99e0b3ff am: d6ed1528cb -s ours am: 8797825bc1 -s ours
am skip reason: Merged-In I8b27b397bce1708a42b96b1b647c64e23142c468 with SHA-1 68f799a4c6 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14487882
Change-Id: I145082eccf613bb5729b67a7f58a34f3c913184e
|
2021-05-12 20:19:24 +00:00 |
|
Jakub Pawlowski
|
52ea712e3b
|
Merge "Prevent drawing on top of DevicePickerActivity" into qt-dev am: 3a2ab54f36
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14487883
Change-Id: Ied144c16d607921281d10783a77ae0d46885d757
|
2021-05-12 20:19:16 +00:00 |
|
Jakub Pawlowski
|
8797825bc1
|
[automerger skipped] Prevent drawing on top of DevicePickerActivity am: 9d99e0b3ff am: d6ed1528cb -s ours
am skip reason: Merged-In I8b27b397bce1708a42b96b1b647c64e23142c468 with SHA-1 68f799a4c6 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14487882
Change-Id: I65f86808c2d2455c98c022ad52680597c58ff148
|
2021-05-12 20:04:53 +00:00 |
|
Jakub Pawlowski
|
d6ed1528cb
|
Prevent drawing on top of DevicePickerActivity am: 9d99e0b3ff
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14487882
Change-Id: Iddc0d74ef10d404f8463544683cc913656346a34
|
2021-05-12 19:47:21 +00:00 |
|
Jakub Pawlowski
|
9d99e0b3ff
|
Prevent drawing on top of DevicePickerActivity
Bug: 182584940
Merged-In: I8b27b397bce1708a42b96b1b647c64e23142c468
Change-Id: I8b27b397bce1708a42b96b1b647c64e23142c468
|
2021-05-12 19:27:32 +00:00 |
|
Jakub Pawlowski
|
3a2ab54f36
|
Merge "Prevent drawing on top of DevicePickerActivity" into qt-dev
|
2021-05-12 19:27:19 +00:00 |
|
TreeHugger Robot
|
045aa65893
|
Merge changes Ia51528f2,Id27a7809 into oc-mr1-dev am: 75e33fb315 am: 9724c735da am: fc721d09cb am: 94e5b18951
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419449
Change-Id: I3a7d52f4c65391196464641f9cf20436b58762c1
|
2021-05-11 06:32:20 +00:00 |
|
Hugh Chen
|
8dbc94fcbe
|
[automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: 2deb2829ea -s ours am: 53ff99b8b4 -s ours am: 9bbcb55a23 am: fe87f1ac34 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419449
Change-Id: I31dde5548cb9ae735e8f342548b8e6fb799b0104
|
2021-05-11 06:32:19 +00:00 |
|
TreeHugger Robot
|
e5e19dd41a
|
Merge changes Ia51528f2,Id27a7809 into pi-dev am: f9c99c40d2 am: 38a2b32e94 am: 24ef90eaaa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419448
Change-Id: I8cc36a74ea8abdaa25bc0876e4e4ce9218808d3b
|
2021-05-11 06:32:12 +00:00 |
|
Hugh Chen
|
392fb7a4f7
|
[automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: f727d5cf2a -s ours am: 8a4f60b143 am: 3607e825b9 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419448
Change-Id: I2afcbd48ae913e348764246122dc0f0fef03ec46
|
2021-05-11 06:32:11 +00:00 |
|
TreeHugger Robot
|
16e8c4783e
|
Merge changes Ia51528f2,Id27a7809 into qt-dev am: 4074cd5e48 am: 54f47d0953
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419447
Change-Id: I474d15a6db416860a5a34253a7a0ed000912bafc
|
2021-05-11 06:32:04 +00:00 |
|
Hugh Chen
|
effac8a0c1
|
[automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: 51755e9a33 am: 7b05629834 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419447
Change-Id: Ib65fe3dd30eb3dd84a2f4949de6eaa32f2b24146
|
2021-05-11 06:32:02 +00:00 |
|
TreeHugger Robot
|
94e5b18951
|
Merge changes Ia51528f2,Id27a7809 into oc-mr1-dev am: 75e33fb315 am: 9724c735da am: fc721d09cb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419449
Change-Id: I0deadd94935bad2a6cae221c11054eb33557f22e
|
2021-05-11 06:24:14 +00:00 |
|
Hugh Chen
|
fe87f1ac34
|
[automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: 2deb2829ea -s ours am: 53ff99b8b4 -s ours am: 9bbcb55a23
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419449
Change-Id: I668163c48cd6de7ac9236a878550d7a80eb9c7ac
|
2021-05-11 06:24:14 +00:00 |
|
TreeHugger Robot
|
24ef90eaaa
|
Merge changes Ia51528f2,Id27a7809 into pi-dev am: f9c99c40d2 am: 38a2b32e94
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419448
Change-Id: If31a9fca9d45ae3d0408874a34427f8ca8984f49
|
2021-05-11 06:24:06 +00:00 |
|
Hugh Chen
|
3607e825b9
|
[automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: f727d5cf2a -s ours am: 8a4f60b143
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419448
Change-Id: I223f7a495fa5640217ee7de19a24fa6490918336
|
2021-05-11 06:24:06 +00:00 |
|
TreeHugger Robot
|
fc721d09cb
|
Merge changes Ia51528f2,Id27a7809 into oc-mr1-dev am: 75e33fb315 am: 9724c735da
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419449
Change-Id: Ie84e9ff000ff0860ec83d704ffe61c2d74164f96
|
2021-05-11 06:18:45 +00:00 |
|
Hugh Chen
|
9bbcb55a23
|
[automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: 2deb2829ea -s ours am: 53ff99b8b4 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419449
Change-Id: Ie3e897ff1e8259b5d24dc1291e0683f325c2d7fe
|
2021-05-11 06:18:44 +00:00 |
|
TreeHugger Robot
|
38a2b32e94
|
Merge changes Ia51528f2,Id27a7809 into pi-dev am: f9c99c40d2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419448
Change-Id: I0431e3135de7bb952fa8e8185b6eef44a1c24dc7
|
2021-05-11 06:18:37 +00:00 |
|
Hugh Chen
|
8a4f60b143
|
[automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: f727d5cf2a -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419448
Change-Id: I44435d83016a9c974d704cab9de7fa50df1515f3
|
2021-05-11 06:18:35 +00:00 |
|
TreeHugger Robot
|
9724c735da
|
Merge changes Ia51528f2,Id27a7809 into oc-mr1-dev am: 75e33fb315
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419449
Change-Id: Ia0822c53ab65ce90334aee521be99886945d41e8
|
2021-05-11 06:16:53 +00:00 |
|
Hugh Chen
|
53ff99b8b4
|
[automerger skipped] RESTRICT AUTOMERGE Fix unable to send file via OPP am: 2deb2829ea -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419449
Change-Id: I23ab4bb935d65f3afda82333291d0ea7a187428a
|
2021-05-11 06:16:53 +00:00 |
|
TreeHugger Robot
|
54f47d0953
|
Merge changes Ia51528f2,Id27a7809 into qt-dev am: 4074cd5e48
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419447
Change-Id: I4a4c7bd80496a8fa883c895080d4d4c48a3fa3e9
|
2021-05-11 06:16:43 +00:00 |
|
Hugh Chen
|
7b05629834
|
RESTRICT AUTOMERGE Fix unable to send file via OPP am: 51755e9a33
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419447
Change-Id: I7256d5f30d6c4b3063181a768b5d3796cf517383
|
2021-05-11 06:16:42 +00:00 |
|
TreeHugger Robot
|
f9c99c40d2
|
Merge changes Ia51528f2,Id27a7809 into pi-dev
* changes:
RESTRICT AUTOMERGE Fix unable to send file via OPP
RESTRICT AUTOMERGE Fix bluetooth settings will broadcast to anywhere when some cases
|
2021-05-11 06:03:54 +00:00 |
|
TreeHugger Robot
|
75e33fb315
|
Merge changes Ia51528f2,Id27a7809 into oc-mr1-dev
* changes:
RESTRICT AUTOMERGE Fix unable to send file via OPP
RESTRICT AUTOMERGE Fix bluetooth settings will broadcast to anywhere when some cases
|
2021-05-11 06:03:45 +00:00 |
|
TreeHugger Robot
|
f45fa1bf85
|
Merge changes Ia51528f2,Id27a7809 into rvc-dev
* changes:
RESTRICT AUTOMERGE Fix unable to send file via OPP
RESTRICT AUTOMERGE Fix bluetooth settings will broadcast to anywhere when some cases
|
2021-05-11 06:03:28 +00:00 |
|
