Commit Graph

53283 Commits

Author SHA1 Message Date
Weng Su
0fe85baf93 [RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest" am: 153b0f03f5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958164

Change-Id: I1060479460cccc4e5e827b3687d3aaa214311ea5
2021-10-06 19:04:59 +00:00
Weng Su
cbd0883356 [RESTRICT AUTOMERGE] Revert "Add permission checking to WifiDialogActivity" am: 6a2624e500
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958163

Change-Id: I74316633648d6a5002433440358b9a0a443b3cf8
2021-10-06 19:04:58 +00:00
Weng Su
457a63ce84 [RESTRICT AUTOMERGE] Revert "Add SafetyNet logging" am: d05686b431
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958162

Change-Id: I90af118b9033a7ee53b35aa2b435d2ba95281181
2021-10-06 19:04:56 +00:00
Weng Su
6a2624e500 [RESTRICT AUTOMERGE] Revert "Add permission checking to WifiDialogActivity"
Revert submission 15220072-add_permission_wifidialog-qt-dev

Reason for revert: rollback CLs to avoid compatibility risks
Reverted Changes:
I1535f6f2d:Add SafetyNet logging
If7ca069c8:Add permission checking to WifiDialogActivity

Bug: 185126813
Change-Id: I3f75adf5bf0eea037dc0c5dfbeeb22b35b2856b6
2021-10-05 03:37:51 +00:00
Weng Su
153b0f03f5 [RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"
This reverts commit 4fb84a3737.

Reason for revert: rollback CLs to avoid compatibility risks

Bug: 185126813
Change-Id: I495cd723917db6405ef3b540a6f01eaeaf8a45fe
2021-10-05 03:24:14 +00:00
Weng Su
d05686b431 [RESTRICT AUTOMERGE] Revert "Add SafetyNet logging"
Revert submission 15220072-add_permission_wifidialog-qt-dev

Reason for revert: rollback CLs to avoid compatibility risks
Reverted Changes:
I1535f6f2d:Add SafetyNet logging
If7ca069c8:Add permission checking to WifiDialogActivity

Bug: 185126813
Change-Id: I42b77ac420d9438c741b28ce33bcadf1c74b19eb
2021-10-05 03:23:45 +00:00
Bill Yi
2906d7dceb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 88a0994ed8 -s ours am: 6718e1ee7b -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15608116

Change-Id: I3258ebd4e22af98fd20e0310512cd3db1ed2d160
2021-08-19 18:17:06 +00:00
Bill Yi
6718e1ee7b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 88a0994ed8 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15608116

Change-Id: Ia7592c1857dab18371f6284e5f6583217b148be9
2021-08-19 18:13:12 +00:00
Bill Yi
6a0b815394 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f391df2089 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15607375

Change-Id: Ib07c6a9383e2256c8e995ad1d6b67ee4bfb02cb8
2021-08-19 18:12:15 +00:00
Bill Yi
88a0994ed8 Import translations. DO NOT MERGE ANYWHERE
BUG:167403112

Auto-generated-cl: translation import
Change-Id: Id5c579245cf72f10f4d15fcb69d24bcf58dd281a
2021-08-17 22:14:24 -07:00
Bill Yi
f391df2089 Import translations. DO NOT MERGE ANYWHERE
BUG:167403112

Auto-generated-cl: translation import
Change-Id: I64cf73c3bf8cfc4e1135a40d5c6fa26066fc287e
2021-08-17 22:10:17 -07:00
TreeHugger Robot
8eff11f477 Merge "Add comment to AndroidManifest" into qt-dev am: 189d26ff2a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15212651

Change-Id: I4394ae315b4458b9d62c825075a120d214f49161
2021-08-07 17:37:47 +00:00
TreeHugger Robot
189d26ff2a Merge "Add comment to AndroidManifest" into qt-dev 2021-08-07 17:18:31 +00:00
Weng Su
8df9b236f8 Add SafetyNet logging am: 62041d683b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15220072

Change-Id: I5a821a0c9bd39e0267635ebfb7ce4a2234f14696
2021-08-07 15:02:15 +00:00
Weng Su
fa62e69c1d Add permission checking to WifiDialogActivity am: 8800cdf527
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15212404

Change-Id: Iaa937ab9fe9b071fa27dd9306e9f28ddbd8a00b0
2021-08-07 15:02:13 +00:00
Weng Su
62041d683b Add SafetyNet logging
- Add SafetyNet log if the calling package is no the permission for
result

Test: checked eventlog in the bugreport
Bug: 185126813

Merged-In: I1535f6f2ded2445702df0d723518b773cd094164
Change-Id: I1535f6f2ded2445702df0d723518b773cd094164
(cherry picked from commit 199528d460)
2021-07-07 08:22:17 +00:00
Weng Su
8800cdf527 Add permission checking to WifiDialogActivity
- Use getCallingPackage() to get calling package.

- Check if the calling package has ACCESS_COARSE_LOCATION or
ACCESS_COARSE_LOCATION permission.

- Only set result data to permission granted callers

Bug: 185126813
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiDialogActivityTest

Merged-In: If7ca069c842ed2bd1aed23f9d4041473c68a4dad
Change-Id: If7ca069c842ed2bd1aed23f9d4041473c68a4dad
(cherry picked from commit 71e728e934)
2021-07-07 08:06:29 +00:00
Weng Su
4fb84a3737 Add comment to AndroidManifest
- Wi-Fi result data will only be returned from WifiDialogActivity if the
calling package has location permission.

Test: add comment only, no test required.
Bug: 185126813

Merged-In: I81c4d801c4ee211f43a1688a62daaff3b47eae1a
Change-Id: I81c4d801c4ee211f43a1688a62daaff3b47eae1a
(cherry picked from commit 56a88885cc)
2021-07-06 07:49:49 +00:00
Hugh Chen
b8aa9ad04d [automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 8fe8e0fc21 -s ours am: c551f39977 -s ours am: e849d212b7 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016141

Change-Id: Id2fe388de56c84cd91effebf9b47e376fcf85e2f
2021-06-28 06:47:52 +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
e849d212b7 [automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 8fe8e0fc21 -s ours am: c551f39977 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016141

Change-Id: I607bc56a88f50087d9e466eaad9a67d0f016463d
2021-06-28 06:37:12 +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
c551f39977 [automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 8fe8e0fc21 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016141

Change-Id: Ifef9d53b072a081c2c78437e4bc77e511024092a
2021-06-28 06:14:41 +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
8fe8e0fc21 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 04:02:52 +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
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
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