Jack Yu
bc71ee5ece
Add getSubscriptionId API
...
The old getSubId or getSubscriptionIds return multiple sub ids
per slot index, which is not possible in today's implementation
because the slot index here refers to the logical slot index,
which is also known as phone id, or the logical modem index. In
today's telephony, one logical phone can only have one
subscription at one time, so does the modem.
Bug: 239607619
Test: Manual
Merged-In: I0a43d33daf523e6f0bea054c8965281bafbbcaa4
Change-Id: I0a43d33daf523e6f0bea054c8965281bafbbcaa4
2023-03-03 19:40:50 -08:00
Android Build Coastguard Worker
78c2c34b00
Snap for 9687311 from 1fc651aee7
to tm-qpr3-release
...
Change-Id: I30268dcc6e127053ce22d99c89d2b145a73601ea
2023-03-04 02:42:42 +00:00
Yu-Ting Tseng
631105a2af
Remove CACHED_PROC_STATES which is unused.
...
Test: atest ProcessStatsTest
Bug: 271160990
Bug: 260242581
Change-Id: I62ed4eac102cc8f9c9ce7ab1325410cddc834ca1
2023-03-03 14:42:12 -08:00
Wenhui Yang
ee77d819f9
Merge "[DO NOT MERGE] Fix tablet verify pin wording" into tm-qpr-dev am: 1fc651aee7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21631222
Change-Id: I418f39b4328603ddd96a5d0a4cc1ed347ac70aa0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-03 19:37:08 +00:00
Wenhui Yang
59090cbb65
[DO NOT MERGE] Fix tablet verify pin wording am: 07ca5b7e4e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21631222
Change-Id: I4222ff4118ab7e6da39cf777f676104092ac96b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-03 19:37:00 +00:00
Wenhui Yang
1fc651aee7
Merge "[DO NOT MERGE] Fix tablet verify pin wording" into tm-qpr-dev
2023-03-03 18:07:50 +00:00
SongFerng Wang
d427c0d2d1
Merge "[Settings] Customizable resource for hiding 3G preferred network type" into tm-qpr-dev am: 2b3cbffffd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21551540
Change-Id: I30a31add9ce0d6c8493edf162b57d80b03e4ef5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-03 17:15:07 +00:00
SongFerng Wang
2b3cbffffd
Merge "[Settings] Customizable resource for hiding 3G preferred network type" into tm-qpr-dev
2023-03-03 07:42:51 +00:00
Diya Bera
f3012c6497
Merge "Learn more updated in Fingerprint Settings for side fps" into tm-qpr-dev am: 47cedbde0a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21593025
Change-Id: Ic8b8eea0c25961ccc05b3d344161e1a194104b3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-03 01:26:01 +00:00
Diya Bera
afa29d5cb8
Merge "Removed subtext from side fps enrollment flow" into tm-qpr-dev am: 97f99f5d30
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21613842
Change-Id: Ia2a62797dd783366a5d2df4494a25d748fac7995
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-03 01:24:11 +00:00
Android Build Coastguard Worker
d86c840143
Snap for 9682271 from 97f99f5d30
to tm-qpr3-release
...
Change-Id: Idce5b5e6d6a93f366c0f9ca4634f25eb56266c44
2023-03-03 00:25:08 +00:00
Wenhui Yang
07ca5b7e4e
[DO NOT MERGE] Fix tablet verify pin wording
...
Test: Manual - Reset tablet without removing accounts, observe the texts
displayed correctly for tablet. Expanded related for devices.
Fixes: 267539281
Fixes: 270516438
Change-Id: If2ad3692b9fb2c8a374d8e988aac76a7254b8cd6
2023-03-03 00:10:18 +00:00
Diya Bera
47cedbde0a
Merge "Learn more updated in Fingerprint Settings for side fps" into tm-qpr-dev
2023-03-02 22:21:12 +00:00
Diya Bera
97f99f5d30
Merge "Removed subtext from side fps enrollment flow" into tm-qpr-dev
2023-03-02 21:22:46 +00:00
Chris Li
32d271dfb3
Update EmbeddingAspectRatio to the latest am: 81ee016a6e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21673464
Change-Id: I45ffde90d1b91b709b6e00622a789722c7cd750f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-02 20:46:57 +00:00
Diya Bera
961b32ca28
Learn more updated in Fingerprint Settings for side fps
...
Test: Manual - Go to Fingerprint Settings and check the string
Bug: 258338293
Change-Id: Ia22fcd1289bec85642993b22fe3cb3ebaf647cbd
Merged-in: Ia22fcd1289bec85642993b22fe3cb3ebaf647cbd
2023-03-02 19:09:34 +00:00
Diya Bera
327eaf16fb
Removed subtext from side fps enrollment flow
...
Test: Manual (Try to enroll your fingerprint in a side fps device, and
observe that there is no subtext in landscape mode)
Bug: 267271891
Change-Id: Iba4c13e8083ecb92f8033882af9147f14071e726
Merged-in: Iba4c13e8083ecb92f8033882af9147f14071e726
2023-03-02 18:42:02 +00:00
Chris Li
81ee016a6e
Update EmbeddingAspectRatio to the latest
...
alwaysAllow() is changed to ALWAYS_ALLOW per API Council feedback.
Bug: 270160592
Test: build
Change-Id: I44c7e97932456ec5b5bb0339ee2ee060cb6e42e0
(cherry picked from commit af2b07b248
)
(cherry picked from commit 1092486873
)
2023-03-02 15:56:45 +00:00
Bonian Chen
28367dae4d
[Settings] Customizable resource for hiding 3G preferred network type
...
Add a customiazble resource for specifying the carriers that avoiding
from showing 3G option within the preferred network type.
Bug: 261615630
Bug: 247995343
Bug: 268564499
Bug: 265147144
Bug: 267433657
Bug: 240176276
Bug: 266724047
Bug: 265147263
Bug: 242017692
Bug: 220998105
Bug: 209835551
Bug: 237837196
Bug: 239318933
Bug: 247996564
Test: local
Merged-In: I8092372372cb334b5ac1956b869d194b9fcd0523
Merged-In: I5c12ad23a240fbe70630855e5f98b5be83912674
Change-Id: I8092372372cb334b5ac1956b869d194b9fcd0523
2023-03-02 10:47:00 +00:00
Android Build Coastguard Worker
2c22447e04
Snap for 9673171 from 64fd489c13
to tm-qpr3-release
...
Change-Id: I5cfbef5a27c92db7479fd2143cda4bdd55ba3301
2023-03-02 00:25:13 +00:00
Bill Yi
8ff2cfceab
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 839c6e88b4
-s ours am: ea2310e0fe
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2457637
Change-Id: Ia395d0639b6ba51a171f6ec171901820471a7488
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 03:05:38 +00:00
Bill Yi
cec67a1ee1
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d77ddd6ab3
-s ours am: 960eae9a2f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2457637
Change-Id: Ia7b0d7129c92afe7bfbebf9ae700e30e33ea70d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 03:05:35 +00:00
Bill Yi
3ba3148e2f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 798dd47215
-s ours am: 71ad7ad49e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2456140
Change-Id: Ib615b16b5c9c5246007ba354fe3544babc30b19c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 03:05:33 +00:00
Bill Yi
75304e1ff5
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2ff8ea95f2
-s ours am: 9de8ff63dd
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2456140
Change-Id: Id37e5fd08583efac8b1c1a3d513ef4664b71750a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 03:05:25 +00:00
Bill Yi
3d4d0267c6
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 586da77594
-s ours am: cac65afe79
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2456139
Change-Id: If1b14926b3701b36b0720c264cae94087d17ed75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 03:05:09 +00:00
Bill Yi
858813dc33
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 10e200b5ad
-s ours am: d3fa508918
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2456139
Change-Id: I08f758e7ac7349eea06ec2ddca2663507d774bbc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 03:04:41 +00:00
Bill Yi
ea2310e0fe
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 839c6e88b4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2457637
Change-Id: Ia4c3858ec103f63ee8da598b5263c32aa12c2214
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 01:34:35 +00:00
Bill Yi
960eae9a2f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d77ddd6ab3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2457637
Change-Id: I70efdf826f91370e142e2001bcc787b102125430
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 01:34:32 +00:00
Bill Yi
71ad7ad49e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 798dd47215
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2456140
Change-Id: I21f3db8861e7bd07d1fb4c4325989425862ebaa7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 01:34:30 +00:00
Bill Yi
9de8ff63dd
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2ff8ea95f2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2456140
Change-Id: Ic316185ed34b2ba3801f22f7013cca419f30a090
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 01:34:22 +00:00
Bill Yi
cac65afe79
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 586da77594
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2456139
Change-Id: If1ad768e127f48cb041a2f486e41bd1539c41224
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 01:34:06 +00:00
Bill Yi
d3fa508918
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 10e200b5ad
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2456139
Change-Id: I173610558cc94901d1b48f39cc99964e5a0a55ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 01:33:38 +00:00
Bill Yi
839c6e88b4
Merge "Import translations. DO NOT MERGE ANYWHERE"
2023-03-01 00:47:17 +00:00
Bill Yi
798dd47215
Merge "Import translations. DO NOT MERGE ANYWHERE"
2023-03-01 00:47:17 +00:00
Bill Yi
586da77594
Merge "Import translations. DO NOT MERGE ANYWHERE"
2023-03-01 00:47:17 +00:00
Android Build Coastguard Worker
e06770751d
Snap for 9667109 from 3358e2a0a1
to tm-qpr3-release
...
Change-Id: Ic2c4110f8cc5e7a8cd5e620dd5345ccb60292aa7
2023-03-01 00:25:21 +00:00
Ahaan Ugale
96cb0fb4bd
Merge "Update Autofill OWNERS" am: e35606efd3
am: b238ee99cc
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2459329
Change-Id: I86a993dbc87ab3f7c59dd02b360be4e864d8cfef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 00:01:23 +00:00
Ahaan Ugale
b238ee99cc
Merge "Update Autofill OWNERS" am: e35606efd3
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2459329
Change-Id: I3837d1677ee9769f9dd5ff88d6eedbdaf97b94e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-28 23:23:30 +00:00
Ahaan Ugale
e35606efd3
Merge "Update Autofill OWNERS"
2023-02-28 22:42:36 +00:00
Bill Yi
118faadcb1
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 64fd489c13
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21606723
Change-Id: I20707402de4333b6c20b6cf564d5cff1e706397a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-28 22:34:59 +00:00
Bill Yi
b710a96e76
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e722779e34
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21606723
Change-Id: I734c5e24a8d70c11cc66edcd2da368f2ccf9486d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-28 22:34:23 +00:00
Bill Yi
64fd489c13
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2023-02-28 22:15:39 +00:00
Chris Li
74f07a89bd
Update EmbeddingAspectRatio to the latest am: 77a23c9ce2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21647966
Change-Id: I80f5c1e6a44e6ea4d73d6fbd0fad83ad3be4c0e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-28 21:40:35 +00:00
Will Leshner
554fe689fa
Restrict screen saver settings searches to enabled users. am: 3358e2a0a1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21454411
Change-Id: I20b547eb56aac56837de97473671d902b2e524fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-28 19:12:43 +00:00
Chris Li
77a23c9ce2
Update EmbeddingAspectRatio to the latest
...
alwaysAllow() is changed to ALWAYS_ALLOW per API Council feedback.
Bug: 270160592
Test: build
Change-Id: I44c7e97932456ec5b5bb0339ee2ee060cb6e42e0
(cherry picked from commit af2b07b248
)
(cherry picked from commit 1092486873
)
2023-02-28 17:13:39 +00:00
Natnael Belay
c6049dfa4e
Merge "Update EmbeddingAspectRatio to the latest" into tm-qpr-dev-plus-aosp
2023-02-28 14:51:50 +00:00
Steve Elliott
97ee8a8414
Merge "Update unseen notif filtering settings string" into tm-qpr-dev am: caf6347d11
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21464051
Change-Id: Ia7757a15bc4d4796fc7d573cc59b488453527038
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-28 12:48:22 +00:00
Darrell Shi
d8f61dc2a3
Merge "Hide "additional info" when active dream does not support." into tm-qpr-dev am: 6b6c68fd94
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21452841
Change-Id: I404de08142653608ff054be43c70d4323b063861
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-28 12:38:18 +00:00
Android Build Coastguard Worker
fddf9d6534
Snap for 9662272 from caf6347d11
to tm-qpr3-release
...
Change-Id: I95f32ec98e149fbe2504d3d70101377b70502fdb
2023-02-28 00:30:12 +00:00
TreeHugger Robot
488d3adb81
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 8e002f962e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21604873
Change-Id: Id7f81ddfe5f308de358950a5eba75a2852f29f38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-28 00:06:37 +00:00