SongFerngWang
34dac9cb73
[MEP] Hide the preferred SIM dialog when the user has replaced the SIM
...
Since there is the race condition and it causes UI hides the preferred
SIM dialog. Therefore, to hide the preferred SIM dialog under the
specific condition which the user has replaced the SIM during the
SIM switching.
Bug: 238061853
Test: Manually testing. Device has the psim+esim and the esim's mobile
data on. The tester disables the esim and then UI shows the preferred
SIM dialog.
Change-Id: I01e7d60170c5053730fd3113abd914fb5c0d11c9
(cherry picked from commit 286dce6b6e
2022-07-29 22:35:50 +00:00
Jason Chiu
8cef068117
Make bluetooth not discoverable via large screen deep link flow
...
Deep links on large screen devices starts a homepage activity on the
left pane, and then starts the target activity on the right pane. This
flow overrides the calling package, and the target activity can't know
who initially calls it.
Thus, we store the initial calling package in the intent, so the
Connected devices page is able to make bluetooth not discoverable when
it's called from unintended apps on large screen devices.
Bug: 234440688
Test: robotest, manual
Change-Id: I4ddcd4e083c002ece9d10aabdb4af4a41de55ce7
Merged-In: I4ddcd4e083c002ece9d10aabdb4af4a41de55ce7
(cherry picked from commit 5df14831b8
2022-07-29 22:35:44 +00:00
Bill Yi
4a547374df
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ic8c471db2d76a88f53565f86acf582afa5fa302f
2022-07-29 15:21:32 -07:00
Bonian Chen
8097546f46
resolve merge conflicts of 81d1cd0871 to stage-aosp-master am: 4ec8323bad am: 244f21d9d7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19465627
Change-Id: Ifabb14e5aadcbaf55095c5fccea5adabc0da5b40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-29 10:27:37 +00:00
Bonian Chen
244f21d9d7
resolve merge conflicts of 81d1cd0871 to stage-aosp-master am: 4ec8323bad
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19465627
Change-Id: I1c79864417df3c542538634621cb0458a892d926
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-29 10:11:11 +00:00
Bonian Chen
4ec8323bad
resolve merge conflicts of 81d1cd0871 to stage-aosp-master
...
Test: Build pass this conflict resolution.
Bug: None
Change-Id: Iaacaeaa579025deee52b29b4b1245fc7c0fa0346
2022-07-29 07:34:35 +00:00
Treehugger Robot
81d1cd0871
Merge "Settings: Make NetworkScanHelper max search time customizable"
2022-07-29 05:37:46 +00:00
Oli Lan
c0742e745d
Revert "Prevent exfiltration of system files via user image settings."
...
This reverts commit 8950a90024
2022-07-28 12:14:14 +00:00
Tsung-Mao Fang
68fa74625c
Set an action name for wallpaer index am: 0f7b80f47f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19394202
Change-Id: Id464e7cb46590b003ecb2fab9d73b69fc14fda9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-27 03:02:38 +00:00
Himanshu Rawat
8fc819f87a
Merge "Don't cancel passkey entry pairing autonomously" am: 059ab284e7 am: 7c6a004452 am: 99bbb571f3
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2159779
Change-Id: I7e51117d355b763c0f3d299864cb40dabed90c4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-26 03:44:20 +00:00
Himanshu Rawat
99bbb571f3
Merge "Don't cancel passkey entry pairing autonomously" am: 059ab284e7 am: 7c6a004452
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2159779
Change-Id: I1fa257f586e109a15aa1a26f9153ddcc6ba5b866
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-26 03:18:47 +00:00
Himanshu Rawat
c2b402bd50
Don't cancel passkey entry pairing autonomously
...
Bluetooth pairing is cancelled if the pairing popup is closed without
explicitly accepting the pairing. However there is no way to
explicitly accept the pairing when the local device displays for the
passkey entry or pin key entry pairing method.
As a result all passkey entry and pin key entry pairings, where the
local device is displaying the value, are cancelled after the pairing
is successful. If the BT stack has not completed the SDP search when
the pairing is cancelled after successful pairing, it may result in
removal of the bond information.
Bug: 237757124
Test: Pair with BT HID keyboard; adb logcat | grep "BTPairingController:
Pairing dialog canceled"
Change-Id: Ifdb98c16084dd811eed68469e7df5d1913c6ace8
(cherry picked from commit aa1950fd80
2022-07-26 03:15:38 +00:00
Himanshu Rawat
d668a888f0
Don't cancel passkey entry pairing autonomously
...
Bluetooth pairing is cancelled if the pairing popup is closed without
explicitly accepting the pairing. However there is no way to
explicitly accept the pairing when the local device displays for the
passkey entry or pin key entry pairing method.
As a result all passkey entry and pin key entry pairings, where the
local device is displaying the value, are cancelled after the pairing
is successful. If the BT stack has not completed the SDP search when
the pairing is cancelled after successful pairing, it may result in
removal of the bond information.
Bug: 237757124
Test: Pair with BT HID keyboard; adb logcat | grep "BTPairingController:
Pairing dialog canceled"
Change-Id: Ifdb98c16084dd811eed68469e7df5d1913c6ace8
(cherry picked from commit aa1950fd80
2022-07-26 03:15:18 +00:00
Tsung-Mao Fang
0f7b80f47f
Set an action name for wallpaer index
...
Since Android T+, app has to assign an action name for opening a
external app page.
Test: Manual test wallpaper search result and can open.
Fix: 239867167
Change-Id: I4579aaf6e831ff82721c958e6b91ede4cabda2c8
2022-07-26 02:36:13 +00:00
Himanshu Rawat
7c6a004452
Merge "Don't cancel passkey entry pairing autonomously" am: 059ab284e7
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2159779
Change-Id: I7680942ca7ac5da3799b10306b1a3849800a1f4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-26 02:17:18 +00:00
Himanshu Rawat
059ab284e7
Merge "Don't cancel passkey entry pairing autonomously"
2022-07-26 02:00:52 +00:00
LuK1337
988a76f5bb
Settings: Make NetworkScanHelper max search time customizable
...
Default max search time (300) fails on some devices.
Test: Network scan works on OnePlus 9 after overlaying
max network scan search time to 254.
Change-Id: Ia0038fac6d2000748e0aa08fd6a53f11876728d7
2022-07-25 17:44:40 -07:00
TreeHugger Robot
0ce31c8b67
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 96bc6ca196 -s ours am: c79be68440 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19392234
Change-Id: I90f41daf52ab4a7642a52a6e3842899c1992d2cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-23 02:38:08 +00:00
Bill Yi
ff79fd3b9f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: babd7f1cc6 -s ours am: 9dd5145c74 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19392234
Change-Id: I3164cb0d0dfed7b688a728b6f349b005e53a832d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-23 02:37:48 +00:00
Automerger Merge Worker
474e99c32a
Merge changes from topic "am-fccad1fd78d74820ac27310bf754500a" into tm-d1-dev-plus-aosp
...
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 1ea00326ca1e9765bba2
2022-07-23 02:37:01 +00:00
TreeHugger Robot
54b94fa642
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 1ea00326ca -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19392235
Change-Id: I5119efab47640f42f428d030436676fdf0094b10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-23 02:36:09 +00:00
Bill Yi
05f6d665f2
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1e9765bba2 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19392235
Change-Id: I521ab57fadf33371e57bdca1e1d0c75273e99417
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-23 02:35:46 +00:00
TreeHugger Robot
4915a9b3aa
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 96bc6ca196 -s ours am: 7da6e7a960 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19392234
Change-Id: I9d1c7e8c5e7e6a1ffa0935368ee627f396d07e1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-23 02:35:27 +00:00
Bill Yi
ed43940526
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: babd7f1cc6 -s ours am: e6613a454e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19392234
Change-Id: I39e4eed9088fd5cbb66bb0d35ccf29803b4b5759
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-23 02:35:09 +00:00
TreeHugger Robot
c79be68440
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 96bc6ca196 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19392234
Change-Id: I9adde2ee67544bbe9efc248a08a048eb8b65785a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-23 02:30:03 +00:00
Automerger Merge Worker
b13d27ffe5
Merge "[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2d0fd7f558 am: 011d462ac4 -s ours am: 7a0b1e186d -s ours" into tm-d1-dev-plus-aosp
2022-07-23 02:29:52 +00:00
Bill Yi
9dd5145c74
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: babd7f1cc6 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19392234
Change-Id: I96d8a1c29cb04a5dc84d871d9d58593f18233991
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-23 02:29:42 +00:00
Bill Yi
7c0e477837
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2d0fd7f558 am: 011d462ac4 -s ours am: 7a0b1e186d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19391530
Change-Id: I0ba8bf2a232f5be9b3579dc51d14570b88c0e86c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-23 02:29:34 +00:00
Bill Yi
71eaa44916
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2d0fd7f558 am: 011d462ac4 -s ours am: 002496b1e1 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19391530
Change-Id: Ida0da358fe3838e6190b2d8fa9b189fdb141e76a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-23 02:29:29 +00:00
TreeHugger Robot
7da6e7a960
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 96bc6ca196 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19392234
Change-Id: I7b9c981495db2c4233f959e7b217c51327d0e779
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-23 02:28:38 +00:00
Bill Yi
e6613a454e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: babd7f1cc6 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19392234
Change-Id: I7e86c90d74cd7882321631a9db4a0b8a2732e33b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-23 02:28:11 +00:00
TreeHugger Robot
1ea00326ca
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev
2022-07-23 02:03:07 +00:00
TreeHugger Robot
96bc6ca196
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-07-23 01:56:10 +00:00
Bill Yi
002496b1e1
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2d0fd7f558 am: 011d462ac4 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19391530
Change-Id: I1d9d706614d5157df413756a19ce0a45276aee33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-23 01:35:38 +00:00
Bill Yi
7a0b1e186d
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2d0fd7f558 am: 011d462ac4 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19391530
Change-Id: I10404af323f5abe0aaae3479eace278d23963828
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-23 01:33:46 +00:00
Bill Yi
45569adeed
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 04531538c2 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19391034
Change-Id: I048a1c220b7c758c8eb1c7a43fbeb1f8be41833d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-22 21:31:16 +00:00
Bill Yi
011d462ac4
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2d0fd7f558
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19391530
Change-Id: I0f062cb7d34bab7dafe000abdd96d50e7acd1db4
2022-07-22 16:58:27 +00:00
Bill Yi
1e9765bba2
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ib8c45dd3a435a2e409918b578428fdb7dd131243
2022-07-21 23:17:43 -07:00
Bill Yi
babd7f1cc6
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I8836b6918c0c9a9527bb6a95a1abb9ab53a54e9c
2022-07-21 23:10:10 -07:00
Bill Yi
04531538c2
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ic6afe4d66b49f6e961977912550f1f3f724f816f
2022-07-21 23:02:36 -07:00
Bill Yi
2d0fd7f558
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I893779ffabea7e7f41c1ecdf3e0f21c5f3183f2b
2022-07-21 20:01:30 -07:00
Bill Yi
69dee8d4a8
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: db7f7b6d31 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19346821
Change-Id: Icc93244f4cce2e97f1698939779b6e693e478f74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-20 16:32:49 +00:00
Sorin Basca
b9cd87f468
[automerger skipped] Merge "Use Mockito 4.6.1 API" am: 6a043ec5dc -s ours am: 5781b7ab3a -s ours am: 0085dcc80c -s ours
...
am skip reason: Merged-In I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b with SHA-1 e2b0873f9chttps://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2152643
Change-Id: Ia3ec9464567b759ab02b1231af36ae78da7799a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-20 06:47:13 +00:00
Sorin Basca
9cef5199a5
[automerger skipped] Use Mockito 4.6.1 API am: b9503775c0 -s ours am: ea4c4757bb -s ours am: b3fb29a4e3 -s ours
...
am skip reason: Merged-In I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b with SHA-1 e2b0873f9chttps://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2152643
Change-Id: Idb5adda6eb8b19760fb1a335ee4d3fd8cdde6bf8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-20 06:47:07 +00:00
Sorin Basca
0085dcc80c
[automerger skipped] Merge "Use Mockito 4.6.1 API" am: 6a043ec5dc -s ours am: 5781b7ab3a -s ours
...
am skip reason: Merged-In I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b with SHA-1 e2b0873f9chttps://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2152643
Change-Id: I01c4d0a739da9f35f0c45561a04cc8273969bb78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-20 06:26:16 +00:00
Sorin Basca
b3fb29a4e3
[automerger skipped] Use Mockito 4.6.1 API am: b9503775c0 -s ours am: ea4c4757bb -s ours
...
am skip reason: Merged-In I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b with SHA-1 e2b0873f9chttps://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2152643
Change-Id: I8cdf0303f4a286ebc74bcb2af74aac2598075805
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-20 06:26:05 +00:00
Sorin Basca
5781b7ab3a
[automerger skipped] Merge "Use Mockito 4.6.1 API" am: 6a043ec5dc -s ours
...
am skip reason: Merged-In I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b with SHA-1 e2b0873f9chttps://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2152643
Change-Id: I9f616094bf9b1e54edd58918e6504885207f04e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-20 05:55:36 +00:00
Sorin Basca
ea4c4757bb
[automerger skipped] Use Mockito 4.6.1 API am: b9503775c0 -s ours
...
am skip reason: Merged-In I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b with SHA-1 e2b0873f9chttps://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2152643
Change-Id: Id9c27926a1f4cf518aa4c9b0ba69ed51f7dda310
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-20 05:55:23 +00:00
Sorin Basca
6a043ec5dc
Merge "Use Mockito 4.6.1 API"
2022-07-20 05:32:35 +00:00
Himanshu Rawat
aa1950fd80
Don't cancel passkey entry pairing autonomously
...
Bluetooth pairing is cancelled if the pairing popup is closed without
explicitly accepting the pairing. However there is no way to
explicitly accept the pairing when the local device displays for the
passkey entry or pin key entry pairing method.
As a result all passkey entry and pin key entry pairings, where the
local device is displaying the value, are cancelled after the pairing
is successful. If the BT stack has not completed the SDP search when
the pairing is cancelled after successful pairing, it may result in
removal of the bond information.
Bug: 237757124
Test: Pair with BT HID keyboard; adb logcat | grep "BTPairingController:
Pairing dialog canceled"
Change-Id: Ifdb98c16084dd811eed68469e7df5d1913c6ace8
2022-07-20 03:33:55 +00:00
