PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
125,757 Commits 1 Branch 0 Tags
cc78024e03062d14c35b41757b768e67281a85c0
Commit Graph

125757 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
e9662fe6d7 Merge changes from topic "tc_change_23050307_55" into tm-qpr-dev-plus-aosp am: 663a43e79f am: 4e9651a024 am: 5e8bd15267 am: 7f70daf730 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22974823

Change-Id: I8cecad2c55bb040b2ffc573f30140d34749f563e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 08:04:56 +00:00
Tom Hsu
14e213bba8 Merge "[Settings] Fix NPE from updating subinfo changed." into udc-dev am: 99e03458fa am: f4f0d99add am: 964ce5a785 am: 4c96e3e3dd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22954342

Change-Id: Id35fbee6fae56a4cff89f0dfa3a32131d8b0c69e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 08:04:46 +00:00
Tom Hsu
fe739ccfbe Merge "[Settings] Fix NPE from updating subinfo changed." into udc-dev am: 99e03458fa am: f23adec53e am: 7bd9a86731 am: c34e52c633 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22954342

Change-Id: Ibd02d0fc11ec0e1e8b9ed932871636126332ba72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 08:04:36 +00:00
Tom Hsu
5610bda058 Merge "[Settings] Fix NPE from updating subinfo changed." into udc-dev am: 99e03458fa am: f23adec53e am: 692d0a45ef am: 88e72070de 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22954342

Change-Id: I8a3cbf517e77bc5fc8bef16688eba310084f73d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 08:04:27 +00:00
TreeHugger Robot
76ddf64e1b Merge "Add Tapjacking Protection for all screens extends StorageWizardBase in Settings." into udc-dev am: 7bf4c8f9f5 am: 2c750a41f4 am: 700e460908 am: 40a5a6b6ed 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23001477

Change-Id: I2ea7c2c998b0a2f28fa427a89d1db2ec6676fe7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 08:04:18 +00:00
TreeHugger Robot
f3f4e4de2b Merge "Add Tapjacking Protection for all screens extends StorageWizardBase in Settings." into udc-dev am: 7bf4c8f9f5 am: b4d3bd6859 am: 6324ac704d am: 068f4194e0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23001477

Change-Id: I74f2a1a914de185a8d2351421f432f377c185927
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 08:04:09 +00:00
Treehugger Robot
3de5f48bd2 Merge "Fix testNonIndexableKeys_existInXmlLayout" into udc-dev am: e71643efac am: 7e99eaa9bc am: f4c61c812a am: 965c66b2c7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22981573

Change-Id: I263be5b51c9e58d4345057de5215ebd71c62dc56
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 08:03:58 +00:00
SongFerng Wang
6cfb908ca5 Merge "Shows main_battery information for not untethered device" into udc-dev am: 197eb39cde am: 10ed23b3c1 am: 45512c8b0c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22901825

Change-Id: I10d8c830dd0b41b39f1d98d3379c28b537f3d8a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 07:57:24 +00:00
Chaohui Wang
396b3b45d4 Merge "Fix SettingsDumpServiceTest" into udc-dev am: 678b1d5fa4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23015997

Change-Id: I7c302932f91793a9ab80796e4e6448c99bfd39e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 07:56:51 +00:00
Treehugger Robot
74b2aac7b5 Merge changes from topic "tc_change_23050307_55" into udc-dev-plus-aosp am: 14cdc33fb7 am: 05450878ef am: 58b332455d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22974823

