Evolution-X-Tensor/device_google_gs101
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
3273 commits 1 branch 0 tags 494 MiB
Commit graph

3273 commits

This branch
This branch
All branches
Author SHA1 Message Date
Steven Moreland
0f5940d969 [automerger skipped] Merge "Remove vendor_service." am: c6545d33ff -s ours am: f200aa0cee -s ours am: 235c5c3ba6 -s ours am: 0add999ea6 -s ours 
am skip reason: Merged-In I4766227e2261d0d57be090933926ff3b439694f6 with SHA-1 b20e917ebf is already in history

Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2155037

Change-Id: Ia894717849e4a76a579867c4f7d9c5b9a7e24b20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-01 18:41:14 +00:00
Steven Moreland
a49ba9a5b0 [automerger skipped] Remove vendor_service. am: 2808c8b289 -s ours am: 8354f470a4 -s ours am: 1cd11b0bae -s ours am: 0cb7db439d -s ours 
am skip reason: Merged-In I4766227e2261d0d57be090933926ff3b439694f6 with SHA-1 b20e917ebf is already in history

Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2155037

Change-Id: I2ac9d93c20ba70ce47ef90dbc2372ad71980a889
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-01 18:41:13 +00:00
Steven Moreland
0add999ea6 [automerger skipped] Merge "Remove vendor_service." am: c6545d33ff -s ours am: f200aa0cee -s ours am: 235c5c3ba6 -s ours 
am skip reason: Merged-In I4766227e2261d0d57be090933926ff3b439694f6 with SHA-1 b20e917ebf is already in history

Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2155037

Change-Id: Ia302639c8e32d70191922d2b2be3524998b1cea1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-01 18:17:40 +00:00
Steven Moreland
0cb7db439d [automerger skipped] Remove vendor_service. am: 2808c8b289 -s ours am: 8354f470a4 -s ours am: 1cd11b0bae -s ours 
am skip reason: Merged-In I4766227e2261d0d57be090933926ff3b439694f6 with SHA-1 b20e917ebf is already in history

Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2155037

Change-Id: I574a62e51fefd43bb174b5a1e6ad097dab6570ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-01 18:17:39 +00:00
Steven Moreland
235c5c3ba6 [automerger skipped] Merge "Remove vendor_service." am: c6545d33ff -s ours am: f200aa0cee -s ours 
am skip reason: Merged-In I4766227e2261d0d57be090933926ff3b439694f6 with SHA-1 b20e917ebf is already in history

Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2155037

Change-Id: I2ab3c0e8d7fdb7e26e7b0b0ab79caf9ce39a93d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-01 17:52:32 +00:00
Steven Moreland
1cd11b0bae [automerger skipped] Remove vendor_service. am: 2808c8b289 -s ours am: 8354f470a4 -s ours 
am skip reason: Merged-In I4766227e2261d0d57be090933926ff3b439694f6 with SHA-1 b20e917ebf is already in history

Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2155037

Change-Id: I1151cb806654e2e37f1ea1f862dfff41810c1759
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-01 17:52:30 +00:00
Steven Moreland
f200aa0cee [automerger skipped] Merge "Remove vendor_service." am: c6545d33ff -s ours 
am skip reason: Merged-In I4766227e2261d0d57be090933926ff3b439694f6 with SHA-1 b20e917ebf is already in history

Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2155037

Change-Id: Ieb341a369cd4d986dbfc47b0106202cd4a6e7e74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-01 17:26:20 +00:00
Steven Moreland
8354f470a4 [automerger skipped] Remove vendor_service. am: 2808c8b289 -s ours 
am skip reason: Merged-In I4766227e2261d0d57be090933926ff3b439694f6 with SHA-1 b20e917ebf is already in history

Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2155037

Change-Id: I43b7480f97cc201f0b092ffa73ed0d92cab75296
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-01 17:26:18 +00:00
Steven Moreland
c6545d33ff Merge "Remove vendor_service." 2022-08-01 17:07:40 +00:00
Steven Moreland
58182caeeb [automerger skipped] Remove vendor_service. am: b20e917ebf -s ours am: 4783ac2aff -s ours am: 83ca4acec8 -s ours 
am skip reason: Merged-In I4766227e2261d0d57be090933926ff3b439694f6 with SHA-1 81ccf8d719 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/19469145

Change-Id: Icb77dd094be072bf8d07f03802c1d46a27d0cfe5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-29 23:54:12 +00:00
Steven Moreland
83ca4acec8 [automerger skipped] Remove vendor_service. am: b20e917ebf -s ours am: 4783ac2aff -s ours 
am skip reason: Merged-In I4766227e2261d0d57be090933926ff3b439694f6 with SHA-1 81ccf8d719 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/19469145

