From b3c701b9c48f339441930d8a9bd66f21c972e6d4 Mon Sep 17 00:00:00 2001 From: Jin Jeong Date: Fri, 12 May 2023 04:20:27 +0000 Subject: [PATCH] Revert "[Zuma] Fix SeLinux error" This reverts commit 709ad06c0eb44fede8201299a53f5967efa50fe5. Reason for revert: b/279988311 we rename the vendor.modem property so we don't need to add the new rules Change-Id: Ibe56941737506158ef963bba2ae00035c5c11069 --- private/property.te | 8 -------- private/property_contexts | 3 --- vendor/certs/EuiccGoogle.x509.pem | 23 ----------------------- vendor/euicc_app.te | 13 ------------- vendor/keys.conf | 3 --- vendor/mac_permissions.xml | 3 --- vendor/seapp_contexts | 2 -- 7 files changed, 55 deletions(-) delete mode 100644 private/property.te delete mode 100644 private/property_contexts delete mode 100644 vendor/certs/EuiccGoogle.x509.pem delete mode 100644 vendor/euicc_app.te diff --git a/private/property.te b/private/property.te deleted file mode 100644 index a6bee3b3..00000000 --- a/private/property.te +++ /dev/null @@ -1,8 +0,0 @@ -product_restricted_prop(masterclear_esim_prop) -product_restricted_prop(euicc_seamless_transfer_prop) - -neverallow { domain -init } masterclear_esim_prop:property_service set; -neverallow { domain -init } euicc_seamless_transfer_prop:property_service set; - -get_prop(appdomain, masterclear_esim_prop) -get_prop(appdomain, euicc_seamless_transfer_prop) diff --git a/private/property_contexts b/private/property_contexts deleted file mode 100644 index aaabea72..00000000 --- a/private/property_contexts +++ /dev/null @@ -1,3 +0,0 @@ -#eSIM -masterclear.allow_retain_esim_profiles_after_fdr u:object_r:masterclear_esim_prop:s0 exact bool -euicc.seamless_transfer_enabled_in_non_qs u:object_r:euicc_seamless_transfer_prop:s0 exact bool diff --git a/vendor/certs/EuiccGoogle.x509.pem b/vendor/certs/EuiccGoogle.x509.pem deleted file mode 100644 index be6c715c..00000000 --- a/vendor/certs/EuiccGoogle.x509.pem +++ /dev/null @@ -1,23 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIDwzCCAqugAwIBAgIJAOZ2d46ckK9JMA0GCSqGSIb3DQEBCwUAMHgxCzAJBgNV -BAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1Nb3VudGFpbiBW -aWV3MRQwEgYDVQQKDAtHb29nbGUgSW5jLjEQMA4GA1UECwwHQW5kcm9pZDEUMBIG -A1UEAwwLRXVpY2NHb29nbGUwHhcNMTYxMjE3MDEyMTEzWhcNNDQwNTA0MDEyMTEz -WjB4MQswCQYDVQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTEWMBQGA1UEBwwN -TW91bnRhaW4gVmlldzEUMBIGA1UECgwLR29vZ2xlIEluYy4xEDAOBgNVBAsMB0Fu -ZHJvaWQxFDASBgNVBAMMC0V1aWNjR29vZ2xlMIIBIjANBgkqhkiG9w0BAQEFAAOC -AQ8AMIIBCgKCAQEA1S7b8bGk4fNm3cckWJx2sbnvC39BroHNwk6am6jVP4MZAYuc -PN6QQ7/2s7hvtn91w6VbeGi2fryIMc7jXjlixheotD2Ns+/7qsPpQ+ZovfaQO5Xw -/c4J+1CfiqrLtd4TyO+4uFGTCO/vs4qhMH58QrhnYPZUqeuq0Zs1Irp0FlVFe1qm -1heU2zJy5locjb9UJXY33sVc9vfWy+sM8TLX40nWxIXGdbzJHJNyjjr/NA+0+drx -anJCtac6+evehH6o8+t8RQBU44PEZiyGkM8poNgRTAcFdRFXU8pitZXp3QZQk6HO -JsVuqqADwsfxGSdVyHFmOW7gxpkB9+IuJJEmkQIDAQABo1AwTjAdBgNVHQ4EFgQU -lVkGDn/XmF7HjP0K3ykCNnnZ8jMwHwYDVR0jBBgwFoAUlVkGDn/XmF7HjP0K3ykC -NnnZ8jMwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAkDOpQMXcuKwt -CPu5/tdskpfoBMrpYJOwfvpj/JwrudnXUHZXnBnH9PtHprghGtNiWPXHTbZSzKUS -Aojpo1Lev7DtowFILA54oY6d1NqbCIJy+Knwt3W5H7Rg8u8LqvzkpX5CBKAhRwkQ -0t3yrlEkI7kx805vg484gAe+AXyBx0dGe6ov4/yrzv9E+1jhIgP7tF/f+x8zX6Tr -mDCjzz4mgKahMbmsHQg430wlbZczrciMMfPiRc3xEHKLUqGL0ARtE01hJiJ4TY/X -iL/8QUA3nBcpUyEwHFwUao40Gjca9xteKd7MtmiZ6BM2JJSQ4nSNkcwQW8PU/7Qb -0QMwPRPLbQ== ------END CERTIFICATE----- diff --git a/vendor/euicc_app.te b/vendor/euicc_app.te deleted file mode 100644 index 2e36435b..00000000 --- a/vendor/euicc_app.te +++ /dev/null @@ -1,13 +0,0 @@ -type euicc_app, domain; -app_domain(euicc_app) -net_domain(euicc_app) - -allow euicc_app app_api_service:service_manager find; -allow euicc_app radio_service:service_manager find; -allow euicc_app cameraserver_service:service_manager find; - -get_prop(euicc_app, camera_config_prop) -get_prop(euicc_app, setupwizard_esim_prop) -get_prop(euicc_app, bootloader_prop) -get_prop(euicc_app, exported_default_prop) -get_prop(euicc_app, vendor_modem_prop) diff --git a/vendor/keys.conf b/vendor/keys.conf index 91d38204..290a62b5 100644 --- a/vendor/keys.conf +++ b/vendor/keys.conf @@ -6,6 +6,3 @@ ALL : device/google/zuma-sepolicy/vendor/certs/camera_eng.x509.pem [@CAMERAFISHFOOD] ALL : device/google/zuma-sepolicy/vendor/certs/camera_fishfood.x509.pem - -[@EUICCGOOGLE] -ALL : device/google/zuma-sepolicy/vendor/certs/EuiccGoogle.x509.pem diff --git a/vendor/mac_permissions.xml b/vendor/mac_permissions.xml index f4eabf6c..8e8c3c23 100644 --- a/vendor/mac_permissions.xml +++ b/vendor/mac_permissions.xml @@ -30,7 +30,4 @@ - - - diff --git a/vendor/seapp_contexts b/vendor/seapp_contexts index b2777013..9c10fdde 100644 --- a/vendor/seapp_contexts +++ b/vendor/seapp_contexts @@ -33,5 +33,3 @@ user=_app isPrivApp=true name=com.google.pixel.digitalkey.timesync domain=vendor user=_app seinfo=platform name=com.android.systemui domain=systemui_app type=app_data_file levelFrom=all user=_app seinfo=platform name=com.android.systemui:* domain=systemui_app type=app_data_file levelFrom=all -# Domain for EuiccGoogle -user=_app isPrivApp=true seinfo=EuiccGoogle name=com.google.android.euicc domain=euicc_app type=app_data_file levelFrom=all