Jacky Wang
e4761149f3
Add cancel button to Erase all data (factory reset)
...
Bug: 300634367
Test: unit test & manual test
Change-Id: I860955291b27ea1f7c748ac746b91153224eacb7
2023-11-10 13:32:00 +08:00
Charlotte Lu
0c5ab9a633
Add System update for Software Update.
...
Fix: 309916180
Test: Unit Test
Change-Id: I19eff364d9bb2d447f3580916393b5f8a34e0bd2
2023-11-10 13:13:08 +08:00
Chaohui Wang
0739b5edd1
Use MobileDataEnabledFlow in BillingCyclePreference
...
To easily collect the mobile data enabled setting changes.
Bug: 308903704
Test: manual - on Mobile Settings
Test: unit test
Change-Id: Ic449ce14fad38513b1e13facc6a192d30318c7b0
2023-11-10 10:33:46 +08:00
Jason Chiu
f18920bc5e
Disable the large screen optimization system property by default
...
When the property is true, Settings will invoke SplitController's APIs
to check if split support is available. However on a regular phone, it's
uncessary to take time to execute the APIs, which impacts the app
startup time.
Setting the property false by default can help skip the API invocation
when the property is not set. Developers can customize it in the build
file for large screen devices.
Test: build
Bug: 297794010
Change-Id: I91822d4b6afd49cd08fc546fbe5f231b2debc0f2
2023-11-10 01:19:10 +00:00
Chaohui Wang
c292adaf6b
Merge "Avoid unnecessary Html.fromHtml()" into main
2023-11-10 01:10:15 +00:00
Bill Yi
913dde2150
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Id459e11b40f4e38754131c386adce24711f3ca4e
2023-11-09 16:06:54 -08:00
Bill Yi
77895d0f02
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I736e271088cfb5d306b601286e89e9e8f2a7266c
2023-11-09 16:04:59 -08:00
Bill Yi
30e017d761
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ifff3826adfa9979c5299654762f673409ee9fcc1
2023-11-09 16:01:23 -08:00
Joshua Mccloskey
4c43b094d9
Merge "Adding back screenshot test to Settings." into main
2023-11-09 23:27:56 +00:00
Hao Dong
9cade2cbc0
Merge "Add fingerprint name to delete button content description." into main
2023-11-09 19:45:10 +00:00
Roy Luo
983268a242
Merge "Update incompatible charger checking rule" into main
2023-11-09 19:09:38 +00:00
Hao Dong
bd2eeff824
Merge "Fix lock screen notification string." into main
2023-11-09 17:15:13 +00:00
Hao Dong
f2d2de494d
Add fingerprint name to delete button content description.
...
Test: atest FingerprintPreferenceTest
Bug: 308671557
Change-Id: I5a7d402835124a50fd1268745eca1e28c865dc18
2023-11-09 17:14:42 +00:00
Tetiana Meronyk
80ae4b3c41
Disable multiuser toggle om COPE device and add explanation dialog
...
Bug: 304359233
Test: set up device in COPE mode and check toggle in Settings -> System -> Multiple Users
Change-Id: I0edd58651f94c9f9a51349025a29e33a1e1a9c14
2023-11-09 14:46:55 +00:00
Chaohui Wang
d8b21d7846
Avoid unnecessary Html.fromHtml()
...
Check if string contains html tag, before call Html.fromHtml()
Fix: 308681068
Test: atest SubscriptionsPreferenceControllerTest
Test: atest ProviderModelSliceHelperTest NetworkProviderWorkerTest
Test: manual - on Internet page
Change-Id: Id914689f2861a8c997d18afd03ecfdf47b91c631
2023-11-09 11:10:43 +00:00
Chaohui Wang
62e64c592e
Merge "Let SpaBridgeActivity support ActivityEmbedding" into main
2023-11-09 09:39:36 +00:00
Manish Singh
cb33938d90
Merge "Deep copy the existing Arguments" into main
2023-11-09 09:20:03 +00:00
Joseph Vincent
164e2e4ff7
Merge "Start All Apps on successful PrivateSpace setup completion" into main
2023-11-09 09:15:30 +00:00
Treehugger Robot
34bca0fc59
Merge "[Panlingual] Only set description for STS and TB in remove mode" into main
2023-11-09 05:49:11 +00:00
Treehugger Robot
96718215a2
Merge "Refine FaceEnrollEducation UI" into main
2023-11-09 05:01:47 +00:00
Quang Luong
9d6cff4665
Merge "Show wifi list progress bar when scanning" into main
2023-11-09 04:51:21 +00:00
Zoey Chen
192d379ace
[Panlingual] Only set description for STS and TB in remove mode
...
Bug: 301715723
Test: manual
Change-Id: I09403830cad362b4f839645f645cf620e33047fa
2023-11-09 04:33:31 +00:00
Valentin Iftime
c48a9bc9e1
[automerger skipped] Validate ringtone URIs before setting am: 7ba175eaeb
am: 236f1a0f17
am: 623d966fac
am: a4a9b9f0e7
am: fa932686c5
am: 179f53c651
am: b36b1dab96
am: ef71596281
-s ours am: abab7c6611
-s ours am: 4a10216008
-s ours am: a909f5627e
-s ours am: 96bae53d7c
-s ours
...
am skip reason: Merged-In Ib266b285a3a1c6c5265ae2321159e61e08e349f6 with SHA-1 1876c44991
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24956689
Change-Id: Icd538ffec3184bca827bcb223f6f9c5ef5a4766f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-09 03:24:25 +00:00
Valentin Iftime
855db08eb2
[automerger skipped] Validate ringtone URIs before setting am: 7ba175eaeb
am: 236f1a0f17
am: 623d966fac
am: a4a9b9f0e7
am: fa932686c5
am: 179f53c651
am: 676debfb2b
-s ours am: 0f9f4aa4c7
-s ours am: 3b7f364020
-s ours am: 54ce00ac77
-s ours am: 313237941d
-s ours
...
am skip reason: Merged-In Ib266b285a3a1c6c5265ae2321159e61e08e349f6 with SHA-1 1876c44991
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24956689
Change-Id: Ibe029d249dfc9716cb05104ebb1de5f6df3c8f8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-09 03:24:11 +00:00
Valentin Iftime
ea56d0d969
[automerger skipped] Validate ringtone URIs before setting am: 7ba175eaeb
am: 236f1a0f17
am: 623d966fac
am: a4a9b9f0e7
am: fa932686c5
am: 179f53c651
am: b36b1dab96
am: ef71596281
-s ours am: abab7c6611
-s ours am: 28eebde96e
-s ours am: ab9bb506c5
-s ours
...
am skip reason: Merged-In Ib266b285a3a1c6c5265ae2321159e61e08e349f6 with SHA-1 1876c44991
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24956689
Change-Id: Ic24175cfa5c266ba2f077b38eb02ac5ab6c0e93e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-09 03:20:59 +00:00
Valentin Iftime
4054c7d02d
[automerger skipped] Validate ringtone URIs before setting am: 7ba175eaeb
am: 236f1a0f17
am: 623d966fac
am: a4a9b9f0e7
am: fa932686c5
am: 179f53c651
am: 676debfb2b
-s ours am: 0f9f4aa4c7
-s ours am: 6792140979
-s ours am: 64b132c279
-s ours
...
am skip reason: Merged-In Ib266b285a3a1c6c5265ae2321159e61e08e349f6 with SHA-1 1876c44991
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24956689
Change-Id: I68f6cc49803b822122e0607d852d1241a047f689
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-09 03:17:08 +00:00
Valentin Iftime
96bae53d7c
[automerger skipped] Validate ringtone URIs before setting am: 7ba175eaeb
am: 236f1a0f17
am: 623d966fac
am: a4a9b9f0e7
am: fa932686c5
am: 179f53c651
am: b36b1dab96
am: ef71596281
-s ours am: abab7c6611
-s ours am: 4a10216008
-s ours am: a909f5627e
-s ours
...
am skip reason: Merged-In Ib266b285a3a1c6c5265ae2321159e61e08e349f6 with SHA-1 1876c44991
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24956689
Change-Id: I937bba8d3141a6f5d5d2879be1e28f1704e6f4ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-09 03:15:14 +00:00
Valentin Iftime
313237941d
[automerger skipped] Validate ringtone URIs before setting am: 7ba175eaeb
am: 236f1a0f17
am: 623d966fac
am: a4a9b9f0e7
am: fa932686c5
am: 179f53c651
am: 676debfb2b
-s ours am: 0f9f4aa4c7
-s ours am: 3b7f364020
-s ours am: 54ce00ac77
-s ours
...
am skip reason: Merged-In Ib266b285a3a1c6c5265ae2321159e61e08e349f6 with SHA-1 1876c44991
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24956689
Change-Id: If2a1d191cf866d418f4a2e3681a516e39fd48079
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-09 03:15:02 +00:00
Valentin Iftime
fec1996c5a
[automerger skipped] Validate ringtone URIs before setting am: 7ba175eaeb
am: 236f1a0f17
am: 623d966fac
am: a4a9b9f0e7
am: fa932686c5
am: 179f53c651
am: b36b1dab96
am: ef71596281
-s ours am: abab7c6611
-s ours am: b8341d426c
-s ours
...
am skip reason: Merged-In Ib266b285a3a1c6c5265ae2321159e61e08e349f6 with SHA-1 1876c44991
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24956689
Change-Id: I734cb8399f5ec2db27f2338b0ce39a27935840be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-09 02:39:49 +00:00
Valentin Iftime
ab9bb506c5
[automerger skipped] Validate ringtone URIs before setting am: 7ba175eaeb
am: 236f1a0f17
am: 623d966fac
am: a4a9b9f0e7
am: fa932686c5
am: 179f53c651
am: b36b1dab96
am: ef71596281
-s ours am: abab7c6611
-s ours am: 28eebde96e
-s ours
...
am skip reason: Merged-In Ib266b285a3a1c6c5265ae2321159e61e08e349f6 with SHA-1 1876c44991
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24956689
Change-Id: I7e8981c8d2e86d48974b0dba9bc485017117a9bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-09 02:39:43 +00:00
Valentin Iftime
7c3c764c82
[automerger skipped] Validate ringtone URIs before setting am: 7ba175eaeb
am: 236f1a0f17
am: 623d966fac
am: a4a9b9f0e7
am: fa932686c5
am: 179f53c651
am: 676debfb2b
-s ours am: 0f9f4aa4c7
-s ours am: 9d266d7a40
-s ours
...
am skip reason: Merged-In Ib266b285a3a1c6c5265ae2321159e61e08e349f6 with SHA-1 1876c44991
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24956689
Change-Id: I25f1119bd4671d0ecc97b4696a2d7731751d7b7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-09 02:39:20 +00:00
Valentin Iftime
64b132c279
[automerger skipped] Validate ringtone URIs before setting am: 7ba175eaeb
am: 236f1a0f17
am: 623d966fac
am: a4a9b9f0e7
am: fa932686c5
am: 179f53c651
am: 676debfb2b
-s ours am: 0f9f4aa4c7
-s ours am: 6792140979
-s ours
...
am skip reason: Merged-In Ib266b285a3a1c6c5265ae2321159e61e08e349f6 with SHA-1 1876c44991
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24956689
Change-Id: I28e64b96cc1533a9a99b70d042c8c896db15177c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-09 02:36:24 +00:00
Valentin Iftime
a909f5627e
[automerger skipped] Validate ringtone URIs before setting am: 7ba175eaeb
am: 236f1a0f17
am: 623d966fac
am: a4a9b9f0e7
am: fa932686c5
am: 179f53c651
am: b36b1dab96
am: ef71596281
-s ours am: abab7c6611
-s ours am: 4a10216008
-s ours
...
am skip reason: Merged-In Ib266b285a3a1c6c5265ae2321159e61e08e349f6 with SHA-1 1876c44991
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24956689
Change-Id: I7b77ec4017c879007eb3704a0757bf5eeb6d068e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-09 02:32:46 +00:00
Valentin Iftime
54ce00ac77
[automerger skipped] Validate ringtone URIs before setting am: 7ba175eaeb
am: 236f1a0f17
am: 623d966fac
am: a4a9b9f0e7
am: fa932686c5
am: 179f53c651
am: 676debfb2b
-s ours am: 0f9f4aa4c7
-s ours am: 3b7f364020
-s ours
...
am skip reason: Merged-In Ib266b285a3a1c6c5265ae2321159e61e08e349f6 with SHA-1 1876c44991
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24956689
Change-Id: Ie0b6a85be3bac050ef54120553c1ff110d8b2058
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-09 02:32:26 +00:00
Valentin Iftime
4a10216008
[automerger skipped] Validate ringtone URIs before setting am: 7ba175eaeb
am: 236f1a0f17
am: 623d966fac
am: a4a9b9f0e7
am: fa932686c5
am: 179f53c651
am: b36b1dab96
am: ef71596281
-s ours am: abab7c6611
-s ours
...
am skip reason: Merged-In Ib266b285a3a1c6c5265ae2321159e61e08e349f6 with SHA-1 1876c44991
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24956689
Change-Id: I40859abfad0ebff485c3780b02c73f88b0c6e3fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-09 01:56:23 +00:00
Valentin Iftime
3b7f364020
[automerger skipped] Validate ringtone URIs before setting am: 7ba175eaeb
am: 236f1a0f17
am: 623d966fac
am: a4a9b9f0e7
am: fa932686c5
am: 179f53c651
am: 676debfb2b
-s ours am: 0f9f4aa4c7
-s ours
...
am skip reason: Merged-In Ib266b285a3a1c6c5265ae2321159e61e08e349f6 with SHA-1 1876c44991
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24956689
Change-Id: Iec7962e031ddd6181abd60cb53e5d15da5a85e01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-09 01:55:59 +00:00
Valentin Iftime
b8341d426c
[automerger skipped] Validate ringtone URIs before setting am: 7ba175eaeb
am: 236f1a0f17
am: 623d966fac
am: a4a9b9f0e7
am: fa932686c5
am: 179f53c651
am: b36b1dab96
am: ef71596281
-s ours am: abab7c6611
-s ours
...
am skip reason: Merged-In Ib266b285a3a1c6c5265ae2321159e61e08e349f6 with SHA-1 1876c44991
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24956689
Change-Id: Ib988472bf29856c705bfaf17f25d3cbee9a1d978
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-09 01:53:57 +00:00
Valentin Iftime
9d266d7a40
[automerger skipped] Validate ringtone URIs before setting am: 7ba175eaeb
am: 236f1a0f17
am: 623d966fac
am: a4a9b9f0e7
am: fa932686c5
am: 179f53c651
am: 676debfb2b
-s ours am: 0f9f4aa4c7
-s ours
...
am skip reason: Merged-In Ib266b285a3a1c6c5265ae2321159e61e08e349f6 with SHA-1 1876c44991
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24956689
Change-Id: I38419970da636ee747e072d92705482a2f030763
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-09 01:53:39 +00:00
Valentin Iftime
28eebde96e
[automerger skipped] Validate ringtone URIs before setting am: 7ba175eaeb
am: 236f1a0f17
am: 623d966fac
am: a4a9b9f0e7
am: fa932686c5
am: 179f53c651
am: b36b1dab96
am: ef71596281
-s ours am: abab7c6611
-s ours
...
am skip reason: Merged-In Ib266b285a3a1c6c5265ae2321159e61e08e349f6 with SHA-1 1876c44991
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24956689
Change-Id: I041467303a0efef55232f01e02a90a5390d20c2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-09 01:52:35 +00:00
Valentin Iftime
6792140979
[automerger skipped] Validate ringtone URIs before setting am: 7ba175eaeb
am: 236f1a0f17
am: 623d966fac
am: a4a9b9f0e7
am: fa932686c5
am: 179f53c651
am: 676debfb2b
-s ours am: 0f9f4aa4c7
-s ours
...
am skip reason: Merged-In Ib266b285a3a1c6c5265ae2321159e61e08e349f6 with SHA-1 1876c44991
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24956689
Change-Id: I016978690c51675e3b6abbaa5446db5ece093778
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-09 01:52:24 +00:00
Valentin Iftime
abab7c6611
[automerger skipped] Validate ringtone URIs before setting am: 7ba175eaeb
am: 236f1a0f17
am: 623d966fac
am: a4a9b9f0e7
am: fa932686c5
am: 179f53c651
am: b36b1dab96
am: ef71596281
-s ours
...
am skip reason: Merged-In Ib266b285a3a1c6c5265ae2321159e61e08e349f6 with SHA-1 1876c44991
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24956689
Change-Id: Ie8a878b641e67f39e0f2cb418bedbd0a04b477a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-09 01:50:11 +00:00
Valentin Iftime
0f9f4aa4c7
[automerger skipped] Validate ringtone URIs before setting am: 7ba175eaeb
am: 236f1a0f17
am: 623d966fac
am: a4a9b9f0e7
am: fa932686c5
am: 179f53c651
am: 676debfb2b
-s ours
...
am skip reason: Merged-In Ib266b285a3a1c6c5265ae2321159e61e08e349f6 with SHA-1 1876c44991
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24956689
Change-Id: I7e62bc8bfcbf3ccb2e9721972fe1ac9527e1e2c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-09 01:22:34 +00:00
Valentin Iftime
ef71596281
Validate ringtone URIs before setting am: 7ba175eaeb
am: 236f1a0f17
am: 623d966fac
am: a4a9b9f0e7
am: fa932686c5
am: 179f53c651
am: b36b1dab96
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24956689
Change-Id: Iaa3e61923eddada09aa19b61428ee60630b57cf1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-09 01:18:09 +00:00
Valentin Iftime
676debfb2b
Validate ringtone URIs before setting am: 7ba175eaeb
am: 236f1a0f17
am: 623d966fac
am: a4a9b9f0e7
am: fa932686c5
am: 179f53c651
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24956689
Change-Id: I6ebd0e328707728c0eaeb49a3e8207a6fce41578
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-09 00:34:52 +00:00
Valentin Iftime
b36b1dab96
Validate ringtone URIs before setting am: 7ba175eaeb
am: 236f1a0f17
am: 623d966fac
am: a4a9b9f0e7
am: fa932686c5
am: 179f53c651
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24956689
Change-Id: Ie1a755c491132beee40f05c27f5f25eb52a414c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-09 00:34:46 +00:00
Valentin Iftime
179f53c651
Validate ringtone URIs before setting am: 7ba175eaeb
am: 236f1a0f17
am: 623d966fac
am: a4a9b9f0e7
am: fa932686c5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24956689
Change-Id: Id029d4fd78881f7e32599f566e79b9640f3b13e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-09 00:04:54 +00:00
Valentin Iftime
fa932686c5
Validate ringtone URIs before setting am: 7ba175eaeb
am: 236f1a0f17
am: 623d966fac
am: a4a9b9f0e7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24956689
Change-Id: I2ed08af5bb3839d2a19403a6c65fd6c2c6ccce9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-08 22:49:38 +00:00
Valentin Iftime
a4a9b9f0e7
Validate ringtone URIs before setting am: 7ba175eaeb
am: 236f1a0f17
am: 623d966fac
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24956689
Change-Id: Iaa926f8a61ba0c6e4d6511750b3e1dfe83627037
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-08 21:32:36 +00:00
Treehugger Robot
bce16d7778
[automerger skipped] Merge "Validate ringtone URIs before setting" into udc-dev am: 410fe2f16e
am: 8f3d594305
am: deddbe2720
-s ours am: 122c120d45
-s ours
...
am skip reason: Merged-In Ib266b285a3a1c6c5265ae2321159e61e08e349f6 with SHA-1 1876c44991
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24969251
Change-Id: I4f0cc27c71ed1686e8b84a6e5dc85660838c1921
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-08 21:00:35 +00:00
Treehugger Robot
52d93dfb56
[automerger skipped] Merge "Validate ringtone URIs before setting" into udc-dev am: 410fe2f16e
am: e808116b30
am: 713c324cee
-s ours
...
am skip reason: Merged-In Ib266b285a3a1c6c5265ae2321159e61e08e349f6 with SHA-1 1876c44991
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24969251
Change-Id: Ibfca294a24146be8fb6ea4e833765e9e4f91a7ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-08 20:58:47 +00:00