Change-Id: I0ef0aea6a565a74af895e2ae8086fd3dfcb814b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-29 23:31:53 +00:00
Steven Moreland
4783ac2aff [automerger skipped] Remove vendor_service. am: b20e917ebf -s ours 
am skip reason: Merged-In I4766227e2261d0d57be090933926ff3b439694f6 with SHA-1 81ccf8d719 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/19469145

Change-Id: Ie309da7f885d4a61d47270cf7c122f78846cca87
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-29 23:07:04 +00:00
Steven Moreland
b20e917ebf Remove vendor_service. 
We want to avoid associating types with where they can be used.

Bug: 237115222
Test: build
Change-Id: I4766227e2261d0d57be090933926ff3b439694f6
Merged-In: I4766227e2261d0d57be090933926ff3b439694f6
(cherry picked from commit 81ccf8d719)
 2022-07-29 18:34:05 +00:00
Roger Liao
68ddcb629a Fix build break if BOARD_WITHOUT_RADIO am: 5ea60d6348 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/19447103

Change-Id: I5659941108a8504cd4ea13e22f075a8cdcf60749
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-29 06:57:24 +00:00
Roger Liao
5ea60d6348 Fix build break if BOARD_WITHOUT_RADIO 
Fix ERROR 'unknown type radio_vendor_data_file'

Bug: 235907512
Change-Id: I55e88c9364b42db262c057a2aa85816944c1c761
 2022-07-28 17:59:28 +08:00
Steven Moreland
829119e383 Merge "Remove vendor_service." into tm-dev-plus-aosp am: be1bd1eebb am: 6a8d151ba8 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/19441276

Change-Id: Ibef456a15a20694227afe25289387c1caa2bcd0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-28 01:57:45 +00:00
Steven Moreland
6a8d151ba8 Merge "Remove vendor_service." into tm-dev-plus-aosp am: be1bd1eebb 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/19441276

Change-Id: Ia9526d71defecd28580dfd6f4619a88dc87ea58f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-28 01:08:22 +00:00
Steven Moreland
be1bd1eebb Merge "Remove vendor_service." into tm-dev-plus-aosp 2022-07-28 00:46:47 +00:00
Tri Vo
cd428bcab4 storageproxyd: Remove setuid/setgid SELinux permissions am: 78011e9f3a am: a68844f3e1 am: e4f4a40a0c am: 121cb7702d 
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2154700

Change-Id: I7bba70c4cc7cbd1d6298310b60659c6272b5ff3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-27 21:27:22 +00:00
Tri Vo
121cb7702d storageproxyd: Remove setuid/setgid SELinux permissions am: 78011e9f3a am: a68844f3e1 am: e4f4a40a0c 
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2154700

Change-Id: Id91151413c15852b94afcda312c7890fb78c096c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-27 20:33:41 +00:00
Tri Vo
e4f4a40a0c storageproxyd: Remove setuid/setgid SELinux permissions am: 78011e9f3a am: a68844f3e1 
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2154700

Change-Id: Ie1ea9408063ebcf2ba49850d7ac208111328f116
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-27 20:09:28 +00:00
Tri Vo
a68844f3e1 storageproxyd: Remove setuid/setgid SELinux permissions am: 78011e9f3a 
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2154700

Change-Id: I611a9f1ecd6157c3d1f65c250c698a9ee00a0915
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-27 19:43:32 +00:00
Steven Moreland
81ccf8d719 Remove vendor_service. 
We want to avoid associating types with where they can be used.

Bug: 237115222
Test: build
Change-Id: I4766227e2261d0d57be090933926ff3b439694f6
 2022-07-27 16:50:03 +00:00
Steven Moreland
2808c8b289 Remove vendor_service. 
We want to avoid associating types with where they can be used.

Bug: 237115222
Test: build
Merged-In: I4766227e2261d0d57be090933926ff3b439694f6
Change-Id: I4766227e2261d0d57be090933926ff3b439694f6
 2022-07-27 00:28:49 +00:00
matthuang
c061348b1c Add security context for com.google.usf.non_wake_up/wakeup. am: c96220c282 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/19291365

Change-Id: Idd09818dc82348398e780db3ee81948d75ffda4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 01:47:05 +00:00
matthuang
c96220c282 Add security context for com.google.usf.non_wake_up/wakeup. 
Bug: 195077076
Test: Confirm there is no avc denied log.
Change-Id: I8600283d9ff2ebcb45df95e5259484a60921fb1a
 2022-07-18 15:12:45 +08:00
