Commit Graph

130241 Commits

Author SHA1 Message Date
Taran Singh
efa54fce9c [automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 9260c67352 am: 4a5e1a4d3f am: 6484a7f640 am: 5552c412c8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia0da2f8e129d942ef638929f650d18cc610c95cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 22:44:59 +00:00
Taran Singh
5552c412c8 DO NOT MERGE: Prevent non-system IME from becoming device admin am: 9260c67352 am: 4a5e1a4d3f am: 6484a7f640
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545057

Change-Id: I8d65342899d69e875b725a638317162f5f38c9a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 22:01:00 +00:00
Treehugger Robot
3aeda419f6 [automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into udc-dev am: decc428857 am: a0c080fd28 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie8b456f578c6ef5e752eb9284ecdec53cdd472f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 21:15:35 +00:00
Taran Singh
d717dd1d52 [automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 9260c67352 am: c4e19d2afe -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ibcbd144a3814b20517030c3f54392fa6d1073573
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 21:15:34 +00:00
Taran Singh
6484a7f640 DO NOT MERGE: Prevent non-system IME from becoming device admin am: 9260c67352 am: 4a5e1a4d3f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545057

Change-Id: I444194ab1c57d376de954f3cbed4ba3d3b0cb3d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 21:12:56 +00:00
Treehugger Robot
a2fffae315 [automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into udc-dev am: decc428857 am: 48b541abfb -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3c887402cf34c8965127e481b321118fc8546e0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 21:12:56 +00:00
Taran Singh
481776a78e [automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 9260c67352 am: feea08e693 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I11f4e10382ae4ab1872d2ee986df791f3ffd9e27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 21:12:53 +00:00
Treehugger Robot
48b541abfb Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into udc-dev am: decc428857
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545057

Change-Id: I572e58d1ce3150a8d5a9e489fe5b55f00177e57a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 20:29:18 +00:00
Taran Singh
feea08e693 DO NOT MERGE: Prevent non-system IME from becoming device admin am: 9260c67352
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545057

Change-Id: I533b1a673de2d3660a75452f5f7c58fe33ab55a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 20:29:17 +00:00
Taran Singh
4a5e1a4d3f DO NOT MERGE: Prevent non-system IME from becoming device admin am: 9260c67352
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545057

Change-Id: Idaf9439f1efd96653858177bdea474ad4b85190f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 20:29:16 +00:00
Treehugger Robot
a0c080fd28 Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into udc-dev am: decc428857
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545057

Change-Id: Iaaa5b9fbdc625d749aa87e2dee865e68bc16b88e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 20:29:13 +00:00
Taran Singh
c4e19d2afe DO NOT MERGE: Prevent non-system IME from becoming device admin am: 9260c67352
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545057

Change-Id: Ib9a8ac9c10c27d50b99b1501e28a6766ff3ce70c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 20:29:11 +00:00
Han Xu
be311b88c9 Add manufactured year into hardware info page am: b452bc9f9d am: 15da26329f am: e319c686e7 am: 11b3eefc33
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23629342

Change-Id: I0cae44c45c55c7a845d6bb6370fa675551861f7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 20:09:33 +00:00
Han Xu
9cba14f0a5 Add manufactured year into hardware info page am: b452bc9f9d am: 2fb6c5887d am: 13b6d23ef2 am: 9f52cc6270
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23629342

Change-Id: I524780e02c86132af54527f9c595ef46015ed299
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 20:06:59 +00:00
Han Xu
9e36ae77ba Add manufactured year into hardware info page am: b452bc9f9d am: 15da26329f am: 24fc0d6744 am: fc05f6766e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23629342

Change-Id: Ie23e42c553e8016f866b00bd08d97555fae02188
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 20:06:36 +00:00
Treehugger Robot
decc428857 Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into udc-dev 2023-06-12 19:57:26 +00:00
Han Xu
11b3eefc33 Add manufactured year into hardware info page am: b452bc9f9d am: 15da26329f am: e319c686e7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23629342

Change-Id: I86b4bc61572462e94e51762ca89722b55c44658f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 18:56:32 +00:00
Han Xu
9f52cc6270 Add manufactured year into hardware info page am: b452bc9f9d am: 2fb6c5887d am: 13b6d23ef2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23629342

Change-Id: I8f6c848180d7e386f80e4326bc46642474490d76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 18:53:51 +00:00
Han Xu
fc05f6766e Add manufactured year into hardware info page am: b452bc9f9d am: 15da26329f am: 24fc0d6744
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23629342

Change-Id: Idb39c3d58e9e90f03ec329ab72b772ab705ef7de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 18:53:23 +00:00
Han Xu
45fcb540b2 Add manufactured year into hardware info page am: b452bc9f9d am: faa02ca7e7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23629342

Change-Id: I6511718c862061a75ce47ad0c63240d403e1a8c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 18:08:36 +00:00
Han Xu
e319c686e7 Add manufactured year into hardware info page am: b452bc9f9d am: 15da26329f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23629342

Change-Id: I29b80b692bc97132b5cc7eac3d3a153d0f93d238
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 18:08:24 +00:00
Han Xu
13b6d23ef2 Add manufactured year into hardware info page am: b452bc9f9d am: 2fb6c5887d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23629342

Change-Id: Ib46aa4c7d5f34e2967e14b4705392c343aa7df7f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 18:08:05 +00:00
Han Xu
24fc0d6744 Add manufactured year into hardware info page am: b452bc9f9d am: 15da26329f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23629342

Change-Id: Ia99e7b22230a44bbe5c70bcac17b64cd5536e4f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 18:06:18 +00:00
Han Xu
1a9a892ff3 Add manufactured year into hardware info page am: b452bc9f9d am: eefb4e777d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23629342

Change-Id: Id5c47cbcbefad23dc81eb4e597aed8a21a36affc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 18:06:10 +00:00
Han Xu
2fb6c5887d Add manufactured year into hardware info page am: b452bc9f9d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23629342

Change-Id: I59bab60a59b531e25663b3e34a554f3ac7dfc87b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 17:44:38 +00:00
Han Xu
faa02ca7e7 Add manufactured year into hardware info page am: b452bc9f9d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23629342

Change-Id: I9ece7cc81a254db4d57f6ee61a2c19b96414a67f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 17:43:51 +00:00
Han Xu
eefb4e777d Add manufactured year into hardware info page am: b452bc9f9d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23629342

Change-Id: I75182c66daf65a4b48cfe7a66fb67cbbfba74b7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 17:43:48 +00:00
Han Xu
15da26329f Add manufactured year into hardware info page am: b452bc9f9d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23629342

Change-Id: I53f6c06271bb862cd16e2f3cb48886f764686d40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 17:43:44 +00:00
Treehugger Robot
f572bed648 Merge "Remove redundant methods and refactor" into udc-qpr-dev am: 55774422b1 am: 6fb7cb85fd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23634999

Change-Id: I31ff110702752ffcd819e94106a1434963ef6e1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 10:37:10 +00:00
Treehugger Robot
6fb7cb85fd Merge "Remove redundant methods and refactor" into udc-qpr-dev am: 55774422b1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23634999

Change-Id: I33ea753d6fcf8ced79a315652134513b40b0cfb0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 09:55:15 +00:00
Han Xu
b452bc9f9d Add manufactured year into hardware info page
Bug: 285471557
Test: manual visually
Change-Id: Iaab254ac6ee77217e29d89524d782577f44119cb
2023-06-12 17:43:55 +08:00
Treehugger Robot
55774422b1 Merge "Remove redundant methods and refactor" into udc-qpr-dev 2023-06-12 09:05:05 +00:00
Yi-Ling Chuang
f148baa372 Remove redundant methods and refactor
Remove the summary method and write the code in AOSP directly instead to
force string consistency. Also refactor a bit after the modification.

Fixes: 276399056
Test: robotests
Change-Id: I76ad740b694363a3cdfb3748e41c840fb678b93d
2023-06-12 16:11:49 +08:00
Jason Hsu
da355b435f Merge "Change the summary string to exclude 'Audio output' feature" into udc-dev am: fecfa96723 am: 3608d5bf18 am: bab462f1d6 am: bc62033a87
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23557965

Change-Id: I96662d8cd8d267840c8b7ff70486d8c364fd7e11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 06:20:51 +00:00
Jason Hsu
f156bda553 Merge "Change the summary string to exclude 'Audio output' feature" into udc-dev am: fecfa96723 am: d2c7424293 am: 99f2fa9e4c am: 9ca9d53971
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23557965

Change-Id: I7e0ce94dff5d210da5aca52432b96f7119f385c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 06:19:35 +00:00
Jason Hsu
b034d60b52 Merge "Change the summary string to exclude 'Audio output' feature" into udc-dev am: fecfa96723 am: 3608d5bf18 am: 50ac77ebfe am: 82bc64d4ee
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23557965

Change-Id: I270922726f5293e54fc9bca373f3fd69c82c485d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 06:17:11 +00:00
Jason Hsu
bc62033a87 Merge "Change the summary string to exclude 'Audio output' feature" into udc-dev am: fecfa96723 am: 3608d5bf18 am: bab462f1d6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23557965

Change-Id: Icde34b635bd7c9995048d79346aa8bafa0a05831
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 05:35:17 +00:00
Jason Hsu
9ca9d53971 Merge "Change the summary string to exclude 'Audio output' feature" into udc-dev am: fecfa96723 am: d2c7424293 am: 99f2fa9e4c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23557965

Change-Id: I1affa2468097e9d888c7fb2dbaf1602a82170f40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 05:30:56 +00:00
Jason Hsu
82bc64d4ee Merge "Change the summary string to exclude 'Audio output' feature" into udc-dev am: fecfa96723 am: 3608d5bf18 am: 50ac77ebfe
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23557965

Change-Id: Icc2928b5a74fdad3390dc89d43fe8c4604344d55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 05:29:34 +00:00
Jason Hsu
99f2fa9e4c Merge "Change the summary string to exclude 'Audio output' feature" into udc-dev am: fecfa96723 am: d2c7424293
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23557965

Change-Id: Ic6e8eab1f1ced09ee132646f2df5f48aeb0b7086
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 04:53:08 +00:00
Jason Hsu
bab462f1d6 Merge "Change the summary string to exclude 'Audio output' feature" into udc-dev am: fecfa96723 am: 3608d5bf18
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23557965

Change-Id: Id50ea2a480c6d674a77764e285642f2087df9c40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 04:52:00 +00:00
Automerger Merge Worker
4880888a5e Merge "Merge "Change the summary string to exclude 'Audio output' feature" into udc-dev am: fecfa96723 am: 9a4eb33abd" 2023-06-12 04:50:35 +00:00
Jason Hsu
d29b650a85 Merge "Change the summary string to exclude 'Audio output' feature" into udc-dev am: fecfa96723 am: 9a4eb33abd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23557965

Change-Id: Ifd54ee359c929a2caefab45cb588947c21c94821
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 04:50:18 +00:00
Jason Hsu
50ac77ebfe Merge "Change the summary string to exclude 'Audio output' feature" into udc-dev am: fecfa96723 am: 3608d5bf18
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23557965

Change-Id: Ia74f7630061811583ba8b9c94ca79598593292e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 04:50:10 +00:00
Jason Hsu
51f58b5933 Merge "Change the summary string to exclude 'Audio output' feature" into udc-dev am: fecfa96723 am: 842eda9339
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23557965

Change-Id: I537ba7aa4f9e74cd8a8303859f0028aa949ea640
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 04:49:58 +00:00
Jason Hsu
3608d5bf18 Merge "Change the summary string to exclude 'Audio output' feature" into udc-dev am: fecfa96723
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23557965

Change-Id: Ia809e0cc8fa6e1503496e9ae7cbbeda5300d6b1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 04:19:35 +00:00
Jason Hsu
842eda9339 Merge "Change the summary string to exclude 'Audio output' feature" into udc-dev am: fecfa96723
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23557965

Change-Id: I46a25dd5193e7077a3122e8c1bfa94131cd62ee2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 04:19:33 +00:00
Jason Hsu
9a4eb33abd Merge "Change the summary string to exclude 'Audio output' feature" into udc-dev am: fecfa96723
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23557965

Change-Id: Ia4ab1ba53c07c21b00ad6e64d57399f78ed3184e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 04:19:29 +00:00
Jason Hsu
d2c7424293 Merge "Change the summary string to exclude 'Audio output' feature" into udc-dev am: fecfa96723
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23557965

Change-Id: I4fd0ed02f598224a5f93aa646f8895298a64ac90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 04:09:31 +00:00
Jason Hsu
fecfa96723 Merge "Change the summary string to exclude 'Audio output' feature" into udc-dev 2023-06-12 03:54:11 +00:00