Commit Graph

770095 Commits

Author SHA1 Message Date
Oli Lan
1670b026b9 [automerger skipped] Merge "Prevent non-admin users from deleting system apps." into rvc-dev am: 71fad59e5e am: 476be4be3c am: 916d292b28 am: fef8d42a56 -s ours am: a937ff5ec2 -s ours
am skip reason: Merged-In I4e959e296cca9bbdfc8fccc5e5e0e654ca524165 with SHA-1 9070283638 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19570390

Change-Id: I01609087be7cc9804f767edccc6ccd3a186a7e6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-24 16:52:21 +00:00
Oli Lan
a937ff5ec2 [automerger skipped] Merge "Prevent non-admin users from deleting system apps." into rvc-dev am: 71fad59e5e am: 476be4be3c am: 916d292b28 am: fef8d42a56 -s ours
am skip reason: Merged-In I4e959e296cca9bbdfc8fccc5e5e0e654ca524165 with SHA-1 9070283638 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19570390

Change-Id: I73a2afb3f02ef9eb08d9fec09d760fab44023374
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-24 16:25:00 +00:00
Oli Lan
fef8d42a56 Merge "Prevent non-admin users from deleting system apps." into rvc-dev am: 71fad59e5e am: 476be4be3c am: 916d292b28
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19570390

Change-Id: If9b1f768693b1f7777bb0b32384f3622a41c79de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-24 15:24:21 +00:00
Oli Lan
916d292b28 Merge "Prevent non-admin users from deleting system apps." into rvc-dev am: 71fad59e5e am: 476be4be3c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19570390

Change-Id: I1ec159aa8dcb340b462a4ad718c0fc8bb67f4377
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-24 14:53:08 +00:00
Oli Lan
352411d82f Merge "Prevent non-admin users from deleting system apps." into tm-dev am: 81f6691072
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19569853

Change-Id: Ifeb13830406e0d2e89ce7aafd6dfa033a79d6852
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-24 14:26:31 +00:00
Oli Lan
476be4be3c Merge "Prevent non-admin users from deleting system apps." into rvc-dev am: 71fad59e5e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19570390

Change-Id: I2bbb9bdd9f662be36a205565450282429fb58c82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-24 14:25:15 +00:00
Oli Lan
71fad59e5e Merge "Prevent non-admin users from deleting system apps." into rvc-dev 2022-08-24 13:37:19 +00:00
Oli Lan
81f6691072 Merge "Prevent non-admin users from deleting system apps." into tm-dev 2022-08-24 13:36:49 +00:00
Julia Reynolds
9f2176d985 [automerger skipped] Limit the size of NotificationChannel and NotificationChannelGroup am: c2d264989a am: f1c5754b97 -s ours am: 7d9c55fd15 -s ours am: a85f1fe58d -s ours am: bf77efaa37 -s ours am: fbe0eddf01 -s ours am: fc8fd15e92 -s ours am: b0fa4613e5 -s ours
am skip reason: Merged-In I0925583ab54d6c81c415859618f6b907ab7baada with SHA-1 6d417539d7 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19696126

Change-Id: I4372d9c3bc58fda59d638a84d8b574588324ac0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-23 23:04:51 +00:00
Julia Reynolds
2f216a21f1 Merge "Limit the size of NotificationChannel and NotificationChannelGroup" into rvc-dev am: 04ccf69df1 am: 6155a1779b am: c08dd8f0a8 am: 64c3c93c8c am: 4c475e7010 am: cec5611e50
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19697197

Change-Id: I8c85d92c66888a1250c8545a92d783424e6feac1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-23 23:04:33 +00:00
Julia Reynolds
f9e9c0af6d [automerger skipped] Limit the size of NotificationChannel and NotificationChannelGroup am: c2d264989a am: f1c5754b97 -s ours am: 7d9c55fd15 -s ours am: a85f1fe58d -s ours am: bf77efaa37 -s ours am: d0e942d756 -s ours am: 11f6e05c0b -s ours
am skip reason: Merged-In I0925583ab54d6c81c415859618f6b907ab7baada with SHA-1 6d417539d7 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19696126

