diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2018-07-26 16:31:01 -0700 |
|---|---|---|
| committer | Eino-Ville Talvala <etalvala@google.com> | 2018-09-13 17:22:54 +0000 |
| commit | 83473beaa6f00553ec1ece6de490a02ff1124b6c (patch) | |
| tree | 4865fed5bef11c3f638ae8fd2423ac947a69717b | |
| parent | 6f64bf6dd5ac38c8a4f739c05084e20a59ef0741 (diff) | |
Allow GoogleCameraNext to use google_camera_app domain
GoogleCameraNext is the in-dogfood version of GoogleCamera, and needs
access to the same resources as the release version does.
(cherry picked from commit 8246ae0eb5bd51551f9d1aed58a5565c2a0ef0d3)
Test: adb shell ps -O LABEL -p `adb shell pidof com.google.android.googlecamera.fishfood` shows
google_camera_app security label after installing and starting GoogleCameraNext
Bug: 115554881
Change-Id: I835f644fb32dcb46d477e6baf7288f6363e1e4e4
| -rw-r--r-- | vendor/google/certs/pulse-release.x509.pem | 15 | ||||
| -rw-r--r-- | vendor/google/keys.conf | 3 | ||||
| -rw-r--r-- | vendor/google/mac_permissions.xml | 3 | ||||
| -rw-r--r-- | vendor/qcom/common/seapp_contexts | 5 |
4 files changed, 25 insertions, 1 deletions
diff --git a/vendor/google/certs/pulse-release.x509.pem b/vendor/google/certs/pulse-release.x509.pem new file mode 100644 index 0000000..fb11572 --- /dev/null +++ b/vendor/google/certs/pulse-release.x509.pem @@ -0,0 +1,15 @@ +-----BEGIN CERTIFICATE----- +MIICUjCCAbsCBEk0mH4wDQYJKoZIhvcNAQEEBQAwcDELMAkGA1UEBhMCVVMxCzAJ +BgNVBAgTAkNBMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRQwEgYDVQQKEwtHb29n +bGUsIEluYzEUMBIGA1UECxMLR29vZ2xlLCBJbmMxEDAOBgNVBAMTB1Vua25vd24w +HhcNMDgxMjAyMDIwNzU4WhcNMzYwNDE5MDIwNzU4WjBwMQswCQYDVQQGEwJVUzEL +MAkGA1UECBMCQ0ExFjAUBgNVBAcTDU1vdW50YWluIFZpZXcxFDASBgNVBAoTC0dv +b2dsZSwgSW5jMRQwEgYDVQQLEwtHb29nbGUsIEluYzEQMA4GA1UEAxMHVW5rbm93 +bjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAn0gDGZD5sUcmOE4EU9GPjAu/ +jcd7JQSksSB8TGxEurwArcZhD6a2qy2oDjPy7vFrJqP2uFua+sqQn/u+s/TJT36B +IqeY4OunXO090in6c2X0FRZBWqnBYX3Vg84Zuuigu9iF/BeptL0mQIBRIarbk3fe +tAATOBQYiC7FIoL8WA0CAwEAATANBgkqhkiG9w0BAQQFAAOBgQBAhmae1jHaQ4Td +0GHSJuBzuYzEuZ34teS+njy+l1Aeg98cb6lZwM5gXE/SrG0chM7eIEdsurGb6PIg +Ov93F61lLY/MiQcI0SFtqERXWSZJ4OnTxLtM9Y2hnbHU/EG8uVhPZOZfQQ0FKf1b +aIOMFB0Km9HbEZHLKg33kOoMsS2zpA== +-----END CERTIFICATE----- diff --git a/vendor/google/keys.conf b/vendor/google/keys.conf index 4a78849..b5e23b9 100644 --- a/vendor/google/keys.conf +++ b/vendor/google/keys.conf @@ -12,5 +12,8 @@ USER : device/google/crosshatch-sepolicy/vendor/google/certs/tango_userde [@GOOGLE] ALL : device/google/crosshatch-sepolicy/vendor/google/certs/app.x509.pem +[@GOOGLEPULSE] +ALL : device/google/crosshatch-sepolicy/vendor/google/certs/pulse-release.x509.pem + [@EASEL] ALL : device/google/crosshatch-sepolicy/vendor/google/certs/easel.x509.pem diff --git a/vendor/google/mac_permissions.xml b/vendor/google/mac_permissions.xml index 401dc83..9350761 100644 --- a/vendor/google/mac_permissions.xml +++ b/vendor/google/mac_permissions.xml @@ -24,6 +24,9 @@ <signer signature="@GOOGLE" > <seinfo value="google" /> </signer> + <signer signature="@GOOGLEPULSE" > + <seinfo value="googlepulse" /> + </signer> <signer signature="@TANGO" > <seinfo value="tango" /> </signer> diff --git a/vendor/qcom/common/seapp_contexts b/vendor/qcom/common/seapp_contexts index f5f6dca..070cf7e 100644 --- a/vendor/qcom/common/seapp_contexts +++ b/vendor/qcom/common/seapp_contexts @@ -22,7 +22,10 @@ user=_app seinfo=platform name=com.google.android.factoryota domain=factory_ota_ user=_app seinfo=platform name=com.google.android.hardwareinfo domain=hardware_info_app type=app_data_file levelFrom=user # Use a custom domain for GoogleCamera, to allow for Hexagon DSP access -user=_app seinfo=google name=com.google.android.GoogleCamera domain=google_camera_app type=app_data_file levelFrom=user +user=_app seinfo=google name=com.google.android.GoogleCamera domain=google_camera_app type=app_data_file levelFrom=all + +# Also allow GoogleCameraNext, the dogfood beta version, the same access as GoogleCamera +user=_app seinfo=googlepulse name=com.google.android.apps.googlecamera.fishfood domain=google_camera_app type=app_data_file levelFrom=all #Needed for time service apk user=_app seinfo=platform name=com.qualcomm.timeservice domain=timeservice_app type=app_data_file |