SongFerngWang
8514ff65eb
[Setting crash] The dialog is null
...
Add the null protection.
Bug: 235267673
Test: build pass
Change-Id: Ib9308d152ddc233354d89166b8d79fcec81d8c19
2022-06-08 08:32:05 +00:00
Bill Yi
04b439f643
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e6b9e1fdf5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18774217
Change-Id: I6157b0172eca6b502973a9fc653fae093518edeb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-08 02:46:23 +00:00
Bill Yi
e6b9e1fdf5
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I3cdc674297a6f760c146bfd95190496a88309055
2022-06-07 07:29:07 -07:00
Bill Yi
6a7e3fc8dd
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I490033f7244d12463519754330d8ff76c5753005
2022-06-07 07:21:14 -07:00
Bill Yi
b398e5434c
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I8ff8e957617656c81494a816c9e18a4efbd4ed14
2022-06-07 07:17:14 -07:00
Edgar Wang
e7d6508284
Merge "Recalculate view's height when tab is selected" into tm-dev am: 1f6334825f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18197509
Change-Id: I11312c2633242bf780379ff4b66a72800afde31a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-07 04:40:42 +00:00
Edgar Wang
1f6334825f
Merge "Recalculate view's height when tab is selected" into tm-dev
2022-06-07 04:17:39 +00:00
TreeHugger Robot
dd89a4a2c3
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 725c53880a
-s ours am: 3de5617a68
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18745296
Change-Id: Ic40bb9d41dca47b2b3ff429d9969055dc12b4b37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-06 23:20:21 +00:00
Bill Yi
01793cf5fd
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 106e52ca92
-s ours am: 2036b1873c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18745296
Change-Id: Ie71f3ec83b61690d58ec4cd9f273c972ebc17458
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-06 23:20:17 +00:00
TreeHugger Robot
c9a2fdbdc0
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: e852811d18
-s ours am: 722272143c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18745293
Change-Id: I98b80d598cd594ba0e32b459aef86ec9764d1245
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-06 23:20:11 +00:00
Bill Yi
37f8a48e08
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 96fda27ccb
-s ours am: 26d22ef04d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18745293
Change-Id: I2a98511bdefcd0fe1c97aebc37fe2ab626270ebe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-06 23:20:02 +00:00
TreeHugger Robot
3de5617a68
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 725c53880a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18745296
Change-Id: I7a89dc3c0ffad10dec24003198409aad5b174182
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-06 22:53:21 +00:00
Bill Yi
2036b1873c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 106e52ca92
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18745296
Change-Id: I57a2a0dcb836119e48d63874ec6ed77715cab344
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-06 22:53:17 +00:00
TreeHugger Robot
722272143c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: e852811d18
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18745293
Change-Id: Ic3a2da03399dc35e01360df7c323cb3b5b68808c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-06 22:53:10 +00:00
Bill Yi
26d22ef04d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 96fda27ccb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18745293
Change-Id: I1286629b18bae7a7a76bd4c96fc3b3d33cf559db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-06 22:53:00 +00:00
TreeHugger Robot
725c53880a
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2022-06-06 22:36:20 +00:00
TreeHugger Robot
e852811d18
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2022-06-06 22:36:20 +00:00
TreeHugger Robot
6028a06e83
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 6769eee779
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18745573
Change-Id: Ib6173106dbedeadae988a35a50d9e8d99d122184
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-06 21:14:50 +00:00
Bill Yi
9897a4fd49
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d3dc439a10
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18745573
Change-Id: I3d76086b5edb4068bc4e6768f84bca506e10543c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-06 21:14:41 +00:00
TreeHugger Robot
6769eee779
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-06-06 21:03:12 +00:00
TreeHugger Robot
21b98d4cbf
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod
2022-06-06 18:41:19 +00:00
TreeHugger Robot
fc5802934b
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod
2022-06-06 18:41:19 +00:00
TreeHugger Robot
a4eef59b36
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
2022-06-06 18:40:23 +00:00
SongFerngWang
64430ba2d2
Unable to enable the removable esim
...
When the user enable the removable esim, the settings select wrong
slot(esim slot). The slot shold be the removable + esim slot and the
UiccCardInfo's cardId is the same as the removable esim's cardId.
Bug: 233170453
Bug: 233338345
Test: atest UiccSlotUtilTest
Change-Id: Ibd324b781c84318c994e3742bb82e1d1393b94e4
2022-06-06 17:56:25 +08:00
Raphael Kim
b00af0df94
[automerger skipped] Merge "Extract app label from component name in notification access confirmation UI" into qt-dev am: 94683c61b1
am: 839ce544aa
am: 84bafc9fda
am: d6353487cf
am: 6d5ea9e89a
am: 8da96d69dd
-s ours am: aa31e245ab
-s ours am: a2b94beca8
-s ours
...
am skip reason: Merged-In I8613d9b87a53d4641c0689bca9c961c66a2e9415 with SHA-1 c548f102e5
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670793
Change-Id: I46790fa4395f15742722d93d97ff81026c895743
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-06 09:10:37 +00:00
Raphael Kim
a2b94beca8
[automerger skipped] Merge "Extract app label from component name in notification access confirmation UI" into qt-dev am: 94683c61b1
am: 839ce544aa
am: 84bafc9fda
am: d6353487cf
am: 6d5ea9e89a
am: 8da96d69dd
-s ours am: aa31e245ab
-s ours
...
am skip reason: Merged-In I8613d9b87a53d4641c0689bca9c961c66a2e9415 with SHA-1 c548f102e5
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670793
Change-Id: Ib29e5d311bf6f13e6ecc06d55d72a56c2d93e246
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-06 08:53:57 +00:00
Raphael Kim
aa31e245ab
[automerger skipped] Merge "Extract app label from component name in notification access confirmation UI" into qt-dev am: 94683c61b1
am: 839ce544aa
am: 84bafc9fda
am: d6353487cf
am: 6d5ea9e89a
am: 8da96d69dd
-s ours
...
am skip reason: Merged-In I8613d9b87a53d4641c0689bca9c961c66a2e9415 with SHA-1 c548f102e5
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670793
Change-Id: Icfb23e771f8b8c77ca426f5c448227b6181cf72b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-06 08:32:35 +00:00
Raphael Kim
fbfa9e2df7
Merge "Extract app label from component name in notification access confirmation UI" into qt-dev am: 94683c61b1
am: 839ce544aa
am: 84bafc9fda
am: d6353487cf
am: 6d5ea9e89a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670793
Change-Id: I8e0a51ca890273ffa537f3e94372ba48a8e715d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-06 08:15:46 +00:00
Raphael Kim
8da96d69dd
Merge "Extract app label from component name in notification access confirmation UI" into qt-dev am: 94683c61b1
am: 839ce544aa
am: 84bafc9fda
am: d6353487cf
am: 6d5ea9e89a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670793
Change-Id: I5ba1ef5a3a708c14b9fb739753e83d923b98b1cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-06 08:15:08 +00:00
Raphael Kim
6d5ea9e89a
Merge "Extract app label from component name in notification access confirmation UI" into qt-dev am: 94683c61b1
am: 839ce544aa
am: 84bafc9fda
am: d6353487cf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670793
Change-Id: Ie914a7dc51267245d8f7f919b1ed68040032fe63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-06 08:00:18 +00:00
Raphael Kim
d6353487cf
Merge "Extract app label from component name in notification access confirmation UI" into qt-dev am: 94683c61b1
am: 839ce544aa
am: 84bafc9fda
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670793
Change-Id: I3825280fafc93e56ef239bf70d72b0bb56544f3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-05 02:50:25 +00:00
Raphael Kim
84bafc9fda
Merge "Extract app label from component name in notification access confirmation UI" into qt-dev am: 94683c61b1
am: 839ce544aa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670793
Change-Id: I13426af81ec5970befc29118f883a08d28c8a986
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-05 02:32:26 +00:00
Raphael Kim
839ce544aa
Merge "Extract app label from component name in notification access confirmation UI" into qt-dev am: 94683c61b1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670793
Change-Id: Ic145c489bd89fbc822ee48bfc14193c62321d355
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-05 02:14:41 +00:00
Raphael Kim
94683c61b1
Merge "Extract app label from component name in notification access confirmation UI" into qt-dev
2022-06-05 01:54:28 +00:00
Bill Yi
106e52ca92
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I052e09e19a9d145d401e0152346ebe7f0e7f2a36
2022-06-04 01:26:51 -07:00
Bill Yi
96fda27ccb
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I7b60a0fb4183522545dcf50eae9cd8f1f38a6c1d
2022-06-04 01:23:16 -07:00
Bill Yi
d3dc439a10
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Idbd661c3b6a62971ef7ee40430437aac416cccdc
2022-06-04 00:58:31 -07:00
Bill Yi
577842dc11
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I1449f2aa79b1a4e8d8d5ecb75a49c237e16d1874
2022-06-04 00:44:17 -07:00
Bill Yi
c36c8eef75
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I7907d46ed6cd5416548da57698f32a344f83ba7a
2022-06-04 00:40:55 -07:00
Bill Yi
379c2f0774
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I965dcde2e137479f7a30733f635b8cfd466c93ad
2022-06-04 00:36:26 -07:00
Arc Wang
263f74a7d5
[automerger skipped] Merge changes from topic "presubmit-am-93b3a992dd6c4622a633bca394ada8e5-qt-dev" into qt-dev am: 5eabdc88f0
am: cb82328fac
-s ours am: 4b96cb9339
-s ours am: 12f11b0683
-s ours am: ab3adbd4dd
-s ours am: 1732408586
-s ours am: a80076e2f3
-s ours am: 1d71f3e2af
-s ours
...
am skip reason: Merged-In I7f8fb737a7c6f77a380f3f075a5c89a1970e39ad with SHA-1 32145cc362
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18704664
Change-Id: I49acb558baead47a4a1c242ef6122bd736b38325
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-04 02:57:45 +00:00
Tsung-Mao Fang
b21d5395e2
[automerger skipped] [DO NOT MERGE] Fix can't change notification sound for work profile. am: edf4416177
am: 99a7a61ba9
-s ours am: 2224883488
-s ours am: 2a665430e2
-s ours am: 2e3f8a30a1
-s ours am: 2abeb254ea
-s ours am: 9c070af470
-s ours am: e025e77430
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18704664
Change-Id: I11a552e5c9786ee795f99adb54b86489d38168d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-04 02:57:44 +00:00
Arc Wang
72f0527d54
[automerger skipped] [DO NOT MERGE] Fix Settings crash when setting a null ringtone am: d94b73b304
am: 58880a0bef
-s ours am: 1e688667ba
-s ours am: 1da60c2f31
-s ours am: 4129c273cc
-s ours am: 7c863fb69d
-s ours am: 4560b69963
-s ours am: d1135c52b3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356598
Change-Id: I5b1e20d6f1e18191a90b8460026d322cd18948a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-04 02:57:43 +00:00
Arc Wang
1d71f3e2af
[automerger skipped] Merge changes from topic "presubmit-am-93b3a992dd6c4622a633bca394ada8e5-qt-dev" into qt-dev am: 5eabdc88f0
am: cb82328fac
-s ours am: 4b96cb9339
-s ours am: 12f11b0683
-s ours am: ab3adbd4dd
-s ours am: 1732408586
-s ours am: a80076e2f3
-s ours
...
am skip reason: Merged-In I7f8fb737a7c6f77a380f3f075a5c89a1970e39ad with SHA-1 32145cc362
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18704664
Change-Id: I410e4b0ff40a7e9ab5922b4542314b09e7e2dea5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-04 02:33:32 +00:00
Tsung-Mao Fang
e025e77430
[automerger skipped] [DO NOT MERGE] Fix can't change notification sound for work profile. am: edf4416177
am: 99a7a61ba9
-s ours am: 2224883488
-s ours am: 2a665430e2
-s ours am: 2e3f8a30a1
-s ours am: 2abeb254ea
-s ours am: 9c070af470
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18704664
Change-Id: Ibbc64f16dd0303d4ca59a321486e1bb16b934654
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-04 02:33:30 +00:00
Arc Wang
d1135c52b3
[automerger skipped] [DO NOT MERGE] Fix Settings crash when setting a null ringtone am: d94b73b304
am: 58880a0bef
-s ours am: 1e688667ba
-s ours am: 1da60c2f31
-s ours am: 4129c273cc
-s ours am: 7c863fb69d
-s ours am: 4560b69963
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356598
Change-Id: Icdc188bafc752618012a111427f1d72cd0710002
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-04 02:33:28 +00:00
Arc Wang
a80076e2f3
[automerger skipped] Merge changes from topic "presubmit-am-93b3a992dd6c4622a633bca394ada8e5-qt-dev" into qt-dev am: 5eabdc88f0
am: cb82328fac
-s ours am: 4b96cb9339
-s ours am: 12f11b0683
-s ours am: ab3adbd4dd
-s ours am: 1732408586
-s ours
...
am skip reason: Merged-In I7f8fb737a7c6f77a380f3f075a5c89a1970e39ad with SHA-1 32145cc362
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18704664
Change-Id: I66eb46b7f25b9d3bc772ed945751858d503f9574
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-04 02:11:26 +00:00
Tsung-Mao Fang
9c070af470
[automerger skipped] [DO NOT MERGE] Fix can't change notification sound for work profile. am: edf4416177
am: 99a7a61ba9
-s ours am: 2224883488
-s ours am: 2a665430e2
-s ours am: 2e3f8a30a1
-s ours am: 2abeb254ea
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18704664
Change-Id: I3aef9cb7abcb044840d5d56ab5c79679920529cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-04 02:11:25 +00:00
Arc Wang
4560b69963
[automerger skipped] [DO NOT MERGE] Fix Settings crash when setting a null ringtone am: d94b73b304
am: 58880a0bef
-s ours am: 1e688667ba
-s ours am: 1da60c2f31
-s ours am: 4129c273cc
-s ours am: 7c863fb69d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18356598
Change-Id: I19a2734d15b42047dcae7efad291d1ce51c633d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-04 02:11:24 +00:00
Arc Wang
a58d975aa0
[automerger skipped] Merge changes from topic "presubmit-am-93b3a992dd6c4622a633bca394ada8e5-qt-dev" into qt-dev am: 5eabdc88f0
am: cb82328fac
-s ours am: 4b96cb9339
-s ours am: 12f11b0683
-s ours am: ab3adbd4dd
-s ours
...
am skip reason: Merged-In I7f8fb737a7c6f77a380f3f075a5c89a1970e39ad with SHA-1 32145cc362
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18704664
Change-Id: I42266740061fa033f0afcf4db78ce1286787fb0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-04 01:52:15 +00:00