From 69ffa902be28e8874d1ad70d3e947274f6ff57c8 Mon Sep 17 00:00:00 2001 From: Wilson Sung Date: Thu, 24 Oct 2024 08:05:26 +0000 Subject: [PATCH 1/2] Remove the duplicate gxp rule Bug: 375108715 Test: build Flag: EXEMPT bugfix Change-Id: I8d4aa27c963709a91b1284921a20d7fc5d369d89 --- gxp/sepolicy/dump_gxp.te | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gxp/sepolicy/dump_gxp.te b/gxp/sepolicy/dump_gxp.te index 8d285c5..322a01f 100644 --- a/gxp/sepolicy/dump_gxp.te +++ b/gxp/sepolicy/dump_gxp.te @@ -1,3 +1,4 @@ +# Dump GXP logs to bugreport. pixel_bugreport(dump_gxp) userdebug_or_eng(` @@ -7,7 +8,5 @@ userdebug_or_eng(` allow dump_gxp sscoredump_vendor_data_coredump_file:file r_file_perms; allow dump_gxp sscoredump_vendor_data_crashinfo_file:dir r_dir_perms; allow dump_gxp sscoredump_vendor_data_crashinfo_file:file r_file_perms; - # Allow dump_gxp to access gxp properties. - get_prop(google_camera_app, vendor_gxp_prop) ') From 4352bbc13d1b7280ad138a4ddd9a48a47038c1ab Mon Sep 17 00:00:00 2001 From: Wilson Sung Date: Thu, 24 Oct 2024 09:27:33 +0000 Subject: [PATCH 2/2] Move camera type back to project Bug: 375108715 Test: build Flag: EXEMPT bugfix Change-Id: I3fe71ed2249903e703590c43ae675d67588a87a5 --- gcam_app/sepolicy/product/public/debug_camera_app.te | 2 -- gcam_app/sepolicy/product/public/google_camera_app.te | 2 -- 2 files changed, 4 deletions(-) delete mode 100644 gcam_app/sepolicy/product/public/debug_camera_app.te delete mode 100644 gcam_app/sepolicy/product/public/google_camera_app.te diff --git a/gcam_app/sepolicy/product/public/debug_camera_app.te b/gcam_app/sepolicy/product/public/debug_camera_app.te deleted file mode 100644 index 0572eee..0000000 --- a/gcam_app/sepolicy/product/public/debug_camera_app.te +++ /dev/null @@ -1,2 +0,0 @@ -# GCA-Eng and GCA-Next -type debug_camera_app, domain; diff --git a/gcam_app/sepolicy/product/public/google_camera_app.te b/gcam_app/sepolicy/product/public/google_camera_app.te deleted file mode 100644 index a8d6512..0000000 --- a/gcam_app/sepolicy/product/public/google_camera_app.te +++ /dev/null @@ -1,2 +0,0 @@ -# GCA-Release and GCA-Dogfood -type google_camera_app, domain;