summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJin Jeong <jinjeong@google.com>2023-05-24 01:47:06 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-05-24 01:47:06 +0000
commitce43cff57f0bd95859ff290c6cb777fb4bb8c7a0 (patch)
tree64ebb72ac6c0a94e6681a65f122738969d518ef5
parent74a3bc5ea218fb453f5d7ccbd4d43d088ec775db (diff)
parent59ca3da8f7efe35989ebaa4a807d27a7d25feee8 (diff)
downloadredbull-sepolicy-ce43cff57f0bd95859ff290c6cb777fb4bb8c7a0.tar.gz
Merge changes from topic "esim_prop" into udc-dev am: 59ca3da8f7
Original change: https://googleplex-android-review.googlesource.com/c/device/google/redbull-sepolicy/+/23167568 Change-Id: I4a86256497a3d0b5d7a9f6d004eba493a1acf976 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--private/property.te8
-rw-r--r--private/property_contexts3
-rw-r--r--vendor/google/certs/EuiccGoogle.x509.pem23
-rw-r--r--vendor/google/euicc_app.te13
-rw-r--r--vendor/google/keys.conf2
-rw-r--r--vendor/google/mac_permissions.xml3
-rw-r--r--vendor/google/seapp_contexts2
7 files changed, 0 insertions, 54 deletions
diff --git a/private/property.te b/private/property.te
deleted file mode 100644
index a6bee3b..0000000
--- 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 aaabea7..0000000
--- 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/google/certs/EuiccGoogle.x509.pem b/vendor/google/certs/EuiccGoogle.x509.pem
deleted file mode 100644
index be6c715..0000000
--- a/vendor/google/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/google/euicc_app.te b/vendor/google/euicc_app.te
deleted file mode 100644
index 2e36435..0000000
--- a/vendor/google/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/google/keys.conf b/vendor/google/keys.conf
index 1d8e9e2..26cd79f 100644
--- a/vendor/google/keys.conf
+++ b/vendor/google/keys.conf
@@ -10,5 +10,3 @@ ALL : device/google/redbull-sepolicy/vendor/google/certs/com_google_mds.x509.pem
[@EUICCSUPPORTPIXEL]
ALL : device/google/redbull-sepolicy/vendor/google/certs/EuiccSupportPixel.x509.pem
-[@EUICCGOOGLE]
-ALL : device/google/gs201-sepolicy/whitechapel_pro/certs/EuiccGoogle.x509.pem
diff --git a/vendor/google/mac_permissions.xml b/vendor/google/mac_permissions.xml
index 16b5ff0..070982f 100644
--- a/vendor/google/mac_permissions.xml
+++ b/vendor/google/mac_permissions.xml
@@ -33,7 +33,4 @@
<signer signature="@EUICCSUPPORTPIXEL" >
<seinfo value="EuiccSupportPixel" />
</signer>
- <signer signature="@EUICCGOOGLE" >
- <seinfo value="EuiccGoogle" />
- </signer>
</policy>
diff --git a/vendor/google/seapp_contexts b/vendor/google/seapp_contexts
index 9ba0889..feda6f8 100644
--- a/vendor/google/seapp_contexts
+++ b/vendor/google/seapp_contexts
@@ -32,5 +32,3 @@ user=_app seinfo=platform name=com.google.android.iphealthmonitor domain=ip_heal
# Domain for EuiccSupportPixel
user=_app isPrivApp=true seinfo=EuiccSupportPixel name=com.google.euiccpixel domain=euiccpixel_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