Change-Id: I44dca7288fdf44ce414332c1c439a523009d75ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 07:43:21 +00:00
Bill Yi
82aa89fe0f [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: dc96a91fff 2p: 98c8d85c26 am: 56b01ab110 -s ours am: cb37799525 -s ours am: 3c6cbf53d5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia72eaa65f8fcb0e19aac72c38e9ab6c0b0e3ff93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 07:42:46 +00:00
Chaohui Wang
f029f96558 Merge "Fix SettingsDumpServiceTest" into udc-dev am: 678b1d5fa4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23015997

Change-Id: I93cd903136cff94b75348c0d8a0ada523f38bca0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 07:41:27 +00:00
Hao Dong
55379a00aa Merge "Call onFaceStrengthChanged() only when authenticators registered." into udc-dev am: 1c9288fa24 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22999810

Change-Id: I7dccee436e7050ed5a97387b97b1adcb3df228d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 07:41:05 +00:00
Chaohui Wang
678b1d5fa4 Merge "Fix SettingsDumpServiceTest" into udc-dev 2023-05-04 07:39:14 +00:00
Hao Dong
56f39eeb45 Merge "Call onFaceStrengthChanged() only when authenticators registered." into udc-dev am: 1c9288fa24 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22999810

Change-Id: I477cd05789ff62ad6cba68908de99d426d227e39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 07:37:04 +00:00
SongFerng Wang
45512c8b0c Merge "Shows main_battery information for not untethered device" into udc-dev am: 197eb39cde am: 10ed23b3c1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22901825

Change-Id: I60918326977b8013c69a0d1024d97a697f5769b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 07:19:53 +00:00
Hao Dong
1c9288fa24 Merge "Call onFaceStrengthChanged() only when authenticators registered." into udc-dev 2023-05-04 07:00:40 +00:00
Hao Dong
6e8434b793 Call onFaceStrengthChanged() only when authenticators registered. 
Test: atest FaceEnrollIntroductionTest
Test: manually tested face enroll introduction page
Bug: 280384533
Change-Id: Iac9506d8430459aa399ac8efd3f41cbc6e67260d
Merged-In: Iac9506d8430459aa399ac8efd3f41cbc6e67260d
 2023-05-04 06:59:53 +00:00
Hao Dong
666d68a17b Merge "Call onFaceStrengthChanged() only when authenticators registered." 2023-05-04 06:59:44 +00:00
Hao Dong
cb00672359 Call onFaceStrengthChanged() only when authenticators registered. 
Test: atest FaceEnrollIntroductionTest
Test: manually tested face enroll introduction page
Bug: 280384533
Change-Id: Iac9506d8430459aa399ac8efd3f41cbc6e67260d
 2023-05-04 06:59:36 +00:00
ykhung
c234196bc1 Support incompatible charger state in the battery main page 
https://screenshot.googleplex.com/PrSzAtMAhsyqbsR

Bug: 271775549
Test: make test RunSettingsRoboTests
Change-Id: I0bb912eaab9c8837eaa3a9b998b3ebb5a8e6f99f
 2023-05-04 14:57:07 +08:00
SongFerng Wang
bc95a0a65a Merge "Shows main_battery information for not untethered device" into udc-dev am: 197eb39cde am: 00dde2a96b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22901825

Change-Id: I125ff41ee145f61ba9fa63e7c3246b0b7091aec1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 06:53:40 +00:00
SongFerng Wang
00dde2a96b Merge "Shows main_battery information for not untethered device" into udc-dev am: 197eb39cde 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22901825

Change-Id: Ia31a1fc427d909efd392ae5f3bac851c121a610e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 06:36:38 +00:00
Treehugger Robot
f8681f0337 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 11ba47eebb -s ours am: c537439f3a -s ours am: d8cb58c3cf -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4684ba4c55ba967aca52cac8b22178f4b32cd20d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 06:35:32 +00:00
Bill Yi
55285fddbe [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dc96a91fff -s ours am: c7e5bc37f1 -s ours am: 5e574a1301 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib1871668c989e175c3befd5c691cc025ddbb8d47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 06:35:25 +00:00
SongFerng Wang
10ed23b3c1 Merge "Shows main_battery information for not untethered device" into udc-dev am: 197eb39cde 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22901825

Change-Id: Ia7f15c8a4fd0d0cd43b093616bc04ac5dbf59e2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 06:31:45 +00:00
Chaohui Wang
e2b9d0680e Fix SettingsDumpServiceTest 
SettingsDumpService behavior changed in
Change I9d7fe2e763b9e5840ee76c5eb00bc88288e7ee41

After behavior changed, PrintWriter was wrapped in IndentingPrintWriter,
it's harder to mock the PrintWriter, so check the result directly.

Fix: 280068083
Test: RobolectricTest
Change-Id: I92a7b931c93df4cd9e9c3e47b91a9750df936f15
 2023-05-04 14:20:33 +08:00
Treehugger Robot
c6dd84129a Merge "Fix testNonIndexableKeys_existInXmlLayout" into udc-dev am: e71643efac am: 19a610e0f1 am: 39522cb473 am: ea4a714044 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22981573

Change-Id: Ib9993bb4bb129a41f333e6171987c488e02f4c4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 06:15:11 +00:00
TreeHugger Robot
6b719e25cc Merge "Add Tapjacking Protection for all screens extends StorageWizardBase in Settings." into udc-dev am: 7bf4c8f9f5 am: 2c750a41f4 am: a9ce3ae056 am: 589bc875e0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23001477

Change-Id: Ia2a8ab634f1da30f95dcd69c350352f39fcc5f9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 06:15:02 +00:00
Treehugger Robot
a1babb0e6a Merge "Fix testNonIndexableKeys_existInXmlLayout" into udc-dev am: e71643efac am: 7e99eaa9bc am: eb960845fa am: 5241ea22da 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22981573

Change-Id: I36d656f4989dff4ed622953823ddf2ebe536f945
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 06:14:53 +00:00
Lin Yuan
6b12ad9412 [automerge] Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency. 2p: 7591fff234 am: 062a9ca549 am: f86d507407 am: d8321f5df7 am: ae2dd3d513 am: 9e84690fb7 am: dac4ef66d9 am: 19eb02122b am: c0c804c9b3 am: 369582e3b6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22861203

Change-Id: Idfdfdcc4f522d90c590a1dbe75e3c97d032161ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 06:14:45 +00:00
Lin Yuan
64204246b0 [automerge] Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency. 2p: 7591fff234 am: 062a9ca549 am: f86d507407 am: d8321f5df7 am: eb3be1fa5b am: d2ddc84c14 am: ba360fb0a8 am: 96f35321cc am: 9b8a8a2595 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22861203

Change-Id: I57f918db873229e9380f38662d09b51ae45d851a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 06:14:36 +00:00
Lin Yuan
476fdcb735 [automerge] Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency. 2p: 7591fff234 am: 062a9ca549 am: f86d507407 am: d8321f5df7 am: ae2dd3d513 am: 9e84690fb7 am: 2ead04b76a am: 412befc3e1 am: a8bcae516b am: be3b740eb4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22861203

Change-Id: I4f47221693551031bd7a31d6ad6e3c88dd45d5dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 06:14:25 +00:00
Lin Yuan
274f257750 [automerge] Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency. 2p: 7591fff234 am: 062a9ca549 am: f86d507407 am: d8321f5df7 am: ae2dd3d513 am: 9e84690fb7 am: dac4ef66d9 am: b0463498fa am: 959efb5af3 am: a6fdd6b3f9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22861203

Change-Id: I043a37617232555f432fb66421e4de7f49b3ca59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 06:14:14 +00:00
Lin Yuan
a5f8364cde [automerge] Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency. 2p: 7591fff234 am: 062a9ca549 am: f86d507407 am: d8321f5df7 am: eb3be1fa5b am: d2ddc84c14 am: 29d5694857 am: 3d8e6a6caa am: 5d330487ba 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22861203

Change-Id: Ifff697f490446b9ab8dd102e2e6dd03a31a546ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 06:14:03 +00:00
Lin Yuan
ce4ebb75ec [automerge] Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency. 2p: 7591fff234 am: 062a9ca549 am: f86d507407 am: d8321f5df7 am: ae2dd3d513 am: 9e84690fb7 am: dac4ef66d9 am: 19eb02122b am: fbd437f883 am: 0c20a3de9a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22861203

Change-Id: I3c2de4ba09f0bb25b41f4398b335ed38a141760e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 06:13:54 +00:00
Lin Yuan
e70d7b12d7 [automerge] Fix: Bluetooth and Wifi scanning location MainSwitch page policy transparency. 2p: 7591fff234 am: 062a9ca549 am: f86d507407 am: d8321f5df7 am: eb3be1fa5b am: d2ddc84c14 am: ba360fb0a8 am: 451d363161 am: c5d2362731 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22861203

Change-Id: I102b248ef9a26a5f2dcc37cb4e82dbf00c884116
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 06:13:45 +00:00
Treehugger Robot
8eedd5a793 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 7b5293a704 -s ours am: a1b3c500fd -s ours am: cfaa877732 -s ours am: b42e6153f1 -s ours am: d345ba6a4d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2ceed3b6fe68a2173f6224ecf7218fa59ab9421c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 06:13:33 +00:00
Treehugger Robot
9af2cc451a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 7b5293a704 -s ours am: a1b3c500fd -s ours am: e46c4e5a87 -s ours am: d3b8f7769f -s ours am: cc7068328f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4a8969d04295c5c0553f5a647ce75c9922cb162a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 06:13:21 +00:00
Treehugger Robot
d1b9b5262a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 11ba47eebb -s ours am: b960f4535f -s ours am: f3f9381437 -s ours am: b5933a3dac -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icbc8729cef23cd4ade07dd7762edc8eab73ef4be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 05:56:26 +00:00
SongFerng Wang
197eb39cde Merge "Shows main_battery information for not untethered device" into udc-dev 2023-05-04 05:47:59 +00:00
Treehugger Robot
3938ef6ebe [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 11ba47eebb -s ours am: c537439f3a -s ours am: 17dbdabce3 -s ours am: 1a01a70537 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I869f896cd55fe6b9a896e166e24fe171ba8ae667
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 05:42:32 +00:00
Bill Yi
80859fe3dd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dc96a91fff -s ours am: c7e5bc37f1 -s ours am: bef044e513 -s ours am: 2e1b23c580 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1b0bff39763e6a3ecfd571332b11c25ba32ee034
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 05:42:17 +00:00
Treehugger Robot
7f70daf730 Merge changes from topic "tc_change_23050307_55" into tm-qpr-dev-plus-aosp am: 663a43e79f am: 4e9651a024 am: 5e8bd15267 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22974823

Change-Id: Ideb77f3c0b269b5100e75e6b501c0695746bcd63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 05:40:59 +00:00
Tom Hsu
4c96e3e3dd Merge "[Settings] Fix NPE from updating subinfo changed." into udc-dev am: 99e03458fa am: f4f0d99add am: 964ce5a785 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22954342

Change-Id: I7a58eecef0a804c092663b1521c0ace82ca4dd9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 05:40:49 +00:00
Tom Hsu
c34e52c633 Merge "[Settings] Fix NPE from updating subinfo changed." into udc-dev am: 99e03458fa am: f23adec53e am: 7bd9a86731 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22954342

Change-Id: I04ba2a0151af430b9595cfe4bc2b0a964b473266
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 05:40:40 +00:00
Tom Hsu
88e72070de Merge "[Settings] Fix NPE from updating subinfo changed." into udc-dev am: 99e03458fa am: f23adec53e am: 692d0a45ef 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22954342

Change-Id: I3c598aae73edbc8f4cdf9b7ff5d5ff309dfe794f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 05:32:12 +00:00
Treehugger Robot
b5933a3dac [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 11ba47eebb -s ours am: b960f4535f -s ours am: f3f9381437 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I378ffec60a2af2dd1930a002e62b4bf8099072bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 05:31:51 +00:00
Treehugger Robot
1a01a70537 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 11ba47eebb -s ours am: c537439f3a -s ours am: 17dbdabce3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I08b37a2c4e1404b35cc34dd2a5f719a97824a331
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 05:31:04 +00:00
Bill Yi
2e1b23c580 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dc96a91fff -s ours am: c7e5bc37f1 -s ours am: bef044e513 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I186a07bab8646a1fb247490283db3dbfadc045be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-04 05:31:00 +00:00