t
d1f90f717a
Disable factory reset in DSU mode am: 4296cc1977
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30066430
Change-Id: I3030c76274a9a9f48b784d23a5af5fc73deef870
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-10-31 15:46:28 +00:00
t
4296cc1977
Disable factory reset in DSU mode
...
Bug: 302317901
Bug: 316578327
Test: build
Merged-In: I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe
Change-Id: I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe
2024-10-25 06:33:59 +00:00
Guojing Yuan
268575fb3a
[CDM][NLS] Check if the NLS service has an intent-filter am: 59cdc3e20c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29711247
Change-Id: I26b92140443f28084cb514da60e1febcf599dfc8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-10-15 18:25:14 +00:00
Guojing Yuan
59cdc3e20c
[CDM][NLS] Check if the NLS service has an intent-filter
...
Bug: 363248394
Test: CTS
Flag: EXEMPT bugfix
Change-Id: Ib79c219cde8d73a218ceb7911f4552d43e384d8e
Merged-In: Ib79c219cde8d73a218ceb7911f4552d43e384d8e
(cherry picked from commit 7ae59a42eb
)
2024-10-15 17:14:05 +00:00
Chris Antol
f927599ebb
[automerger skipped] Merge "RESTRICT AUTOMERGE Checks cross user permission before handling intent" into sc-dev am: fabc3ec631
-s ours
...
am skip reason: Merged-In I3444e55b22b7487f96b0e3e9deb3f844c4c4723a with SHA-1 0c72cfad1e
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29010759
Change-Id: Id7dfc9f2ac8882a6422f977f1a9886ce289ce0c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-09-05 03:19:21 +00:00
Fan Wu
14ef364e16
[automerger skipped] RESTRICT AUTOMERGE Checks cross user permission before handling intent am: 7d2552bf93
-s ours
...
am skip reason: Merged-In I3444e55b22b7487f96b0e3e9deb3f844c4c4723a with SHA-1 0c72cfad1e
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29010759
Change-Id: Ic016c44ef51b744cec67df108327540a60293e30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-09-05 03:19:17 +00:00
Chris Antol
fabc3ec631
Merge "RESTRICT AUTOMERGE Checks cross user permission before handling intent" into sc-dev
2024-09-05 03:07:30 +00:00
Chris Antol
ac3b33c26d
Merge "RESTRICT AUTOMERGE Checks cross user permission before handling intent" into sc-qpr1-dev
2024-09-05 03:07:30 +00:00
Treehugger Robot
72e4718e69
Merge "startActivityForResult with new Intent" into sc-dev am: 5e94bcbb1d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28761671
Change-Id: Ife0d68f9156a3ff6ffd1f08b2d58bf9741a734f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-09-04 16:29:04 +00:00
Treehugger Robot
5e94bcbb1d
Merge "startActivityForResult with new Intent" into sc-dev
2024-09-04 16:26:10 +00:00
Fan Wu
7d2552bf93
RESTRICT AUTOMERGE Checks cross user permission before handling intent
...
Bug: 326057017
Test: atest
Flag: EXEMPT bug fix
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:d3b3edd45167515579ab156533754e56ac813f35 )
Merged-In: I3444e55b22b7487f96b0e3e9deb3f844c4c4723a
Change-Id: I3444e55b22b7487f96b0e3e9deb3f844c4c4723a
2024-08-29 17:35:06 +00:00
Fan Wu
0c72cfad1e
RESTRICT AUTOMERGE Checks cross user permission before handling intent
...
Bug: 326057017
Test: atest
Flag: EXEMPT bug fix
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:d3b3edd45167515579ab156533754e56ac813f35 )
Merged-In: I3444e55b22b7487f96b0e3e9deb3f844c4c4723a
Change-Id: I3444e55b22b7487f96b0e3e9deb3f844c4c4723a
2024-08-29 17:34:22 +00:00
Treehugger Robot
0830cf7fbe
Merge "RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity." into sc-dev am: 5d2e307f6e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28782741
Change-Id: Ia4dbc1a9dfd08e1a210fa047855ec51f972f312f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-22 00:16:50 +00:00
Daniel Norman
41efccc461
RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity. am: c4963a73f0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28782741
Change-Id: Ibd262d1e500113d0b29fae776cc950610dcc02db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-22 00:16:47 +00:00
Treehugger Robot
5d2e307f6e
Merge "RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity." into sc-dev
2024-08-22 00:03:59 +00:00
Daniel Norman
c4963a73f0
RESTRICT AUTOMERGE Stops hiding a11y services with the same package+label as an activity.
...
Bug: 353700779
Test: Install poc APKs from the bug, observe issue not reproducible
Test: (automated tests on 'main' branch)
Flag: NONE security fix
Change-Id: Ia8d43229d277dd4442173166ae0402f05096da4b
2024-08-14 21:16:34 +00:00
Adam Bookatz
2f53e6ab61
startActivityForResult with new Intent
...
Rather than use the raw Intent, we make a copy of it. See bug.
Bug: 330722900
Flag: EXEMPT bugfix
Test: manual
Test: atest com.android.settings.users.UserSettingsTest
com.android.settings.users.UserDetailsSettingsTest
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:1189e24e47571eae86634aeaa7dc60b8fe7f4820 )
Merged-In: Id74e4b7ae261f2916eedaef04a679f83409a4b67
Change-Id: Id74e4b7ae261f2916eedaef04a679f83409a4b67
2024-08-12 17:19:29 +00:00
Yiling Chuang
c8c879acee
[automerger skipped] RESTRICT AUTOMERGE FRP bypass defense in App battery usage page am: 0c097d5c0d
-s ours
...
am skip reason: Merged-In I486820ca2afecc02729a56a3c531fb931c1907d0 with SHA-1 3c2a216bbb
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/28550905
Change-Id: I40a44b4239991dc66564a95b8c82059a47830038
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-08-02 17:01:15 +00:00
Yiling Chuang
3c2a216bbb
RESTRICT AUTOMERGE FRP bypass defense in App battery usage page
...
Before the setup flow completion, don't allow the app info page in App battery usage to be launched.
Bug: 327748846
Test: atest SettingsRoboTests + manual test
- factory reset + launch app battery usage app info via ADB during Setup -> verify app closes
Flag : EXEMPT bugfix
Change-Id: I486820ca2afecc02729a56a3c531fb931c1907d0
Merged-In: I486820ca2afecc02729a56a3c531fb931c1907d0
(cherry picked from commit 419a6a9079
)
2024-07-31 07:04:20 +00:00
Yiling Chuang
0c097d5c0d
RESTRICT AUTOMERGE FRP bypass defense in App battery usage page
...
Before the setup flow completion, don't allow the app info page in App battery usage to be launched.
Bug: 327748846
Test: atest SettingsRoboTests + manual test
- factory reset + launch app battery usage app info via ADB during Setup -> verify app closes
Flag : EXEMPT bugfix
Change-Id: I486820ca2afecc02729a56a3c531fb931c1907d0
Merged-In: I486820ca2afecc02729a56a3c531fb931c1907d0
(cherry picked from commit 419a6a9079
)
2024-07-31 04:04:47 +00:00
Chris Antol
c18be19b10
Merge "RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning" into sc-qpr1-dev
2024-06-24 20:07:23 +00:00
Chris Antol
f158052ead
Merge "RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning" into sc-dev am: 768eef96cf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26737530
Change-Id: If9375e24f43af2c0767eb8fe9d884af92f227fab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-24 18:44:14 +00:00
Chris Antol
09f1d4c06b
RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning am: 7f1c4df02d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26737530
Change-Id: I269189a46b4c311bb8ff34e45d8d341bec54d7ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-24 18:44:11 +00:00
Chris Antol
768eef96cf
Merge "RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning" into sc-dev
2024-06-24 18:24:09 +00:00
Chris Antol
fce0c57c01
Merge "Ignore fragment attr from ext authenticator resource" into sc-qpr1-dev
2024-06-21 01:28:22 +00:00
Chris Antol
b6e9e08ae3
Merge "Ignore fragment attr from ext authenticator resource" into sc-dev am: c5031de185
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27676295
Change-Id: I2a62051844b3296e49fb6941b36af02c93a95803
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-21 00:35:21 +00:00
Chris Antol
c5031de185
Merge "Ignore fragment attr from ext authenticator resource" into sc-dev
2024-06-21 00:14:16 +00:00
Chris Antol
b66997fc4e
RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning
...
Bug: 327749022
Test: manual test
1. factory reset + launch Settings via ADB during Setup -> verify app closes
2. factory reset + bypass Setup + tap Settings icon in launcher -> verify app closes
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:70a5a0fd353cc6203d2926627de93786155ae5bc )
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:477d4a8d6ba390ed0f9b150ca271966cd967820a )
Merged-In: I8cbe38109ebf88a0f68f3917e95468a81c6463c1
Change-Id: I8cbe38109ebf88a0f68f3917e95468a81c6463c1
2024-06-18 17:33:24 +00:00
Chris Antol
7f1c4df02d
RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning
...
Bug: 327749022
Test: manual test
1. factory reset + launch Settings via ADB during Setup -> verify app closes
2. factory reset + bypass Setup + tap Settings icon in launcher -> verify app closes
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:70a5a0fd353cc6203d2926627de93786155ae5bc )
Merged-In: I8cbe38109ebf88a0f68f3917e95468a81c6463c1
Change-Id: I8cbe38109ebf88a0f68f3917e95468a81c6463c1
2024-06-18 17:32:03 +00:00
Treehugger Robot
d0f5ccb499
Merge "[RESTRICT AUTOMERGE] Replace getCallingActivity() with getLaunchedFromPackage()" into sc-dev am: 952dbb9aa3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27096218
Change-Id: I9ba35ae426561f7ed7f69151b114d5645230a62f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-06 07:42:17 +00:00
Jason Chiu
d0a4db88bb
[RESTRICT AUTOMERGE] Replace getCallingActivity() with getLaunchedFromPackage() am: b86569b274
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27096218
Change-Id: Iffc1b1f41b5cd22cec1bcfa530ad879f25b9073c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-06 07:42:10 +00:00
Treehugger Robot
952dbb9aa3
Merge "[RESTRICT AUTOMERGE] Replace getCallingActivity() with getLaunchedFromPackage()" into sc-dev
2024-06-06 07:30:05 +00:00
Chaohui Wang
0a57f0589f
Limit wifi item edit content's max length to 500 am: 092668676a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27546891
Change-Id: I51c391273d6d7c6d56a227df9f3df15404d5a0fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-05 16:46:22 +00:00
Chris Antol
7e0b376b11
Ignore fragment attr from ext authenticator resource
...
Bug: 341886134
Test: Unit Test
Test: Manual - see ticket for steps
Flag: EXEMPT <security>
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:2cb9b10ed97b1b9b29661115789605a762f3c2ef )
Merged-In: Id91c2b3b6d16ba3702ee2cd6723365a4db52863b
Change-Id: Id91c2b3b6d16ba3702ee2cd6723365a4db52863b
2024-06-04 20:16:42 +00:00
Chris Antol
abf11e7350
Ignore fragment attr from ext authenticator resource
...
Bug: 341886134
Test: Unit Test
Test: Manual - see ticket for steps
Flag: EXEMPT <security>
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:2cb9b10ed97b1b9b29661115789605a762f3c2ef )
Merged-In: Id91c2b3b6d16ba3702ee2cd6723365a4db52863b
Change-Id: Id91c2b3b6d16ba3702ee2cd6723365a4db52863b
2024-06-04 20:15:21 +00:00
Jason Chiu
b86569b274
[RESTRICT AUTOMERGE] Replace getCallingActivity() with getLaunchedFromPackage()
...
getLaunchedFromPackage() reports who launched this Activity or built
PendingIntent used to launch it, whereas getCallingActivity() reports
who will get result of Activity.
Bug: 316891059
Bug: 333364513
Test: robotest, manual
Change-Id: If97018c2741caef622f0596bbfeaa42ef1788b78
(cherry picked from commit ddc11bc03a
)
2024-05-29 01:31:38 +00:00
Chaohui Wang
092668676a
Limit wifi item edit content's max length to 500
...
Bug: 293199910
Test: manual - on "Add network"
Merged-In: I303b8c6e0f3c3a1174a047ba98f302042e5db9ae
Change-Id: I303b8c6e0f3c3a1174a047ba98f302042e5db9ae
(cherry picked from commit 855053ca41
)
2024-05-28 10:41:48 +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
Valentin Iftime
623d966fac
Validate ringtone URIs before setting am: 7ba175eaeb
am: 236f1a0f17
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24956689
Change-Id: Ifcec90852c0369ee58dabfd2fb9cf4f45fc2e2c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-08 20:13:12 +00:00
Valentin Iftime
236f1a0f17
Validate ringtone URIs before setting am: 7ba175eaeb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24956689
Change-Id: Id2d5f2423cacd7e4bb06fe46e1773b512a79fc29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-11-08 19:22:51 +00:00
Valentin Iftime
7ba175eaeb
Validate ringtone URIs before setting
...
Add checks URIs for content from other users.
Fail for users that are not profiles of the current user.
Test: atest DefaultRingtonePreferenceTest
Bug: 299614635
Change-Id: Ib266b285a3a1c6c5265ae2321159e61e08e349f6
Merged-In: Ib266b285a3a1c6c5265ae2321159e61e08e349f6
2023-10-09 12:55:39 +00:00
Eric Biggers
80ef1e0ff5
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 5f07aba150
-s ours am: 733d83d27b
-s ours am: aa93927b87
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24298399
Change-Id: I042c8f4fb621028ceaefb1340090113663cbbb75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-08 02:16:48 +00:00
Eric Biggers
aa93927b87
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 5f07aba150
-s ours am: 733d83d27b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24298399
Change-Id: Iee3107d98140efd520924ba05c7f592d54b6e8d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-08 01:56:39 +00:00
Eric Biggers
bf4f533ea6
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: b30cf4e8cb
-s ours am: d1a31c8619
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24301340
Change-Id: I4cdcfeaf7c26b88a83a3f62151f60cd6bc35b2bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-08 01:54:27 +00:00
Eric Biggers
733d83d27b
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 5f07aba150
-s ours
...
am skip reason: Merged-In I48b9119c19fb6378b1f88d36433ee4f4c8501d76 with SHA-1 b30cf4e8cb
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24298399
Change-Id: I102d20d2e914a442e768ca7446601bfa51eac20d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-08 01:36:53 +00:00
Eric Biggers
d1a31c8619
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: b30cf4e8cb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24301340
Change-Id: I100f99e9a0c7495f733b97d9f93decfe905ba7a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-08 01:34:09 +00:00
Eric Biggers
67c4be1e52
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 50cb0a35c9
-s ours
...
am skip reason: Merged-In I48b9119c19fb6378b1f88d36433ee4f4c8501d76 with SHA-1 99be30f895
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24301339
Change-Id: I65063522e32f96f27f7d7eb51c882e761ad29c02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-08 01:31:46 +00:00
Eric Biggers
5f07aba150
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:44:37 +00:00
Eric Biggers
b30cf4e8cb
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:44:09 +00:00
Eric Biggers
50cb0a35c9
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:43:54 +00:00