Tri Vo
78011e9f3a storageproxyd: Remove setuid/setgid SELinux permissions 
Bug: 205904330
Test: boot
Change-Id: Iefecc29752781151679e9f798330a36d14447df9
 2022-07-15 11:07:47 -07:00
SalmaxChang
c0f473a7a8 [automerger skipped] hal_dumpstate_default: fix avc error am: 2455329536 -s ours 
am skip reason: Merged-In Ib9625eefc367738bcd6594884b1f3b5e3ab5be54 with SHA-1 de88097de5 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/19035085

Change-Id: I508d88c27a9eee987654acc452d4f45129a8ed18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-15 07:38:25 +00:00
SalmaxChang
2455329536 hal_dumpstate_default: fix avc error 
avc: denied { search } for comm="dumpstate@1.1-s" name="modem_stat" dev="dm-44" ino=341 scontext=u:r:hal_dumpstate_default:s0 tcontext=u:object_r:modem_stat_data_file:s0 tclass=dir

Bug: 235963885
Change-Id: Ib9625eefc367738bcd6594884b1f3b5e3ab5be54
Merged-In: Ib9625eefc367738bcd6594884b1f3b5e3ab5be54
 2022-07-08 03:24:01 +00:00
TreeHugger Robot
df9d1731af Merge "Add acd-com.google.usf.non_wake_up file to AoC file context." into tm-qpr-dev am: 59d6e09682 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/18871451

