Bill Yi
c4dacc805d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b37162ce4a -s ours am: e6bbf4c0ab -s ours am: 61d2712697 -s ours am: 498d84036c -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23765255
Change-Id: Ie3b47fb8226c2be3820d048759902e88b007d05f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 21:22:45 +00:00
Automerger Merge Worker
b3a039b121
Merge changes from topic "am-7ee080511733486ca029b82ac27573ed"
...
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: bfde831c44f40225f1e16072ca10ec1d4c5c240cb37162ce4a6b8b091653
2023-06-21 21:20:52 +00:00
Bill Yi
e2cdd34df4
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: bfde831c44 -s ours am: 196592ee78 -s ours am: 10c28a1865 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23765258
Change-Id: I776e613f75ca1fe25fea901f1bb7caf75a603550
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 21:20:06 +00:00
Bill Yi
aec7fa6ce0
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6072ca10ec -s ours am: 1ca0379e99 -s ours am: f0a38cd669 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23765258
Change-Id: I98725ff704bfaf378c15f5640950453a3150226e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 21:20:00 +00:00
Bill Yi
498d84036c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b37162ce4a -s ours am: e6bbf4c0ab -s ours am: 61d2712697 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23765255
Change-Id: Ieaabc0f37fc6ff477f6947179a657b98bb6b16e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 21:19:46 +00:00
Bill Yi
d2829a27d3
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: bfde831c44 -s ours am: f40225f1e1 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23765258
Change-Id: I99e41c9b71b15292c414c3ccd204669dfaf432ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 21:19:00 +00:00
Bill Yi
71392eff7f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6072ca10ec -s ours am: 1d4c5c240c -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23765258
Change-Id: I77c21bc5b6bae514d4fc227c9e749a33ae8c3d45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 21:18:53 +00:00
Bill Yi
75653c002d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b37162ce4a -s ours am: 6b8b091653 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23765255
Change-Id: Idf34bd037bca842cdcababda56931adefe51e5c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 21:18:45 +00:00
Bill Yi
14f5981b8e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: bfde831c44 -s ours am: a9dd669426 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23765258
Change-Id: I0010bab6207ad850f66135451fdf48d2ba133681
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 21:17:26 +00:00
Bill Yi
9edf806ba6
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: bfde831c44 -s ours am: 41ce899068 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23765258
Change-Id: I70888ee81d9f732e36e26d9973fd41d9b333ad24
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 21:17:21 +00:00
Bill Yi
ae4df0db50
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6072ca10ec -s ours am: 1c7d5a2a6c -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23765258
Change-Id: Ic2251076fbc10c10d116c5cf6bb72d4ae0ea80e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 21:17:20 +00:00
Bill Yi
1ab65c1eee
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6072ca10ec -s ours am: 1e96e76303 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23765258
Change-Id: If91d2debcd0473118ad961acd596c9416429ff24
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 21:17:11 +00:00
Bill Yi
4933798e04
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b37162ce4a -s ours am: b14edb9c5d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23765255
Change-Id: I1c64e1823b68a5cb59bc4d6f4908c22bf6edb347
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 21:17:11 +00:00
Bill Yi
afe4c272b1
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b37162ce4a -s ours am: ea4210eaa2 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23765255
Change-Id: I53f8cd2cbfde565db968258fb19252868068cfc6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 21:17:07 +00:00
Bill Yi
5f9d65869f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: bfde831c44 -s ours am: 41ce899068 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23765258
Change-Id: Idd48d0d0a7244e67db5cb91f8f4e7c4add6fc926
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 21:16:57 +00:00
Bill Yi
acfa136e4f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6072ca10ec -s ours am: 1e96e76303 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23765258
Change-Id: I27fccda70bd40937dd3c3a61d7439ee33bfaf05f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 21:16:51 +00:00
Bill Yi
7b7d2179cb
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b37162ce4a -s ours am: ea4210eaa2 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23765255
Change-Id: I1ce7ae9227b53ec051f52a28612bab60883552e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 21:16:39 +00:00
Bill Yi
41ce899068
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: bfde831c44 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23765258
Change-Id: I8c48ccb9155ac97fb569e13504dcd262970df059
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 21:01:26 +00:00
Bill Yi
1e96e76303
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6072ca10ec -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23765258
Change-Id: If55db97addae5d0c38c1434b0b26229bc28a2f31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 21:01:21 +00:00
Bill Yi
ea4210eaa2
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b37162ce4a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23765255
Change-Id: I0964084a146f7a227407ba55eaae3c280a7140cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 21:01:10 +00:00
Bill Yi
10c28a1865
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: bfde831c44 -s ours am: 196592ee78 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23765258
Change-Id: I3217abf67e6897a41654184ce95dd03f89f85c97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 20:56:39 +00:00
Bill Yi
f0a38cd669
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6072ca10ec -s ours am: 1ca0379e99 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23765258
Change-Id: I6469bb3e9c5fa3a3c3a500d07a537aeea5d7d2cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 20:56:32 +00:00
Bill Yi
61d2712697
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b37162ce4a -s ours am: e6bbf4c0ab -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23765255
Change-Id: I2222153c8c5d4a23b17caa20efb6d25bc28a1c45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 20:56:23 +00:00
Bill Yi
196592ee78
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: bfde831c44 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23765258
Change-Id: I7b5c0743698cc167f7852176ed4f619cb515902b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 20:39:03 +00:00
Bill Yi
1ca0379e99
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6072ca10ec -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23765258
Change-Id: I626aca749292a50a5c1eb0755d4801cefd85ca0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 20:38:58 +00:00
Bill Yi
e6bbf4c0ab
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b37162ce4a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23765255
Change-Id: Ic1355b8c0575e2d4cae4a1ebe2284d4fcbca5009
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 20:38:47 +00:00
Bill Yi
f40225f1e1
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: bfde831c44 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23765258
Change-Id: Ie011ba7a5d738ccb6f09eb99619292e6aa83a380
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 20:38:30 +00:00
Bill Yi
1d4c5c240c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6072ca10ec -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23765258
Change-Id: I121c518a3b86727ace4ffabd7586846225347332
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 20:38:24 +00:00
Bill Yi
6b8b091653
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b37162ce4a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23765255
Change-Id: Ie238c049642fb1e34b01e0d81cdc94b37e9cf009
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 20:38:13 +00:00
Bill Yi
a9dd669426
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: bfde831c44 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23765258
Change-Id: I2b716efcee23ef5b13c685e9e4ac2ac9e0a7509d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 20:36:05 +00:00
Bill Yi
1c7d5a2a6c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6072ca10ec -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23765258
Change-Id: I69966b3b7a359c89f5e5cf0252ade5fb4c004b73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 20:35:59 +00:00
Bill Yi
b14edb9c5d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b37162ce4a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23765255
Change-Id: If33f1daa16456ec7ebb8f1b544ec2e949c6114e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 20:35:47 +00:00
Evan Chen
7f12ecfc00
Merge "Make sure work profile app cant enable notification listener services"
2023-06-21 20:24:09 +00:00
Bill Yi
bfde831c44
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-06-21 19:19:29 +00:00
Hao Dong
bf84218753
Fix delete face button disappear after reenroll
...
Test: manual test - 1.enroll a face 2. delete the face and reenroll 3.
back to face settings page, the button is delete button instead of set
up button
Bug: 285806446
Change-Id: I6739296b0b099446489956f8f609c87600ffdaa3
2023-06-21 18:45:40 +00:00
Matías Hernández
027f0a46ae
Settings: don't try to allow NLSes with too-long component names
...
* NotificationAccessConfirmationActivity (triggered through CompanionDeviceManager) -> Don't show the dialog, bail out early similarly to other invalid inputs.
* NotificationAccessSettings (from Special App Access) -> No changes, but use the canonical constant now.
* ApprovalPreferenceController (used in NotificationAccessDetails) -> Disable the toggle, unless the NLS was previously approved (in which case it can still be removed).
Fixes: 260570119
Fixes: 286043036
Test: atest + manually
Change-Id: Ifc048311746c027e3683cdcf65f1079d04cf7c56
2023-06-21 17:02:32 +02:00
Bill Yi
6072ca10ec
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I8c5e78d87373a142a4082f9081a28027d239af45
2023-06-21 07:16:56 -07:00
Bill Yi
b37162ce4a
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ia31b10a26fde9ae0f51940ad59e4746ead5fa70b
2023-06-21 07:15:19 -07:00
Treehugger Robot
84d3f2df74
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 8e3c231438 -s ours am: 3a3d7e41a3 -s ours am: fa2f6edc55 -s ours am: 147e3bf0c6 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23754633
Change-Id: I1a3b9021f5ea28f388df52f8bb2184e264fc164e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 10:12:26 +00:00
Bill Yi
8928e4b925
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dd95a8a7c8 -s ours am: ed188e243f -s ours am: 450076d57b -s ours am: 78c6b3a910 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23754633
Change-Id: I76c02ad01288fbe7a92e449ae22750e6cc0eb67c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 10:12:12 +00:00
Bill Yi
95d14f7098
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d0213cd684 -s ours am: 5499c23607 -s ours am: d35f04d453 -s ours am: f25b5dca5a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23754632
Change-Id: Ib341139b6c29c93eb3e835ced8dab964d928a594
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 10:11:58 +00:00
Automerger Merge Worker
d9d9c49259
Merge changes from topic "am-69bbabe4aa46467eb85a40ee75080959" into udc-d1-dev-plus-aosp am: 8fd358b746 am: 65ed33547e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23754633
Change-Id: I854f3b59e90380ebacdb9b39b79d41f63151cfcd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 10:08:22 +00:00
Treehugger Robot
99830fd9c5
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 8e3c231438 -s ours am: 3cc206bb14 -s ours am: 36cab9526d -s ours am: 5303b7ad0b -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23754633
Change-Id: I2be7238bc1f5720a81a0940f644b7515a428c443
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 10:08:07 +00:00
Treehugger Robot
35c8688276
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 8e3c231438 -s ours am: 3a3d7e41a3 -s ours am: ca92c010e4 -s ours am: 73fca2ff71 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23754633
Change-Id: I94b3071e64a0d34251b2dd2a6d6916513928bfb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 10:04:40 +00:00
Bill Yi
982a559c72
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dd95a8a7c8 -s ours am: ed188e243f -s ours am: 4ea827c82c -s ours am: 6aa069ef44 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23754633
Change-Id: I2a6e58df6f4b3895358a0dd31edc1ebe2d55f892
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 10:04:35 +00:00
Bill Yi
a41e0578bf
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d0213cd684 -s ours am: 5499c23607 -s ours am: 941771948f -s ours am: dd845023d6 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23754632
Change-Id: I4912860df548dc51cb083e0a24f45837210c3e9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 10:04:06 +00:00
Chaohui Wang
88fd45b1e6
Fix ANR in TelephonyStatusControlSession
...
Feature.get() blocks on the main thread, which cause the ANR.
Cancel the job instead to fix.
Fix: 287702163
Test: Manually with MobileNetworkSettings
Test: atest TelephonyStatusControlSessionTest
Change-Id: Id873e56359dbf198c31686c2280c979294c95c3d
2023-06-21 16:43:17 +08:00
TreeHugger Robot
41bcba352f
Merge "Remove Wi-Fi hotspot from settings search for non-admin users" into udc-d1-dev am: c548cdc4a9 am: d6ae6f8655 am: 4b20b38673
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23753764
Change-Id: I5f154df6d8a606b07db6ea4c7c86b2f51736aeed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 08:05:29 +00:00
TreeHugger Robot
cc6e6ef83b
Merge "Remove Wi-Fi hotspot from settings search for non-admin users" into udc-d1-dev am: c548cdc4a9 am: 87f7101866 am: 6df1a755e6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23753764
Change-Id: I97764666fcf0f9547333133ae906939c6fb00df6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 08:05:18 +00:00
Rambo Wang
b0ea4e9ed1
[automerger skipped] Merge "Fix Settings app ANR due to blocking IDumpstateDevice IPC call" into udc-qpr-dev am: de5c8613ba am: 330a6b2259 -s ours
...
am skip reason: Merged-In I0b88ef089097930b62dcb1cb7d6fe9990356ab5d with SHA-1 f7b8d687bfhttps://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23745833
Change-Id: I937486d64f4fd8a72f826448fad4011284a4c656
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-21 08:05:09 +00:00