Change-Id: I5991f160eaf2c21e7f595152ea1d14282511e66a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-23 23:04:12 +00:00
Julia Reynolds
cbb44217a3 Merge "Limit the size of NotificationChannel and NotificationChannelGroup" into rvc-dev am: 04ccf69df1 am: 6155a1779b am: c08dd8f0a8 am: 695d9cce2c am: 3e7871d10e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19697197

Change-Id: Ib9213f9e51390a5ba995f15f8b0de0b48c8eedee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-23 23:03:46 +00:00
Julia Reynolds
b0fa4613e5 [automerger skipped] Limit the size of NotificationChannel and NotificationChannelGroup am: c2d264989a am: f1c5754b97 -s ours am: 7d9c55fd15 -s ours am: a85f1fe58d -s ours am: bf77efaa37 -s ours am: fbe0eddf01 -s ours am: fc8fd15e92 -s ours
am skip reason: Merged-In I0925583ab54d6c81c415859618f6b907ab7baada with SHA-1 6d417539d7 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19696126

Change-Id: I680d0c74e9b9e6226c868b5e4917800221c2e6f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-23 23:03:40 +00:00
Julia Reynolds
cec5611e50 Merge "Limit the size of NotificationChannel and NotificationChannelGroup" into rvc-dev am: 04ccf69df1 am: 6155a1779b am: c08dd8f0a8 am: 64c3c93c8c am: 4c475e7010
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19697197

Change-Id: I3816299f5ea0ecae67a22300b6dd34d5f05f37e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-23 23:02:57 +00:00
Bill Yi
cded094eac Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-08-23 22:52:50 +00:00
Bill Yi
057c15c742 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-08-23 22:52:50 +00:00
Bill Yi
53af3de51d Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-08-23 22:52:50 +00:00
Julia Reynolds
fc8fd15e92 [automerger skipped] Limit the size of NotificationChannel and NotificationChannelGroup am: c2d264989a am: f1c5754b97 -s ours am: 7d9c55fd15 -s ours am: a85f1fe58d -s ours am: bf77efaa37 -s ours am: fbe0eddf01 -s ours
am skip reason: Merged-In I0925583ab54d6c81c415859618f6b907ab7baada with SHA-1 6d417539d7 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19696126

Change-Id: I38c6fd37bc38cd12e3a795a09e6cf8c4ef60837f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-23 21:51:59 +00:00
Julia Reynolds
4c475e7010 Merge "Limit the size of NotificationChannel and NotificationChannelGroup" into rvc-dev am: 04ccf69df1 am: 6155a1779b am: c08dd8f0a8 am: 64c3c93c8c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19697197

Change-Id: I736a0a463e5bfdfa9a3c6955f380c7c6a5d0b091
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-23 21:51:37 +00:00
Julia Reynolds
11f6e05c0b [automerger skipped] Limit the size of NotificationChannel and NotificationChannelGroup am: c2d264989a am: f1c5754b97 -s ours am: 7d9c55fd15 -s ours am: a85f1fe58d -s ours am: bf77efaa37 -s ours am: d0e942d756 -s ours
am skip reason: Merged-In I0925583ab54d6c81c415859618f6b907ab7baada with SHA-1 6d417539d7 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19696126

Change-Id: Iad5f48731cd2c8f7bc790617bcb259dce7e384db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-23 21:50:34 +00:00
Julia Reynolds
3e7871d10e Merge "Limit the size of NotificationChannel and NotificationChannelGroup" into rvc-dev am: 04ccf69df1 am: 6155a1779b am: c08dd8f0a8 am: 695d9cce2c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19697197

Change-Id: Ice35137be3128ad66de01bc6881420f866118701
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-23 21:49:55 +00:00
Julia Reynolds
9f89e816b5 Merge "Limit the size of NotificationChannel and NotificationChannelGroup" into rvc-qpr-dev am: a15093de05 am: 5415ede546 am: dc9fe11d8d am: eb814b0f25 am: b94d473e5e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19696124

