Commit Graph

19859 Commits

Author SHA1 Message Date
TreeHugger Robot
2103dda97c Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-03-23 05:05:47 +00:00
Bill Yi
a1d35aad4e Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I77c6e5117bcfaeac74a85a013190873900e7501d
2021-03-22 20:08:20 +00:00
Bill Yi
5dc25d8afa Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I69f56fb22074981f0776f0f8b76e98ea83a14d3f
2021-03-22 19:38:12 +00:00
TreeHugger Robot
3bb6f3afa1 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-03-15 06:35:45 +00:00
Bill Yi
0c4a622b49 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Iccfaa49e229aeb8c5365144394c6fd2635ee2a91
2021-03-14 18:08:33 +00:00
Bill Yi
97e669d333 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Iba69fb0c0a9d7edb15865e4444f8d558465ce2f4
2021-03-14 17:36:32 +00:00
Bill Yi
e1c109b18f Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I92331438bfe6ec4d779d6238a9892f6d1cb72de1
2021-02-12 08:02:38 +00:00
Bill Yi
4934aa0168 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-02-08 15:44:47 +00:00
Bill Yi
432eae5d7b Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I716aa1af5ba10de0577da8c6cd471f7c1785b3d4
2021-02-07 18:03:58 +00:00
Bill Yi
797e1e30e7 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ia01c0035522017ff13ded68061fe7890c7a8fa66
2021-02-07 17:33:30 +00:00
Bill Yi
fe25d2494e Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I82cd7cade2ecb3469af36801612b453d714d62bd
2021-01-28 23:59:35 -08:00
Bill Yi
3d1da30897 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ie9d9adce35398e4f2b80e97233034ef15cf5c81b
2021-01-26 09:42:53 -08:00
Bill Yi
83632e4b3d Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I28d06993be719bcde62c00d51d1f9b22389eb746
2021-01-23 23:53:18 -08:00
Bill Yi
2bf6a2bbd2 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-01-20 21:52:36 +00:00
Bill Yi
b375f1e2f0 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I24202252f42fa2fd1c401b437ede5f90a561ac6a
2021-01-20 07:54:48 -08:00
Bill Yi
f253392e46 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Iebb51a5fceee6d39e00b2de88c7d19a352411647
2021-01-20 07:06:43 -08:00
Bill Yi
65dbe17add Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I15adf2fb53f5b1622970fe930b779e2d73093256
2021-01-14 21:19:36 -08:00
Bill Yi
1fa997bb14 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ieda9ae4468f5d7d1c45f480780b9893b952c2e02
2021-01-12 22:39:28 -08:00
Hugh Chen
c148c76b20 RESTRICT AUTOMERGE Update String am: 085f70d48d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275411

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3c78e392639cd06925ba054dfb7e2980b36d06ef
2021-01-06 23:33:23 +00:00
Hugh Chen
bac6aab059 RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: 8ecca02ece
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13275410

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I23b2b58f32f48b20313df6a02efc6b6b6fda8e86
2021-01-06 23:33:07 +00:00
Hugh Chen
085f70d48d RESTRICT AUTOMERGE Update String
Remove brackets.

Bug: 176106404
Bug: 167403112
Test: build pass
Change-Id: Ib9a3c4fa3c6ea1ca54244d672bdc3e12d51a719f
2020-12-30 18:35:03 -08:00
Hugh Chen
8ecca02ece RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message
Before this CL, there is a possible phishing attack allowing a malicious
BT device to acquire permissions based on insufficient information
presented to the user in the consent dialog. This could lead to local
escalation of privilege with no additional execution privileges needed.
User interaction is needed for exploitation.

This CL add more prompts presented for users to avoid phishing attacks.

Merge Conflict Notes:
There were a number of entries in strings.xml that did not exist on this
branch. However, as the CL only adds new entries rather than modifying
old ones this should not cause a problem. There were no merge conflicts
in the java files.

