Commit Graph

83285 Commits

Author SHA1 Message Date
Yanting Yang
4124284bb7 Improve the latency of first entering Apps page
Root cause:
AppsPreferenceController will query the recent app usages twice on
the main thread.

Solution:
Set flag to ensure only triggering refreshUi() once when entering
the Apps page.

Also correct the preference key of apps.xml since we don’t have
duplicated preferences now.

Fixes: 183176038
Test: robotests & visual
Change-Id: Ia41ee1e4a1946b8122deca63e318d3915afcc426
2021-06-28 18:30:39 +08:00
Bonian Chen
26af8823ef Merge "Revert "[Settings] Code Refactor - ActiveSubscip..."" into sc-dev am: a3f28b034d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15125273

Change-Id: I988673df4227bfae943eea3df6b9de49a5e28364
2021-06-28 10:15:39 +00:00
Bonian Chen
a3f28b034d Merge "Revert "[Settings] Code Refactor - ActiveSubscip..."" into sc-dev 2021-06-28 10:06:21 +00:00
Bonian Chen
d9bf670725 Revert "[Settings] Code Refactor - ActiveSubscip..."
There seems to be an issue on system when a modification on file name get referenced by multiple submit(s).
(ag/15106410 and ag/15102785).

It seems to me that, build system got build breakage immediately instead of merging all of the files (even within same package).

Reason for revert: Try to submit all of the modifications within single submit as a workaround.

Bug: 192204057
Test: build pass
Change-Id: Ie497088a58c6ac564fde193fad2c0b67a965933c
2021-06-28 09:32:54 +00:00
Jernej Virag
149fb3397c Restore long press power setting back to gestures
The settings menu content will be reworked to be consistent with other gesture entries.

Bug: 191899039
Test: manual
Change-Id: Ia98fed5d9f04a66e22dae747e63e7d1a0bc37fa3
2021-06-28 08:25:51 +00:00
Edgar Wang
92d2c96c1d Improve pointerSpeedPreference a11y content description
Fixes: 189725080
Test: manual
Change-Id: I1638acd986fd791c2fbb7b69decda1bc461dee74
2021-06-28 16:22:23 +08:00
Stanley Wang
6c553ea3f1 Fix the problem that the unknown item will be announced when
using Switch Access.

- Disable the importantForAccessibility of the
  SettingsMainSwitchBar's parent layout.