Change-Id: Ide798264b710e29c4bd53b3e07e7108406e88ed8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-23 21:25:36 +00:00
Julia Reynolds
d0e942d756 [automerger skipped] Limit the size of NotificationChannel and NotificationChannelGroup am: c2d264989a am: f1c5754b97 -s ours am: 7d9c55fd15 -s ours am: a85f1fe58d -s ours am: bf77efaa37 -s ours
am skip reason: Merged-In I0925583ab54d6c81c415859618f6b907ab7baada with SHA-1 6d417539d7 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19696126

Change-Id: I0efb5403607d20a214d81071513abbe21006016c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-23 21:24:29 +00:00
Julia Reynolds
fbe0eddf01 [automerger skipped] Limit the size of NotificationChannel and NotificationChannelGroup am: c2d264989a am: f1c5754b97 -s ours am: 7d9c55fd15 -s ours am: a85f1fe58d -s ours am: bf77efaa37 -s ours
am skip reason: Merged-In I0925583ab54d6c81c415859618f6b907ab7baada with SHA-1 6d417539d7 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19696126

Change-Id: I4432ee0eaf6e523cb98cd578d7c4ae77747130f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-23 21:24:06 +00:00
Julia Reynolds
c6e278e2ac Merge "Limit the size of NotificationChannel and NotificationChannelGroup" into rvc-qpr-dev am: a15093de05 am: 5415ede546 am: 5d93b514bc am: 26ff874f64
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19696124

Change-Id: I2a86c4a4bf28a9e4617d62f85d910b117c7a7898
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-23 21:23:29 +00:00
Julia Reynolds
695d9cce2c Merge "Limit the size of NotificationChannel and NotificationChannelGroup" into rvc-dev am: 04ccf69df1 am: 6155a1779b am: c08dd8f0a8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19697197

Change-Id: I3ef63a7cab840a69ce62e1b133f2b239c6600ccd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-23 21:23:26 +00:00
Julia Reynolds
b94d473e5e Merge "Limit the size of NotificationChannel and NotificationChannelGroup" into rvc-qpr-dev am: a15093de05 am: 5415ede546 am: dc9fe11d8d am: eb814b0f25
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19696124

Change-Id: Id6f21dcc3a920e87a7f58bc901802043b2d3e6cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-23 21:23:20 +00:00
Julia Reynolds
64c3c93c8c Merge "Limit the size of NotificationChannel and NotificationChannelGroup" into rvc-dev am: 04ccf69df1 am: 6155a1779b am: c08dd8f0a8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19697197

Change-Id: If54a305ad52e9c8d7d6d96849c08722a6b063007
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-23 21:20:20 +00:00
Julia Reynolds
eb814b0f25 Merge "Limit the size of NotificationChannel and NotificationChannelGroup" into rvc-qpr-dev am: a15093de05 am: 5415ede546 am: dc9fe11d8d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19696124

Change-Id: I56b8b3043c357312c51d0701e249f82dda1cb48f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-23 20:52:46 +00:00
Julia Reynolds
26ff874f64 Merge "Limit the size of NotificationChannel and NotificationChannelGroup" into rvc-qpr-dev am: a15093de05 am: 5415ede546 am: 5d93b514bc
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19696124

Change-Id: I0d71dffdc6130e6ca0c258688ab075fd75c59273
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-23 20:52:14 +00:00
Julia Reynolds
bf77efaa37 [automerger skipped] Limit the size of NotificationChannel and NotificationChannelGroup am: c2d264989a am: f1c5754b97 -s ours am: 7d9c55fd15 -s ours am: a85f1fe58d -s ours
am skip reason: Merged-In I0925583ab54d6c81c415859618f6b907ab7baada with SHA-1 6d417539d7 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19696126

Change-Id: If9221962db022d96fc24b8cf69e38577dbf375ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-23 20:51:26 +00:00
Julia Reynolds
c08dd8f0a8 Merge "Limit the size of NotificationChannel and NotificationChannelGroup" into rvc-dev am: 04ccf69df1 am: 6155a1779b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19697197

Change-Id: Ie8d9d0bfee0236a15f697e0d91c0b2b6a7280946
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-23 20:50:29 +00:00
Julia Reynolds
5d93b514bc Merge "Limit the size of NotificationChannel and NotificationChannelGroup" into rvc-qpr-dev am: a15093de05 am: 5415ede546
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19696124

