Junyu Lai
0da4abe1db
Merge "Do not crash when duplication found in merged imsi list" am: ae267bae74
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2479336
Change-Id: I3e55fc5496918d8e2d0c230df74b62e1e6847fb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-10 09:37:20 +00:00
Junyu Lai
ae267bae74
Merge "Do not crash when duplication found in merged imsi list"
2023-03-10 09:01:44 +00:00
Junyu Lai
8005bc8f5b
Do not crash when duplication found in merged imsi list
...
For some unknown reason, the merged imsi list might contain
duplicated items. Deduplication for better error handling.
Test: make RunSettingsRoboTests
Fix: 271298466
Change-Id: I3cbe8f9441769963a16720fc5128db173fa0868b
2023-03-09 16:55:35 +08:00
Maciej Żenczykowski
f73112b56e
Merge "settings: allow enabling ethernet tethering independent of link state" am: 905d584b15
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2475089
Change-Id: I3976958e427d18b9b5c3d6ce59cb45969145fa23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-08 03:41:54 +00:00
Maciej Żenczykowski
905d584b15
Merge "settings: allow enabling ethernet tethering independent of link state"
2023-03-08 03:05:53 +00:00
Patrick Rohr
6f9062297f
settings: allow enabling ethernet tethering independent of link state
...
A user should be able to enable tethering even if the interface does not
have link yet. Therefore, the toggle should be active if any interface
is available, independent of its link state.
Test: TH
Bug: 234036868
Change-Id: I2ae25207a766d71217dd6d17f3f9b74ceb261238
2023-03-08 00:57:03 +00:00
Patty Huang
0086b200d0
Merge "Add LE Audio allow list feature switcher in the developer option menu" am: 5bb798f518
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2387973
Change-Id: Ibb05089fd8a8245966e5ff9817e4a25833ccd442
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-06 05:54:06 +00:00
Patty Huang
5bb798f518
Merge "Add LE Audio allow list feature switcher in the developer option menu"
2023-03-06 05:14:07 +00:00
Treehugger Robot
5e84729b10
Merge "Add getSubscriptionId API" am: 7813c4a9a3
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2470383
Change-Id: I8d3584c77241e2d273bccf1d97ad592501d9afd5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-04 19:10:17 +00:00
Treehugger Robot
7813c4a9a3
Merge "Add getSubscriptionId API"
2023-03-04 18:38:35 +00:00
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
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
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
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
TreeHugger Robot
8e002f962e
Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master
2023-02-27 23:59:16 +00:00
TreeHugger Robot
3f75c80642
Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master
2023-02-27 23:59:16 +00:00
Ahaan Ugale
4ee69bf644
Update Autofill OWNERS
...
Change-Id: Ibed8c68111fe6cab9152b4e0bf7d4378e4932806
2023-02-27 21:44:20 +00:00
Bill Yi
2ff8ea95f2
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I93d99960420b9066bdd86b961f57596bc9cf5175
2023-02-26 20:55:20 -08:00
Bill Yi
10e200b5ad
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I6bb25af5ba623e2d04c42829db1220ad5f64211d
2023-02-26 20:54:04 -08:00
Bill Yi
d77ddd6ab3
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I34927005a077f306b6c8c0d1c850ed39474f33a4
2023-02-26 20:52:03 -08:00
Bill Yi
a2cbc7ea7c
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I15d98108201d7c114ffd7e30f3141af4e8fc0497
2023-02-26 20:37:26 -08:00
Bill Yi
c253ffe61a
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ic10f43fb3b99fbf09a56366b4d0e0fd864741d05
2023-02-26 20:36:20 -08:00
Bill Yi
99b4d024d1
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I48f351db5e5fb38e3ea5f197f7648c805d21c487
2023-02-26 20:34:24 -08:00
Henri Chataing
1325de7875
Merge "Nfc: Rename system properties in Nfc settings" am: fa88ad84be
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2452247
Change-Id: Ibbe1f8ed19c421b32f24675734eeb233b61e5468
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-24 23:02:43 +00:00
Henri Chataing
fa88ad84be
Merge "Nfc: Rename system properties in Nfc settings"
2023-02-24 18:57:25 +00:00
Charles Chen
159b42a247
Make Settings show in two-pane on portrait tablet
...
Test: manual - Change Display size and observe
Bug: 211562623
Change-Id: I0c26a7443882cc28edb5500f8d135c5f00dee515
Merged-In: I0c26a7443882cc28edb5500f8d135c5f00dee515
2023-02-23 08:38:52 +00:00
Anvesh Renikindi
3b08c0d9db
Merge "Enable the android.window.PROPERTY_ACTIVITY_EMBEDDING_SPLITS_ENABLED property" am: 60763d6941
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2442919
Change-Id: Iff9e2012e64c7776ccfeba98b69afca280ef13b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-23 07:27:18 +00:00
Anvesh Renikindi
928a3c22a6
[automerger skipped] Merge changes from topic "androidx_ae" am: a54ecedde3 -s ours
...
am skip reason: Merged-In If48e7338ee560d995cb8bff7b5348ab36c457836 with SHA-1 da7f685695 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2442501
Change-Id: I57bf736b9fdc9cf9100139a65c0df5d5fd88f7d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-23 07:27:13 +00:00
Jiaming Liu
47c2b78f94
[automerger skipped] Fix build for jetpack update am: b9f82bed98 -s ours
...
am skip reason: Merged-In If48e7338ee560d995cb8bff7b5348ab36c457836 with SHA-1 da7f685695 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2442501
Change-Id: I6ab1de1556098dc77963331f2f0c2dc14c7aef7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-23 07:27:11 +00:00
William Escande
57f3e9428f
Merge "Snoop Logger: fix descriptions" am: 5fd265405c
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2446822
Change-Id: I824b93316a8ee98b1358eadaf3c498f459f59a05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-23 07:21:57 +00:00
Anvesh Renikindi
60763d6941
Merge "Enable the android.window.PROPERTY_ACTIVITY_EMBEDDING_SPLITS_ENABLED property"
2023-02-23 06:22:15 +00:00
Anvesh Renikindi
a54ecedde3
Merge changes from topic "androidx_ae"
...
* changes:
Fix build for jetpack update
Update ActivityEmbedding usage.
2023-02-23 06:22:15 +00:00
William Escande
5fd265405c
Merge "Snoop Logger: fix descriptions"
2023-02-23 05:58:19 +00:00
Henri Chataing
b2e4e3c85f
Nfc: Rename system properties in Nfc settings
...
The nfc properties are now added to system/libsysprop and
were renamed at the same time for homogenity.
Bug: 268219397
Test: m Settings
Change-Id: I496e128b9db225aac583a1e0b91687f78a268b63
(cherry picked from commit 94e898a02b )
2023-02-23 01:48:42 +00:00
Henri Chataing
4886f28aba
Merge changes from topic "nfc_logging_control" am: 4de9ff1a8f
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2332205
Change-Id: I082c6fda1b1420dd49a2507ea87e8262b341be8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-22 18:31:00 +00:00
Jack Yu
e1dfe3d417
Show reboot dialog when users disable developer options am: d91e7a0565
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2332204
Change-Id: If1a8b237f58bcbb1c07a27b054be09a7530922f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-22 18:30:54 +00:00
Jack Yu
0797feaf7b
Add a new NFC developer setting option for NFC vendor verbose log am: 8f1794043c
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2332203
Change-Id: Ic9c47d49121184737369e041048a678dda53bf52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-22 18:30:50 +00:00
Jack Yu
81f481fac4
Add a new NFC developer setting option for NFCSNOOP am: a2f8944942
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2332202
Change-Id: Ic96878e632ec919f2486263a5cb479486b9d4c54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-22 18:30:37 +00:00
Treehugger Robot
f9d1535640
Merge "Change API name" am: a0642974a4
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2445642
Change-Id: I3a96da519c41151b57e7580b0816101590322b1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-22 18:21:01 +00:00
Henri Chataing
4de9ff1a8f
Merge changes from topic "nfc_logging_control"
...
* changes:
Add test cases for NfcSnoopLog and NfcVerboseVendorLog
Show reboot dialog when users disable developer options
Add a new NFC developer setting option for NFC vendor verbose log
Add a new NFC developer setting option for NFCSNOOP
2023-02-22 17:12:46 +00:00
Treehugger Robot
a0642974a4
Merge "Change API name"
2023-02-22 16:59:10 +00:00