Fix: 182227784
Test: robotest and operate the switch preference manually
Change-Id: I5e0e4bb972f6996192d5a30525bb5370a006b115
2021-06-28 16:13:20 +08:00
Hugh Chen
80d8aaad3d [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: 346b049fb1 -s ours am: 52b13e9795 -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: I42a6ad11e692ffda53b86b78ca8edb1a9dd3fc29
2021-06-28 07:28:03 +00:00
Hugh Chen
d5b07b03d1 [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: c91f8b0991 -s ours am: b17f196c3d -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: I131999e135f1965bafe5b9aa67f5d737b869491f
2021-06-28 07:27:59 +00:00
Hugh Chen
aff7f97f8c [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: 1e764fb0a6 -s ours am: 5e708fd301 -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: If5378005cf7a5445c24748a4aa07e0b539cec352
2021-06-28 07:27:54 +00:00
Hugh Chen
a3c7b58697 [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: d8ef6bc5af -s ours am: ad3ecbdd0c -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: Ib708132f72b1eff81c443f2163c8783b9a6fd59c
2021-06-28 07:27:50 +00:00
Hugh Chen
52b13e9795 [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: 346b049fb1 -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: I1b667afef2b3858cb3cb627404090e5de7dba48b
2021-06-28 07:18:39 +00:00
Hugh Chen
b17f196c3d [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: c91f8b0991 -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: Iec0be080d17d234d4ef68d1e29bbe7be18a9e91b
2021-06-28 07:18:34 +00:00
Hugh Chen
5e708fd301 [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: 1e764fb0a6 -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: I64dbe7b1dddfaac7d0c35378951df62a4688a477
2021-06-28 07:18:13 +00:00
Hugh Chen
ad3ecbdd0c [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: d8ef6bc5af -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: Iaf07be5625a927fdffacbe491140018873a40560
2021-06-28 07:18:08 +00:00
Hugh Chen
1e764fb0a6 [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: Ib79eaf776f222a1af892a881d6f9a9b2d6e28471
2021-06-28 07:07:07 +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
d8ef6bc5af [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: I98eb7a2034a40bb28540b2e9dad3b84ecf4d430d
2021-06-28 07:07:00 +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
afcfd0ee07 [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: c6362e92e8 -s ours am: c87b09a9c4 -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: Ied8291f205c9e341b457b4664cffc4fc67444275
2021-06-28 06:58:15 +00:00
Hugh Chen
3277eb0407 [automerger skipped] RESTRICT AUTOMERGE Update string am: 79ae54ca2d -s ours am: 1fe494db11 -s ours am: 9f4308daa2 -s ours am: 367921a80d -s ours am: 3f2394bbc7 -s ours am: 5a9f761f75 -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: I5a89995984d9d1d0d16af66f3cfb4f7af9c2c20e
2021-06-28 06:58:11 +00:00
Hugh Chen
948887231a [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: a539c36421 -s ours am: b42ecba8a3 -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: I82bc75b0e0d6d36260673bc144a84b56f3e58541
2021-06-28 06:58:07 +00:00
Hugh Chen
12e2f40371 [automerger skipped] RESTRICT AUTOMERGE Update string am: 7ce80425ee am: 3f493a3078 -s ours am: 87426af532 -s ours am: dbcebc42bf -s ours am: 8b9dbd066a -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: I2ec23cc754fa2805e14112119e76a0e106d085e4
2021-06-28 06:58:00 +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
c87b09a9c4 [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: c6362e92e8 -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: Ice6e60ffb90eb289b8a90e57acf0e48c07399d44
2021-06-28 06:52:22 +00:00
Hugh Chen
5a9f761f75 [automerger skipped] RESTRICT AUTOMERGE Update string am: 79ae54ca2d -s ours am: 1fe494db11 -s ours am: 9f4308daa2 -s ours am: 367921a80d -s ours am: 3f2394bbc7 -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: I54e4dc25694f503c3d4a48071929abc61be5ad6a
2021-06-28 06:52:18 +00:00
Hugh Chen
b42ecba8a3 [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: a539c36421 -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: I8b5ed14819b9919e4bc3781220929b9ebeb858d2
2021-06-28 06:52:13 +00:00
Hugh Chen
8b9dbd066a [automerger skipped] RESTRICT AUTOMERGE Update string am: 7ce80425ee am: 3f493a3078 -s ours am: 87426af532 -s ours am: dbcebc42bf -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: Id00a69e04103f387d0920a628222b5aeff3a3f5d
2021-06-28 06:52:08 +00:00
Hugh Chen
4d49ac0837 [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: 49d4c89944 -s ours am: 985d52d0c6 -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: I336e4f83f9f420a7d836a5f99fa4fe0ea9ed022d
2021-06-28 06:48:55 +00:00
Hugh Chen
ecfff8b79b [automerger skipped] RESTRICT AUTOMERGE Update string am: 79ae54ca2d -s ours am: 1fe494db11 -s ours am: 9f4308daa2 -s ours am: 367921a80d -s ours am: f41af1a1e3 -s ours am: eb41b62299 -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: I4554d36ccd68b745d89510355d603db8c21c99b3
2021-06-28 06:48:51 +00:00
Hugh Chen
b03a49d16e [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: 48ceb503d8 -s ours am: 7f4a301b88 -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: Id555101d62269b28fa0f8fbfd636f3212824d03c
2021-06-28 06:48:47 +00:00
Hugh Chen
f047ed0a50 [automerger skipped] RESTRICT AUTOMERGE Update string am: 7ce80425ee am: 3f493a3078 -s ours am: 87426af532 -s ours am: 4c2b189379 -s ours am: 3e51c20e21 -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: Ibce4e5f127501d883fcf198bd4d5799880c56993
2021-06-28 06:48:44 +00:00
Hugh Chen
4695948372 [automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: a5046f219a am: bee2daea18 -s ours am: ff719d5bd8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2a1613222b6ea6a555645322d1f2ab14f6b78235
2021-06-28 06:48:40 +00:00
Hugh Chen
0826507b60 [automerger skipped] RESTRICT AUTOMERGE Update string am: 9356205dfc -s ours am: 76545f383c -s ours am: 60beadd631 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I829135ca573638995c6319ffbc4418bba84affc4
2021-06-28 06:48:37 +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
985d52d0c6 [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: 49d4c89944 -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: Ice63058d24150556d6b93398c1ca2f5dc76afc08
2021-06-28 06:42:26 +00:00
Hugh Chen
eb41b62299 [automerger skipped] RESTRICT AUTOMERGE Update string am: 79ae54ca2d -s ours am: 1fe494db11 -s ours am: 9f4308daa2 -s ours am: 367921a80d -s ours am: f41af1a1e3 -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: I04479e17813fe34299739d0ba235a9cc711bf0b2
2021-06-28 06:42:22 +00:00
Hugh Chen
7f4a301b88 [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: 48ceb503d8 -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: Id62683035962b0c8df55c61fb574c5e86025ad06
2021-06-28 06:42:17 +00:00
Hugh Chen
3e51c20e21 [automerger skipped] RESTRICT AUTOMERGE Update string am: 7ce80425ee am: 3f493a3078 -s ours am: 87426af532 -s ours am: 4c2b189379 -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: Ibe216a5f6ac77ae34c00eaf915c34397833fd71d
2021-06-28 06:42:13 +00:00
Hugh Chen
49d4c89944 [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: I19651eae9672ae29ed50c9b795626b49d062f557
2021-06-28 06:37:50 +00:00
Hugh Chen
f41af1a1e3 [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: If1c2a27ab396564127b1bd4d2030ff0a308d9fee
2021-06-28 06:37:47 +00:00
Hugh Chen
48ceb503d8 [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: I245db30a5d520b326015747008037cfaf9f10351
2021-06-28 06:37:37 +00:00
Hugh Chen
4c2b189379 [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: I8d51b562c0610f609892dd56fe81d70edbbf4109
2021-06-28 06:37:33 +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
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
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
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