From f1471f5d65e10089f44fe136d54e73f4ba018770 Mon Sep 17 00:00:00 2001 From: cwkao Date: Thu, 24 Oct 2024 00:52:36 +0800 Subject: [PATCH] Share same seinfo between propsetter app and GCA. Bug: 375117470 Test: locally on komodo, the app functions as expected. Flag: EXEMPT NDK Change-Id: I60a6047835b23137391e3bd6edcfd1fb418a3e19 --- ...ndroid_apps_camera_tools_propsetter.x509.pem | 17 ----------------- vendor/keys.conf | 3 --- vendor/mac_permissions.xml | 3 --- vendor/seapp_contexts | 2 +- 4 files changed, 1 insertion(+), 24 deletions(-) delete mode 100644 vendor/certs/com_google_android_apps_camera_tools_propsetter.x509.pem diff --git a/vendor/certs/com_google_android_apps_camera_tools_propsetter.x509.pem b/vendor/certs/com_google_android_apps_camera_tools_propsetter.x509.pem deleted file mode 100644 index 011a9ec..0000000 --- a/vendor/certs/com_google_android_apps_camera_tools_propsetter.x509.pem +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICpzCCAmWgAwIBAgIEUAV8QjALBgcqhkjOOAQDBQAwNzELMAkGA1UEBhMCVVMx -EDAOBgNVBAoTB0FuZHJvaWQxFjAUBgNVBAMTDUFuZHJvaWQgRGVidWcwHhcNMTIw -NzE3MTQ1MjUwWhcNMjIwNzE1MTQ1MjUwWjA3MQswCQYDVQQGEwJVUzEQMA4GA1UE -ChMHQW5kcm9pZDEWMBQGA1UEAxMNQW5kcm9pZCBEZWJ1ZzCCAbcwggEsBgcqhkjO -OAQBMIIBHwKBgQD9f1OBHXUSKVLfSpwu7OTn9hG3UjzvRADDHj+AtlEmaUVdQCJR -+1k9jVj6v8X1ujD2y5tVbNeBO4AdNG/yZmC3a5lQpaSfn+gEexAiwk+7qdf+t8Yb -+DtX58aophUPBPuD9tPFHsMCNVQTWhaRMvZ1864rYdcq7/IiAxmd0UgBxwIVAJdg -UI8VIwvMspK5gqLrhAvwWBz1AoGBAPfhoIXWmz3ey7yrXDa4V7l5lK+7+jrqgvlX -TAs9B4JnUVlXjrrUWU/mcQcQgYC0SRZxI+hMKBYTt88JMozIpuE8FnqLVHyNKOCj -rh4rs6Z1kW6jfwv6ITVi8ftiegEkO8yk8b6oUZCJqIPf4VrlnwaSi2ZegHtVJWQB -TDv+z0kqA4GEAAKBgGrRG9fVZtJ69DnALkForP1FtL6FvJmMe5uOHHdUaT+MDUKK -pPzhEISBOEJPpozRMFJO7/bxNzhjgi+mNymL/k1GoLhmZe7wQRc5AQNbHIBqoxgY -DTA6qMyeWSPgam+r+nVoPEU7sgd3fPL958+xmxQwOBSqHfe0PVsiK1cGtIuUMAsG -ByqGSM44BAMFAAMvADAsAhQJ0tGwRwIptb7SkCZh0RLycMXmHQIUZ1ACBqeAULp4 -rscXTxYEf4Tqovc= ------END CERTIFICATE----- diff --git a/vendor/keys.conf b/vendor/keys.conf index 15d7596..fac7f2b 100644 --- a/vendor/keys.conf +++ b/vendor/keys.conf @@ -1,5 +1,2 @@ [@EUICCSUPPORTPIXEL] ALL : device/google/zumapro-sepolicy/vendor/certs/EuiccSupportPixel.x509.pem - -[@CAMERAPROPSETTER] -ALL : device/google/zumapro-sepolicy/vendor/certs/com_google_android_apps_camera_tools_propsetter.x509.pem diff --git a/vendor/mac_permissions.xml b/vendor/mac_permissions.xml index 03409ee..0eab982 100644 --- a/vendor/mac_permissions.xml +++ b/vendor/mac_permissions.xml @@ -24,7 +24,4 @@ - - - diff --git a/vendor/seapp_contexts b/vendor/seapp_contexts index 363e753..83802e7 100644 --- a/vendor/seapp_contexts +++ b/vendor/seapp_contexts @@ -2,4 +2,4 @@ user=_app isPrivApp=true seinfo=EuiccSupportPixel name=com.google.euiccpixel domain=euiccpixel_app type=app_data_file levelFrom=all # Camera propsetter app -user=_app seinfo=CameraPropsetter name=com.google.android.apps.camera.tools.propsetter domain=camera_propsetter_app type=app_data_file levelFrom=all +user=_app seinfo=CameraEng name=com.google.android.apps.camera.tools.propsetter domain=camera_propsetter_app type=app_data_file levelFrom=all