Bill Yi
914383ee99
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ia4a9c0e4621a7a13ac202564ae83d45a44a94517
2021-08-13 03:08:13 +00:00
Bill Yi
5cc24b1fc5
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ie9007a25abc0b77eae5dff3bb6c3e14bfcaa1c92
2021-08-10 14:53:51 +00:00
TreeHugger Robot
876d9ec0dc
[automerger skipped] Merge changes from topic "add_permission_wifidialog" into rvc-dev am: 9d509c0b31
-s ours
...
am skip reason: Merged-In I1535f6f2ded2445702df0d723518b773cd094164 with SHA-1 62041d683b
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15207347
Change-Id: I7922d372f0a6867af34b93bf852bdda93a6e4c7a
2021-08-09 12:44:20 +00:00
TreeHugger Robot
9d509c0b31
Merge changes from topic "add_permission_wifidialog" into rvc-dev
...
* changes:
[DO NOT MERGE] Add SafetyNet logging
[DO NOT MERGE] Add permission checking to WifiDialogActivity
2021-08-09 12:28:48 +00:00
Weng Su
b9b493d39d
[DO NOT MERGE] 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-08-09 12:28:31 +00:00
TreeHugger Robot
37a5ccd1f0
[automerger skipped] Merge "Add comment to AndroidManifest" into qt-dev am: 189d26ff2a
am: 8eff11f477
-s ours am: 24f87e15e2
-s ours
...
am skip reason: Merged-In I81c4d801c4ee211f43a1688a62daaff3b47eae1a with SHA-1 fa1e3870d8
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15212651
Change-Id: I05e285d6d57f7c9c757b5e7628f1a76678214c7a
2021-08-08 13:39:48 +00:00
Weng Su
90e455e519
[automerger skipped] Add SafetyNet logging am: 62041d683b
am: 8df9b236f8
-s ours am: b1c88160e2
-s ours
...
am skip reason: skipped by user wengsu
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15220072
Change-Id: I193f178c5fd49e19b07fe7d011777674a6d6865e
2021-08-08 13:39:44 +00:00
Weng Su
eb1e97e195
[automerger skipped] Add permission checking to WifiDialogActivity am: 8800cdf527
am: fa62e69c1d
-s ours am: 586ca2dfa8
-s ours
...
am skip reason: skipped by user wengsu
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15212404
Change-Id: I8980230d20465854434b004e18eca553cb2b222b
2021-08-08 13:39:42 +00:00
Weng Su
f973f2ac69
[DO NOT MERGE] 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-08-08 13:21:52 +00:00
TreeHugger Robot
24f87e15e2
[automerger skipped] Merge "Add comment to AndroidManifest" into qt-dev am: 189d26ff2a
am: 8eff11f477
-s ours
...
am skip reason: Merged-In I81c4d801c4ee211f43a1688a62daaff3b47eae1a with SHA-1 fa1e3870d8
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15212651
Change-Id: I39d5571947793d0164cf470942f36d82800f6405
2021-08-08 13:02:10 +00:00
Weng Su
b1c88160e2
[automerger skipped] Add SafetyNet logging am: 62041d683b
am: 8df9b236f8
-s ours
...
am skip reason: skipped by user wengsu
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15220072
Change-Id: I7621025b320cc47c10535daa8dbf48c77c1cf2f6
2021-08-08 13:02:04 +00:00
Weng Su
586ca2dfa8
[automerger skipped] Add permission checking to WifiDialogActivity am: 8800cdf527
am: fa62e69c1d
-s ours
...
am skip reason: skipped by user wengsu
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15212404
Change-Id: If5de8e30d74531914febee1636c1b123a6bf0754
2021-08-08 13:02:03 +00: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
b659749934
Add comment to AndroidManifest am: fa1e3870d8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15212754
Change-Id: I00f48e5875c3d60bfa91b61322c36d35b3e38533
2021-08-07 13:37:03 +00:00
Bill Yi
8a7b2f538d
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I8dbd19ce27d10100096c6035c5b087ed3f97ca4a
2021-08-05 02:30:41 +00:00
Bill Yi
e5d2e077c7
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I8c108f50853f1de14c4df8d52bdcc4211f05278b
2021-07-30 11:39:05 +00:00
Bill Yi
187263e4a2
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Idc5958063a2353ecaf65a34be2c76d0c4ca8f8f5
2021-07-27 03:12:55 +00:00
TreeHugger Robot
fea4293f48
Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod
2021-07-24 02:23:43 +00:00
Bill Yi
a14938cc27
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I95bd784ee9beffe320cb30102e8478da2f3a420e
2021-07-24 00:03:22 +00:00
Bill Yi
a716068d7c
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I1afe9d7afbfd8ae3e14fbccb0099e8cdac4210cf
2021-07-23 23:58:07 +00:00
Bill Yi
153dfb568e
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I2720761609d383628078cd0f2a15f4d0f76917b4
2021-07-20 10:39:54 +00:00
Bill Yi
d0866cb948
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I28f67cc180d5bc38770f6fa9f80bc6b8cf9852d5
2021-07-17 20:37:34 +00:00
Bill Yi
1f660bf994
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I7e85df20c7b2befdee0d43ecbabaac82452c0249
2021-07-16 08:46:43 +00:00
Bill Yi
8dfc6a13ba
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I3c71882147ae08775b5dbc074e91bd1df6eb33b6
2021-07-12 00:57:20 +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
Weng Su
fa1e3870d8
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:47:54 +00:00
Bill Yi
a50ce69307
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I16a5257336b666f8c11fa7900b37a661a53b1b25
2021-07-04 22:14:39 +00:00
TreeHugger Robot
a69ea45cf7
Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod
2021-07-03 03:32:18 +00:00
Bill Yi
d1c91f40f0
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I1503e7f3d4e33f27c52e28f9327bc258b3531281
2021-07-03 00:16:19 +00:00
Bill Yi
ba970ea415
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Id5f86f1661d49b0f77deb46f241c947a7a3de59a
2021-07-03 00:11:33 +00:00
Hugh Chen
346b049fb1
[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: b8aa9ad04d
-s ours am: 2a2a81dea5
-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: I9c044bc08439ecd3132b3bacd0d47eddd9ccebb0
2021-06-28 07:07:01 +00:00
Hugh Chen
c91f8b0991
[automerger skipped] RESTRICT AUTOMERGE Update string am: 3d6641a468
-s ours am: 9316df9560
-s ours am: 368ba20c95
-s ours am: d9fc75875e
-s ours am: 064bf9dd81
-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: I0b6e2fe7b4b98afe4f5eb906b515177f09621946
2021-06-28 07:06:57 +00:00
Hugh Chen
2a2a81dea5
[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: b8aa9ad04d
-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: I7d2147f3fc8860e58a4d8cb4e15eb4b09d000c9c
2021-06-28 06:57:36 +00:00
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
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
c6362e92e8
[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: 0cfe42b287
-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: Ia9b38945171dae15032adfce0b20756aa32c478b
2021-06-28 06:37:13 +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
3f2394bbc7
[automerger skipped] RESTRICT AUTOMERGE Update string am: 79ae54ca2d
-s ours am: 1fe494db11
-s ours am: 9f4308daa2
-s ours am: 367921a80d
-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: I810f4769b8a1c55306af2d8fbda1da427a06f48b
2021-06-28 06:37:08 +00:00
Hugh Chen
a539c36421
[automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: fa504b8e01
am: d351303e36
-s ours am: 499cfe303f
-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: I60bd575da426261bfcd112ac4b69d4efe15c6ad2
2021-06-28 06:37:04 +00:00
Hugh Chen
dbcebc42bf
[automerger skipped] RESTRICT AUTOMERGE Update string am: 7ce80425ee
am: 3f493a3078
-s ours am: 87426af532
-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: Icd57778b71e3ff3f2300fdd0f335373bd7fce4cd
2021-06-28 06:37:00 +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