PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
123,426 Commits 1 Branch 0 Tags
ba7dfd53b83bf52da8b0bc7ee289e1e9a1c90d0f
Commit Graph

123426 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Biggers
ba7dfd53b8 [automerger skipped] Merge "RESTRICT AUTOMERGE: Catch exceptions from setLockCredential()" into tm-qpr-dev am: 94ffd66957 -s ours am: 7bed9704c9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If65b4e9e0d640a4f9dc1b540b840a9435aed166a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 01:59:13 +00:00
Eric Biggers
7e5d519cf4 [automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 423c0e0d47 -s ours am: 8360c2e940 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I180e9f3771dd5f9e32876c2ac6568d8a4eaf50dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 01:59:10 +00:00
Eric Biggers
7bed9704c9 [automerger skipped] Merge "RESTRICT AUTOMERGE: Catch exceptions from setLockCredential()" into tm-qpr-dev am: 94ffd66957 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7f6f74c706a397cfbad6685c152c015906a63b74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 01:31:46 +00:00
Eric Biggers
8360c2e940 [automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 423c0e0d47 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I41c8afe636e06554df78cc253b93e6dfea887f2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-08 01:31:36 +00:00
Eric Biggers
94ffd66957 Merge "RESTRICT AUTOMERGE: Catch exceptions from setLockCredential()" into tm-qpr-dev 2023-08-08 00:51:38 +00:00
Bill Yi
dc3c4b2094 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod 2023-08-06 17:58:17 +00:00
Bill Yi
3cb66d7d11 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d56eb42615 -s ours am: 45eb3572ff -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7f90881b22795c74f90cb278863d30dca53f6156
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-05 07:57:34 +00:00
Bill Yi
45eb3572ff [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d56eb42615 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2bf6035ffd109a82ecc2cb743b57bf020cdb3053
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-05 07:11:15 +00:00
Bill Yi
bdf848f6aa [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d447dcfcea -s ours am: f3ddb4a624 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If0ed2cf9aee487bcec814bc39c50a5c1aab5f005
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-04 19:58:55 +00:00
Bill Yi
f3ddb4a624 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d447dcfcea -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If487bb3281585de22121dd4240bb566be4584ffc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-04 19:15:48 +00:00
Bill Yi
d56eb42615 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I88df717cf88e78ce5cbe17b53f50dbccf03aecf2
 2023-08-03 20:29:24 -07:00
Bill Yi
d447dcfcea Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I36696445b89cb0d0dd94aa210d559a6c60a79d82
 2023-08-03 20:21:12 -07:00
Bill Yi
8a43b3166b Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I829a57291b2d2ca97f27909a348ab19bec2dbaaa
 2023-08-03 17:44:47 -07:00
Bill Yi
5c84922740 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c52abcd3fa -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2baa90b1e2e99513f1ed5254a3f1025ef79bc41c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-03 19:45:08 +00:00
Bill Yi
c52abcd3fa Import translations. DO NOT MERGE ANYWHERE 
BUG:291684185

Auto-generated-cl: translation import
Change-Id: Ia444bb69cc499bd8d4a5ffc8c72babdda213c385
 2023-08-03 11:04:31 -07:00
Eric Biggers
423c0e0d47 RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() 
When LockPatternUtils#setLockCredential() fails, it can either return
false or throw an exception.  Catch the exception and treat it the same
way as a false return value, to prevent crashing com.android.settings.

Bug: 253043065
Test: Tried setting lockscreen credential while in secure FRP mode using
      smartlock setup activity launched by intent via adb.  Verified
      that com.android.settings no longer crashes due to the exception
      from LockPatternUtils#setLockCredential().
Change-Id: I48b9119c19fb6378b1f88d36433ee4f4c8501d76
(cherry picked from commit 05f1eff1c9)
(moved change into ChooseLockPassword.java and ChooseLockPattern.java,
 which are merged into SaveAndFinishWorker.java on udc-qpr-dev and main)
Merged-In: I48b9119c19fb6378b1f88d36433ee4f4c8501d76
 2023-08-02 23:42:52 +00:00
Bill Yi
8503cc7966 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod 2023-07-31 21:48:37 +00:00
Treehugger Robot
010f0250aa [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 41d64c9bef -s ours am: 8d6051a0c5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9acc957868261a5fbf736c1bf3df63bbeacb6051
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-28 18:46:06 +00:00
Bill Yi
9eb76e5e97 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9bba3d174b -s ours am: 869a35f0cc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I07a41d28327a45165a1d364dd0c86024c7d4eb08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-28 18:45:58 +00:00
Treehugger Robot
9b77d094b5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: cbe877892f -s ours am: 90e7cfacc6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I21cebed37b46f4b398590a2dfb0db3b21be45afc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-28 18:26:27 +00:00
Bill Yi
231295573b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ebacced122 -s ours am: 07b8d85c47 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I26c51fefc5674622b57042b92ff97de9adc5d2fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-28 18:26:23 +00:00
Treehugger Robot
8d6051a0c5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 41d64c9bef -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7edd6c919617c6e2b03aae06b409a84d36d064f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-28 18:07:22 +00:00
Bill Yi
869a35f0cc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9bba3d174b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If67577e5d9f33fc84225bd53857e2e100c5f3221
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-28 18:07:12 +00:00
Treehugger Robot
90e7cfacc6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: cbe877892f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icb7aed3a43239115c87473a745ca0d60723772e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-28 18:05:44 +00:00
Bill Yi
07b8d85c47 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ebacced122 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id22c3fde7605bf488e141853e41586b1b3592720
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-28 18:05:31 +00:00
Treehugger Robot
41d64c9bef Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2023-07-28 00:54:10 +00:00
Treehugger Robot
cbe877892f Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2023-07-28 00:53:34 +00:00
Treehugger Robot
7ff127181c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: bdb73ef28e -s ours am: 84c2322af1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idae707a4a76cb2cf4da7afe8fe8bf1c5b9e04fad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-27 22:38:44 +00:00
Bill Yi
cc920c7dc0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6ff8c62f42 -s ours am: fe5316f848 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I12344d38d48baeabdbf19d0c2d7298ad2bef41d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-27 22:38:35 +00:00
Treehugger Robot
84c2322af1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: bdb73ef28e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2c986fa5e7ab0fdbacd0a0336b9245641e7648e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-27 21:49:38 +00:00
Bill Yi
fe5316f848 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6ff8c62f42 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2b8424204dae662cd985ca5efdef8224b774675e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-27 21:49:26 +00:00
Treehugger Robot
bdb73ef28e Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2023-07-27 21:07:50 +00:00
Treehugger Robot
510066324e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 76afc5c3bc -s ours am: 03e1e0f234 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ieef4b52d2ba9e649c14f13954d0352ad80f9d0b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-27 19:59:38 +00:00
Bill Yi
bd2d9cddfc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 35f9f86922 -s ours am: 04da45170f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I88e5bc5b2777d5c35e4424615d42a2865245bcb1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-27 19:59:33 +00:00
Bill Yi
936e3a26c0 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod 2023-07-27 19:22:36 +00:00
Treehugger Robot
03e1e0f234 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 76afc5c3bc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I51b4fe2aaa7c0c19335af09132879c2b1f6b42a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-27 19:05:23 +00:00
Bill Yi
04da45170f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 35f9f86922 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iacfb8343818c2f54fcc58936d7df5abb5af29615
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-27 19:05:13 +00:00
Treehugger Robot
76afc5c3bc Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2023-07-27 18:23:20 +00:00
Weng Su
e7aa31fe1f [automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: 5c2d727b8f am: f869bfa55f -s ours am: 72784b097a -s ours am: d75d8aef39 -s ours am: fcd82fa052 -s ours am: 22e2de50eb -s ours am: febb6c3eca -s ours am: a01bbe4acb -s ours am: 37263f087d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia9c0e1dcb4c5a846e8eee63d0d6de8c1e30568ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-27 06:34:38 +00:00
Weng Su
b6b2be1491 [automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: 5c2d727b8f am: f869bfa55f -s ours am: 72784b097a -s ours am: d75d8aef39 -s ours am: fcd82fa052 -s ours am: 22e2de50eb -s ours am: 8a69b9830f -s ours am: 854aa4dfa3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4e2c72226c382ab374c5df34e3561412cf3c4f56
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-27 06:34:20 +00:00
Weng Su
37263f087d [automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: 5c2d727b8f am: f869bfa55f -s ours am: 72784b097a -s ours am: d75d8aef39 -s ours am: fcd82fa052 -s ours am: 22e2de50eb -s ours am: febb6c3eca -s ours am: a01bbe4acb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I89c1a5df31111db99192aebe07bd3250fb494704
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-27 06:30:19 +00:00
Weng Su
854aa4dfa3 [automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: 5c2d727b8f am: f869bfa55f -s ours am: 72784b097a -s ours am: d75d8aef39 -s ours am: fcd82fa052 -s ours am: 22e2de50eb -s ours am: 8a69b9830f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I13f9f338dd48c83ee1c64f5391fd762b2e95b483
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-27 05:51:52 +00:00
Weng Su
a01bbe4acb [automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: 5c2d727b8f am: f869bfa55f -s ours am: 72784b097a -s ours am: d75d8aef39 -s ours am: fcd82fa052 -s ours am: 22e2de50eb -s ours am: febb6c3eca -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I75c8012a87166a46fe58bacff3123c103fae2e7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-27 05:46:37 +00:00
Weng Su
febb6c3eca [automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: 5c2d727b8f am: f869bfa55f -s ours am: 72784b097a -s ours am: d75d8aef39 -s ours am: fcd82fa052 -s ours am: 22e2de50eb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic4175d8e3b330edecddc5eec6b3590b245456798
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-27 04:43:09 +00:00
Weng Su
8a69b9830f [automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: 5c2d727b8f am: f869bfa55f -s ours am: 72784b097a -s ours am: d75d8aef39 -s ours am: fcd82fa052 -s ours am: 22e2de50eb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ied784396c2408e1b5b2692c4b3adf359ec54ce9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-27 04:40:56 +00:00
Weng Su
22e2de50eb [automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: 5c2d727b8f am: f869bfa55f -s ours am: 72784b097a -s ours am: d75d8aef39 -s ours am: fcd82fa052 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5e3f24bdd22f7f0e59e7baaa3d4fe4835cf6386e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-27 03:55:45 +00:00
Weng Su
fcd82fa052 [automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: 5c2d727b8f am: f869bfa55f -s ours am: 72784b097a -s ours am: d75d8aef39 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If0e63c0c18ab4f14b3b031ecf8a45e811aa2bb11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-27 03:13:58 +00:00
Weng Su
d75d8aef39 [automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: 5c2d727b8f am: f869bfa55f -s ours am: 72784b097a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3523d29eee6901db206e74f2e65affa680451f14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-27 02:26:42 +00:00
Weng Su
72784b097a [automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: 5c2d727b8f am: f869bfa55f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I65ed5a2db7bc34112ddcd8f819b7ab995e571c30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-27 00:56:13 +00:00
Weng Su
f869bfa55f [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: 5c2d727b8f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24025008

Change-Id: Ia2f6bfa237d211be6b884c56d831c84d0c437210
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-27 00:13:52 +00:00