Change-Id: Iab8db627059b3363c1b797a8e7c63eac5b003ac2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-23 19:13:47 +00:00
Julia Reynolds
dc9fe11d8d Merge "Limit the size of NotificationChannel and NotificationChannelGroup" into rvc-qpr-dev am: a15093de05 am: 5415ede546
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19696124

Change-Id: I0d2e6623563ec9b74ee4c3356384750a97b347c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-23 19:11:50 +00:00
Julia Reynolds
a85f1fe58d [automerger skipped] Limit the size of NotificationChannel and NotificationChannelGroup am: c2d264989a am: f1c5754b97 -s ours am: 7d9c55fd15 -s ours
am skip reason: Merged-In I0925583ab54d6c81c415859618f6b907ab7baada with SHA-1 6d417539d7 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19696126

Change-Id: I06dd40128c2853a96ebf16155c330fe6f9fc6643
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-23 19:02:15 +00:00
Julia Reynolds
6155a1779b Merge "Limit the size of NotificationChannel and NotificationChannelGroup" into rvc-dev am: 04ccf69df1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19697197

Change-Id: I3a4799fe094aee9a0694ed6df5b8587a5a2f7c1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-23 19:01:58 +00:00
Julia Reynolds
7d9c55fd15 [automerger skipped] Limit the size of NotificationChannel and NotificationChannelGroup am: c2d264989a am: f1c5754b97 -s ours
am skip reason: Merged-In I0925583ab54d6c81c415859618f6b907ab7baada with SHA-1 6d417539d7 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19696126

Change-Id: I6ca536a1e387ab2df802df9bfb4ed2e504154ddc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-23 19:01:51 +00:00
Julia Reynolds
a5b0ec0e38 Merge "Limit the size of NotificationChannel and NotificationChannelGroup" into sc-v2-dev am: 80f3d5d722 am: 127f057855
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19696123

Change-Id: Ia97e0797514a6393bf719dac9a05e67fa217f94a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-23 18:56:02 +00:00
Julia Reynolds
2854be216c Merge "Limit the size of NotificationChannel and NotificationChannelGroup" into tm-dev am: 92c1b9e850
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19697540

Change-Id: Ia56e1c95e622528fcc3606f843db2c6876c1fa4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-23 18:55:43 +00:00
Julia Reynolds
5415ede546 Merge "Limit the size of NotificationChannel and NotificationChannelGroup" into rvc-qpr-dev am: a15093de05
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19696124

Change-Id: I1079b5d5ae03e517d83d1224023cd7ba89c37605
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-23 18:53:53 +00:00
Julia Reynolds
127f057855 Merge "Limit the size of NotificationChannel and NotificationChannelGroup" into sc-v2-dev am: 80f3d5d722
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19696123

Change-Id: I188f25594329051c4a25f96476284e816e1163e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-23 18:52:53 +00:00
Julia Reynolds
f1c5754b97 Limit the size of NotificationChannel and NotificationChannelGroup am: c2d264989a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19696126

Change-Id: Ida57571c08e6c1be93b7b70adff8fce3759c109a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-23 18:44:15 +00:00
Julia Reynolds
04ccf69df1 Merge "Limit the size of NotificationChannel and NotificationChannelGroup" into rvc-dev 2022-08-23 18:41:17 +00:00
Julia Reynolds
a15093de05 Merge "Limit the size of NotificationChannel and NotificationChannelGroup" into rvc-qpr-dev 2022-08-23 18:40:15 +00:00
Julia Reynolds
80f3d5d722 Merge "Limit the size of NotificationChannel and NotificationChannelGroup" into sc-v2-dev 2022-08-23 18:39:34 +00:00
Julia Reynolds
92c1b9e850 Merge "Limit the size of NotificationChannel and NotificationChannelGroup" into tm-dev 2022-08-23 18:37:55 +00:00
Bill Yi
2012fe0f8d Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-08-23 14:30:18 +00:00
Bill Yi
18886df85f Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-08-23 14:30:18 +00:00
Bill Yi
f6dbfe6e4e Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-08-23 14:30:18 +00:00
Bill Yi
0f2a9297bf Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-08-23 14:30:18 +00:00