Change-Id: I931993bfd0b94da00fed9e4ff6c25f95fdb9509a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-01 02:45:20 +00:00
TreeHugger Robot
59d6e09682 Merge "Add acd-com.google.usf.non_wake_up file to AoC file context." into tm-qpr-dev 2022-07-01 02:15:21 +00:00
Xin Li
bce330f037 [automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: 351260db12 -s ours am: 25bb42eb54 -s ours am: 37f3d28139 -s ours 
am skip reason: Merged-In Ib9625eefc367738bcd6594884b1f3b5e3ab5be54 with SHA-1 de88097de5 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/19093699

Change-Id: I22d734bfc6aa1ca4f63f10f63ad386433fa6173a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-30 00:02:09 +00:00
Xin Li
37f3d28139 [automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: 351260db12 -s ours am: 25bb42eb54 -s ours 
am skip reason: Merged-In Ib9625eefc367738bcd6594884b1f3b5e3ab5be54 with SHA-1 de88097de5 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/19093699

Change-Id: Ia4c9ae47f3f455d5b629f301937ade0f9f07359a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-29 22:56:26 +00:00
Xin Li
25bb42eb54 [automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: 351260db12 -s ours 
am skip reason: Merged-In Ib9625eefc367738bcd6594884b1f3b5e3ab5be54 with SHA-1 de88097de5 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/19093699

Change-Id: I39a8ce7402950e78469ba04412f430381f0d9f12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-29 22:12:56 +00:00
Xin Li
351260db12 Merge tm-dev-plus-aosp-without-vendor@8763363 
Bug: 236760014
Merged-In: Ib9625eefc367738bcd6594884b1f3b5e3ab5be54
Change-Id: I0f66cef4179df45ee56af588df1fe1b82b0f642a
 2022-06-27 23:37:34 +00:00
sashwinbalaji
fcf9cbcb83 thermal: added property persist.vendor.disable.thermal.dfs.control am: 1a4cd82bc8 am: 6ffe88201a am: 7bb947b88e am: cbbe4561a3 
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2133444

Change-Id: I97cdd61e0634bce617d72d4543d856c709b3bddf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-27 09:54:20 +00:00
sashwinbalaji
cbbe4561a3 thermal: added property persist.vendor.disable.thermal.dfs.control am: 1a4cd82bc8 am: 6ffe88201a am: 7bb947b88e 
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2133444

Change-Id: I4e27c835adfe73ef473b2afd2b303a36307e6ee9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-27 09:32:01 +00:00
sashwinbalaji
7bb947b88e thermal: added property persist.vendor.disable.thermal.dfs.control am: 1a4cd82bc8 am: 6ffe88201a 
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2133444

Change-Id: I71bd9b49f2dc76e1e50f0b35bd404f7c8660d5d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-27 09:07:19 +00:00
sashwinbalaji
6ffe88201a thermal: added property persist.vendor.disable.thermal.dfs.control am: 1a4cd82bc8 
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2133444

Change-Id: Ifc9b8e1d980dee52194a08805052f28bb2b7df8b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-27 08:49:10 +00:00
sashwinbalaji
1a4cd82bc8 thermal: added property persist.vendor.disable.thermal.dfs.control 
Updated the sepolicy to access tmu register

Bug: 235156080
Test: Used local build to verify security context of tmu_reg files
Change-Id: Ia2a274ec3424bfeec25ae24e762f8ad41cb7ae86
 2022-06-24 13:54:24 +08:00
SalmaxChang
7f2be55a04 [automerger skipped] modem_svc: Fix avc error am: a9157994c3 -s ours 
am skip reason: Merged-In I51db41d73be317cc7fc84981ac5f04e254a360d0 with SHA-1 1be95c2e33 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/19024668

Change-Id: I1bc24cab890b9f10a620723013f44b782efaa8f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-22 09:44:04 +00:00
SalmaxChang
a9157994c3 modem_svc: Fix avc error 
avc: denied { write } for comm="modem_svc_sit" name="modem_stat" dev="dm-42" ino=331 scontext=u:r:modem_svc_sit:s0 tcontext=u:object_r:vendor_data_file:s0 tclass=dir permissive=0

Bug: 234844823
Change-Id: I51db41d73be317cc7fc84981ac5f04e254a360d0
Merged-In: I51db41d73be317cc7fc84981ac5f04e254a360d0
 2022-06-22 04:21:37 +00:00
SalmaxChang
d3dba796f9 hal_dumpstate_default: fix avc error am: de88097de5 am: 12053bbe8d am: ba3c6036fc am: 8bbd5d3430 
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2130236

Change-Id: Iecec85303b3b51cbd69f1ea8ca28448f0b0d80d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 03:07:39 +00:00
SalmaxChang
8bbd5d3430 hal_dumpstate_default: fix avc error am: de88097de5 am: 12053bbe8d am: ba3c6036fc 
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2130236

Change-Id: I1fafe1f2fe007191a32368f82b06985038ea029c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 02:41:35 +00:00
SalmaxChang
ba3c6036fc hal_dumpstate_default: fix avc error am: de88097de5 am: 12053bbe8d 
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2130236

Change-Id: I9167e7032d77a57f41f2592378b551b60f09a375
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 02:24:59 +00:00
SalmaxChang
12053bbe8d hal_dumpstate_default: fix avc error am: de88097de5 
Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2130236

Change-Id: Iaabe145decca9d0129a8f74a92782e5fe7ddcbcd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 02:05:20 +00:00
SalmaxChang
de88097de5 hal_dumpstate_default: fix avc error 
avc: denied { search } for comm="dumpstate@1.1-s" name="modem_stat" dev="dm-44" ino=341 scontext=u:r:hal_dumpstate_default:s0 tcontext=u:object_r:modem_stat_data_file:s0 tclass=dir

Bug: 235963885
Change-Id: Ib9625eefc367738bcd6594884b1f3b5e3ab5be54
 2022-06-20 15:55:16 +08:00
Xin Li
7370b90d0c [automerger skipped] Merge "Merge Android 12 QPR 3" am: cd158e3668 -s ours am: 4492e80320 -s ours am: 00e8d1827d -s ours am: 432d5becd9 -s ours 
am skip reason: Merged-In I289ba5aa69251d8575f4bd65fbeb7a38c3e03886 with SHA-1 203f473af5 is already in history

Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2126116

Change-Id: I2e61493424d6005b84e508a164dbdfc8cb620959
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-17 20:53:34 +00:00
Xin Li
418fc579cf [automerger skipped] Merge Android 12 QPR 3 am: 83d71652ff -s ours am: 5354139d04 -s ours am: 13407053a9 -s ours am: 71aa410b60 -s ours 
am skip reason: Merged-In I289ba5aa69251d8575f4bd65fbeb7a38c3e03886 with SHA-1 203f473af5 is already in history

Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2126116

Change-Id: I3aa710139ea78361344a91540ff74a129ad9cd42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-17 20:52:32 +00:00
Xin Li
432d5becd9 [automerger skipped] Merge "Merge Android 12 QPR 3" am: cd158e3668 -s ours am: 4492e80320 -s ours am: 00e8d1827d -s ours 
am skip reason: Merged-In I289ba5aa69251d8575f4bd65fbeb7a38c3e03886 with SHA-1 203f473af5 is already in history

Original change: https://android-review.googlesource.com/c/device/google/gs101-sepolicy/+/2126116

Change-Id: I59891a9fc89b4b576b05593188ee8c5c19149b9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-17 19:57:16 +00:00