Commit Graph

86386 Commits

Author SHA1 Message Date
TreeHugger Robot
eb3e22d6f8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 8e1e9adc14 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1c6b3ef2d40215c682ba5ff59b758e9a091ac75a
2022-01-11 01:03:43 +00:00
Bill Yi
7973db12a9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e9a027938e -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iac3fa529e4c286e699f140a779a56c3500c5391d
2022-01-11 01:02:26 +00:00
TreeHugger Robot
8e1e9adc14 Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2022-01-11 00:41:52 +00:00
Bill Yi
e9a027938e Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Id3b3a757c9db72f3349a135e3b0e28ce34a35d16
2022-01-10 05:45:14 +00:00
Bill Yi
6bc95e2783 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ibeeefa1a48fbbebd0779d942f354eb1389130f51
2022-01-10 05:41:40 +00:00
TreeHugger Robot
f48a240945 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: fad8ac95a4 -s ours am: ad7ea804d8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3172d86558003edbeafd7dc8480ae7cb4cafd9fd
2022-01-09 05:36:59 +00:00
Bill Yi
5950ef489f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ac0bd999f1 -s ours am: dcd2b90022 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie4733b05be99789d6564e3d1e93fcdac87dfa75c
2022-01-09 05:36:53 +00:00
TreeHugger Robot
f2c222c977 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: cc94febb28 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I745c361ee221f9a9dbfe2275de5b095fda0cdfb0
2022-01-09 05:35:49 +00:00
TreeHugger Robot
ad7ea804d8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: fad8ac95a4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ibf86012a9197656e463869fa55785efadf1230c8
2022-01-09 05:34:35 +00:00
Bill Yi
3710710bc5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f69d80aa34 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Idd3f900e12d87f0da38157f8ba2a130c9e058ae5
2022-01-09 05:34:35 +00:00
Bill Yi
dcd2b90022 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ac0bd999f1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I07cdae04675495c5ed06cd0effdf2381939e54f2
2022-01-09 05:34:28 +00:00
TreeHugger Robot
fad8ac95a4 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2022-01-09 05:14:26 +00:00
TreeHugger Robot
cc94febb28 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2022-01-09 05:14:18 +00:00
Bill Yi
6930ac9588 [automerger skipped] Merge "Merge sc-qpr1 to aosp-master - DO NOT MERGE" am: 75205dc6b3 -s ours am: 5ef6e53bf5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5a9ec3301f4d4649584a57abc8d3776ae2e78311
2022-01-07 18:16:20 +00:00
Bill Yi
5ef6e53bf5 [automerger skipped] Merge "Merge sc-qpr1 to aosp-master - DO NOT MERGE" am: 75205dc6b3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I08d291860f76cb1993aae826cb6bd85b4430e52e
2022-01-07 17:48:51 +00:00
Bill Yi
75205dc6b3 Merge "Merge sc-qpr1 to aosp-master - DO NOT MERGE" 2022-01-07 17:29:12 +00:00
Bill Yi
f69d80aa34 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Iec8d44a0966c47b347de5290f9a3bc5f5c54dc6c
2022-01-07 10:29:08 +00:00
Bill Yi
9fed0efc79 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I089bd7964eff40566f6e0e5f29419ffffd0e8525
2022-01-07 10:25:35 +00:00
Bill Yi
6ad216fce4 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I0a648477cbd18dc003cae1dfa61a3387d8f76536
2022-01-07 10:16:21 +00:00
Bill Yi
ac0bd999f1 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: If79c3e0fd0ebe9847befbf0f32184782cbc5f7e2
2022-01-07 10:14:50 +00:00
Bill Yi
39df254c94 Merge sc-qpr1 to aosp-master - DO NOT MERGE
Merged-In: Id5612dfa82e11037cd95b0ef0f5a507d9c86dd48
Merged-In: I4f51c80cf4e32c384afad849c04c7c6afa065767
Change-Id: Ie466180309fcfe540492967e8bf3587b34928ded
2022-01-06 18:39:02 -08:00
Bill Yi
9400843a91 [automerger skipped] Merge SQ1A.220105.002 to stage-aosp-master - DO NOT MERGE am: ea1249b895 -s ours
am skip reason: Merged-In I896f9fd68c6cf3ebce5f9b56a6eb9c49d113f0e4 with SHA-1 3387491083 is already in history

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

Change-Id: I4f51c80cf4e32c384afad849c04c7c6afa065767
2022-01-07 02:01:47 +00:00
Bill Yi
ea1249b895 Merge SQ1A.220105.002 to stage-aosp-master - DO NOT MERGE
Merged-In: I896f9fd68c6cf3ebce5f9b56a6eb9c49d113f0e4
Change-Id: Id5612dfa82e11037cd95b0ef0f5a507d9c86dd48
2022-01-05 21:10:49 -08:00
Chen Xu
3387491083 Merge "eSIM deprecated API test Refactoring" am: a4f936408c am: 688f9d61cd
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1936017

Change-Id: I896f9fd68c6cf3ebce5f9b56a6eb9c49d113f0e4
2022-01-04 20:02:29 +00:00
Chen Xu
44e579e3ea Merge "[MEP] eSIM deprecated API Refactoring" am: c479598895 am: cb851c79ae
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1934924