Bug: 167403112
Test: send intent to test right prompts message is pop up. make -j42 RunSettingsRoboTests
Change-Id: Idc6ef558b692115bb82ea58cf223f5919b618633
2020-12-30 18:34:43 -08:00
TreeHugger Robot
dda13f87ef Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2020-11-30 01:27:28 +00:00
Bill Yi
3e8007c1c7 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I1d7006180d33ddc67f7191f1ca26f98372718a79
2020-11-29 00:20:32 -08:00
Bill Yi
148102cb26 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I7d2478d6977296cde6c0a439d22e2b2acb94e399
2020-11-28 23:33:13 -08:00
TreeHugger Robot
025633bdd4 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev 2020-10-30 15:34:51 +00:00
Bill Yi
ad1862fff5 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I2e893944fdf186bf1cfa3a66dd77a047e05a86a6
2020-10-30 05:15:25 +00:00
Bill Yi
a32714b730 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I18f71142db1259e005eb0b51ca44bdb4e69e5821
2020-10-30 04:38:31 +00:00
Bill Yi
7f9d903a21 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I7e397185b6e1a9d39e8af8d83c9f0c766ff09349
2020-08-18 21:53:23 -07:00
Bill Yi
45db58889e Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ia93aec9ac2caa0876e02e34cc64cb13c00d7aaef
2020-08-18 19:40:21 -07:00
TreeHugger Robot
37a3d091ba Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev 2020-08-07 06:02:58 +00:00
TreeHugger Robot
45b58904b2 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2020-08-07 04:31:40 +00:00
The Android Open Source Project
c13c712b58 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I3bb874713476b81f55c01ce7e216a9c45cd5a4c4
2020-08-06 19:08:08 -07:00
The Android Open Source Project
24cabff9dd Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I77ea27e55c35b45123c1ee7cae67b09cc3e4218f
2020-08-06 18:23:50 -07:00
The Android Open Source Project
353b9ee38f Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ic5194eae78180ec746bf55ea6f94c22c08a53fd0
2020-08-06 16:56:06 -07:00
The Android Open Source Project
bdf1469682 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I2ed0a6fd345e040ef5719859898f6b6bed9f75dc
2020-08-06 16:11:08 -07:00
Bill Yi
063a0c2f36 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ie49d879688029db3c9efa1c31edfb9fa2afedebe
2020-08-01 05:28:51 +00:00
Bill Yi
96349cbdba Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I153bf2bc5e72c413ebecf77063df67c22cafcabc
2020-07-29 01:40:05 +00:00
Bill Yi
708e1e4f9e Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I71c7609f5c78b3042c980428f08dbe0eb6db5b67
2020-07-20 21:45:04 -07:00
Bill Yi
504c673017 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: If5aefe4449fb12bc20991bc9f55da58264b9bb72
2020-07-18 01:41:07 -07:00
Bill Yi
27c958217c Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I6d24581acb273eeb86fad1f6a7d984b03aa0e1f3
2020-07-17 06:24:32 -07:00
Bill Yi
2532f0b32c Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: I30a4580a86030d499cdaa42ee082af185543ee6d
2020-07-14 02:03:30 -07:00
Bill Yi
f1b647b8cf Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: Id32430b0e1121b7241c5ccf2da80ca3b3ea34fcd
2020-07-13 23:52:15 -07:00
Bill Yi
d7102ca072 Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: I1857033f45c9da5e4cc646d0e3f0afdc295cd71a
2020-07-10 11:54:14 -07:00
Bill Yi
2c934f3a23 Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: Ibcbd482368a27354ec532d7c4f29cffb63b7376a
2020-07-10 09:42:57 -07:00
Bill Yi
042f3d1bf5 Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: I060d248cade273ee2298f9bac0b95ab64aed1689
2020-07-08 15:15:50 -07:00
Bill Yi
1ca2d785db Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: Ife4850f0aa06b6ea690b0879621ab8e57ecbc1e5
2020-07-08 13:04:14 -07:00
Bill Yi
2a483616ec Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: I366c375aa973a601c98395d6052e1bcb42b69e8c
2020-07-03 19:09:34 -07:00
Bill Yi
9dcae7e510 Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: I3a787cd8d7e3b2900c18e6e53ab9e3f92ea4430a
2020-07-03 07:05:39 -07:00
Bill Yi
60f8b2d513 Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: I74345e5dabdde3467f04f047d9195a8cf17d03fe
2020-07-03 05:31:24 -07:00