Change-Id: I580a094ed849679e0a7a96cd6c6558abe758a1ea
2022-01-04 20:02:25 +00:00
Chen Xu
688f9d61cd Merge "eSIM deprecated API test Refactoring" am: a4f936408c
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1936017

Change-Id: Iab671e2e10141401921aa0a27a24a4f222570fa0
2022-01-04 19:18:08 +00:00
Chen Xu
cb851c79ae Merge "[MEP] eSIM deprecated API Refactoring" am: c479598895
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1934924

Change-Id: I1f2e66287f1cdad92515b3d248cacd56991fa38b
2022-01-04 19:18:06 +00:00
Chen Xu
a4f936408c Merge "eSIM deprecated API test Refactoring" 2022-01-04 18:50:10 +00:00
Chen Xu
c479598895 Merge "[MEP] eSIM deprecated API Refactoring" 2022-01-04 18:50:10 +00:00
SongFerngWang
4fdf8be369 [MEP] eSIM deprecated API Refactoring
The telephony APIs were changed, the Settings needs the refactoring.

Bug: 206801604
Test: build pass.
atest QuerySimSlotIndexTest (PASS)
atest SelectableSubscriptionsTest (PASS)

Change-Id: Ic3244333b7d3750b88ecb3dbc5d7036da50b9d4d
Merged-In: Ic3244333b7d3750b88ecb3dbc5d7036da50b9d4d
2022-01-04 10:13:04 +00:00
sandeepjs
dbe31b8e6b eSIM deprecated API test Refactoring
Test: build
Bug: 159354974
Change-Id: Iedeb90f186ab9f82894e2fecef86d339c8989542
Merged-In: Iedeb90f186ab9f82894e2fecef86d339c8989542
2022-01-03 12:15:02 +00:00
Treehugger Robot
3843e5a957 Merge "Add QUERY_AUDIO_STATE permission" am: 213d7de48c am: f3f9477f6e
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1928140

Change-Id: I8b672fa0f23eb1278d20ef3e32c9f2f93176c51d
2021-12-29 20:01:41 +00:00
Treehugger Robot
f3f9477f6e Merge "Add QUERY_AUDIO_STATE permission" am: 213d7de48c
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1928140

Change-Id: Ib1030bc382e25f5e653aa9123b2a800a4a402ad7
2021-12-29 19:44:26 +00:00
Treehugger Robot
213d7de48c Merge "Add QUERY_AUDIO_STATE permission" 2021-12-29 19:26:47 +00:00
Treehugger Robot
4df15611f8 Merge "Clear non bonded device when device picker start" am: 0d0eaad0e3 am: fb9b219b9a
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1931647

Change-Id: Ibba50c2ae901afde68ac7828a10dab3ea9daeac0
2021-12-27 06:29:51 +00:00
Treehugger Robot
fb9b219b9a Merge "Clear non bonded device when device picker start" am: 0d0eaad0e3
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1931647

Change-Id: I4315b4b7a46760aad836a1ec07202c0e6b669fe6
2021-12-27 06:18:13 +00:00
Treehugger Robot
0d0eaad0e3 Merge "Clear non bonded device when device picker start" 2021-12-27 05:59:50 +00:00
Chienyuan
c5b8ae80ea Clear non bonded device when device picker start
Bug: 205258325
Test: manual
Change-Id: I3de46ef79bcf1f643e5cd762b95ad8056237e2c6
2021-12-24 17:42:54 +08:00
TreeHugger Robot
cb71dbf3e7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: cbff549073 -s ours am: c50a74bcaf -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia2b11772d87619d00ef69310f3baab1842dd30a4
2021-12-23 18:51:01 +00:00
TreeHugger Robot
77fd150a83 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: ea3917df6f -s ours am: 179503712b -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ief4a6f4c5ba0deb79fb26d63e0f7201f4ef459a3
2021-12-23 18:50:55 +00:00
TreeHugger Robot
cefa2d5659 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 131de319c0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Idbbe39e560ba4b09eb7551e257597999767dc747
2021-12-23 18:50:16 +00:00
TreeHugger Robot
daf4f6397a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 1f5c8ea55d -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ifbd1f12ef61201e1c68d29d792e1dd30617fc3a7
2021-12-23 18:49:15 +00:00
TreeHugger Robot
c50a74bcaf [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: cbff549073 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I134d52b57e5f67b7a5cb1e42e0b9d64230a3d10f
2021-12-23 18:49:07 +00:00
TreeHugger Robot
179503712b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: ea3917df6f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4b57db49100b629d44c91ee3a83f9d0eb504336d
2021-12-23 18:48:48 +00:00
TreeHugger Robot
cbff549073 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-12-23 18:20:34 +00:00
TreeHugger Robot
ea3917df6f Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-12-23 18:20:30 +00:00
TreeHugger Robot
131de319c0 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2021-12-23 18:20:15 +00:00
TreeHugger Robot
1f5c8ea55d Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2021-12-23 18:20:13 +00:00
Bill Yi
778c36e32e Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I8615103b5a4df25008ca6ee5d3d5991a6ade0d1d
2021-12-22 17:43:28 +00:00
Bill Yi
4948c670f0 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ib5db99d68b52f343bdc999deb666780690faec52
2021-12-22 17:39:39 +00:00