Merge "Add selinux domain for verizon OBDM app" into oc-dr1-dev
diff --git a/default-permissions.xml b/default-permissions.xml
index 76f6a86..92b0613 100644
--- a/default-permissions.xml
+++ b/default-permissions.xml
@@ -52,12 +52,6 @@
</exception>
<exception
- package="com.google.android.soundpicker">
- <!-- External storage -->
- <permission name="android.permission.READ_EXTERNAL_STORAGE" fixed="false"/>
- </exception>
-
- <exception
package="com.verizon.mips.services">
<!-- Phone -->
<permission name="android.permission.READ_PHONE_STATE" fixed="false"/>
@@ -75,4 +69,16 @@
<permission name="android.permission.READ_PHONE_STATE" fixed="false"/>
</exception>
+ <exception
+ package="com.google.vr.apps.ornament"
+ sha256-cert-digest="4A:9E:3F:3B:C8:D6:0C:E4:D3:CB:E5:A9:C6:6E:EC:11:EF:D0:1C:5F:E9:C7:8D:8C:92:3B:9D:42:48:23:00:13">
+ <!-- Camera -->
+ <permission name="android.permission.CAMERA" fixed="false"/>
+ <!-- Microphone -->
+ <permission name="android.permission.RECORD_AUDIO" fixed="false"/>
+ <!-- Storage -->
+ <permission name="android.permission.READ_EXTERNAL_STORAGE" fixed="false"/>
+ <permission name="android.permission.WRITE_EXTERNAL_STORAGE" fixed="false"/>
+ </exception>
+
</exceptions>
diff --git a/device.mk b/device.mk
index 48838af..1b3ee7d 100755
--- a/device.mk
+++ b/device.mk
@@ -183,7 +183,8 @@
# Enable camera EIS3.0
PRODUCT_PROPERTY_OVERRIDES += \
persist.camera.is_type=5 \
- persist.camera.gzoom.at=0
+ persist.camera.gzoom.at=0 \
+ persist.camera.llv.fuse=2
# OEM Unlock reporting
PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
diff --git a/init.hardware.rc b/init.hardware.rc
index 497f0e3..7339b04 100644
--- a/init.hardware.rc
+++ b/init.hardware.rc
@@ -154,9 +154,6 @@
write /sys/block/zram0/comp_algorithm lz4
write /proc/sys/vm/page-cluster 0
- # Some user code relies on ro.boot.hardware.revision
- setprop ro.boot.hardware.revision ${ro.revision}
-
on fs
wait /dev/block/platform/soc/${ro.boot.bootdevice}
symlink /dev/block/platform/soc/${ro.boot.bootdevice} /dev/block/bootdevice
diff --git a/sepolicy/vendor/certs/arcore.x509.pem b/sepolicy/vendor/certs/arcore.x509.pem
new file mode 100644
index 0000000..df83d5e
--- /dev/null
+++ b/sepolicy/vendor/certs/arcore.x509.pem
@@ -0,0 +1,23 @@
+-----BEGIN CERTIFICATE-----
+MIIDvzCCAqegAwIBAgIJAMl7uSdzNfUbMA0GCSqGSIb3DQEBCwUAMHYxCzAJBgNV
+BAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1Nb3VudGFpbiBW
+aWV3MRQwEgYDVQQKDAtHb29nbGUgSW5jLjEQMA4GA1UECwwHQW5kcm9pZDESMBAG
+A1UEAwwJdnJfYXJjb3JlMB4XDTE3MDgwNDE2NTQ1OFoXDTQ0MTIyMDE2NTQ1OFow
+djELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcMDU1v
+dW50YWluIFZpZXcxFDASBgNVBAoMC0dvb2dsZSBJbmMuMRAwDgYDVQQLDAdBbmRy
+b2lkMRIwEAYDVQQDDAl2cl9hcmNvcmUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQC95hqS8Gj3DVcufC0jbwtlB7wyY2eBf1s3Ftj3ZpUCbD+ra1MZIMU8
+Y/sV3xzuyGbbx3r0W/ZqK1c8xO0xDR/03QJ2XKpaEHzRHZnWSyLSYsmq5Qe4XEuE
+s7Q6v7OorTxbfBTLpWm83Gq2z0a2DDN6y9FMeIY7UxSw0ty1hZDDGRKbqsEyfhYq
+/CDOSsBTdmYzMrNY57ANxm2Ap7F7xZAMrF8Fs6VRi/jHhaL8fgHC3sT5Ql3vhy+Z
+vOihZi7Al8mcV0jyzIzV5TtafSBFu5fMxb5dbMKG4EfgsIh7aobFmRhF1gi1jsJT
+NL1bwsPzl+TGZDRR5vSONY5aMUiBrbx1AgMBAAGjUDBOMB0GA1UdDgQWBBST4+Xw
+yTxGQMN8QvNf7f2Ew/5euTAfBgNVHSMEGDAWgBST4+XwyTxGQMN8QvNf7f2Ew/5e
+uTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQBBcjzoaU9GDOYpDQI2
+mD1/C5kdD9Y8UXP+jKUGPvBgFXBzdaNxyclClI30EiabwMOYQW06Ckn+QvRmESAt
+WJqt9PxsRRNKWmJ+A/irGAjJyQsiVVzfryeUg44Q+yRErL8wAV/kfHjVF44ZiUoq
+FCpErxjSNNLjtBGbaZid+gsBARnrUWrol6Zcuj1DWKUoCZHW6gTu86/GfgTJKHwV
+ABe+D89U4pI8RoykmWOTIcpWZZhrDFjJrIXnOqG/T9O3DK+sDigBPv1UhKJI6ucd
+dCDLQK3lmP+vvj/sXnxUU7zqrUSj6dyKJwCz4i8rXx9XijsX13J+JMtk23iJFeOo
+XjFY
+-----END CERTIFICATE-----
diff --git a/sepolicy/vendor/certs/arcore_release.x509.pem b/sepolicy/vendor/certs/arcore_release.x509.pem
new file mode 100644
index 0000000..de39c3d
--- /dev/null
+++ b/sepolicy/vendor/certs/arcore_release.x509.pem
@@ -0,0 +1,24 @@
+-----BEGIN CERTIFICATE-----
+MIIDxzCCAq+gAwIBAgIVANwoa0O06hIDmVigCmZV64RyDkbJMA0GCSqGSIb3DQEB
+CwUAMHQxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQH
+Ew1Nb3VudGFpbiBWaWV3MRQwEgYDVQQKEwtHb29nbGUgSW5jLjEQMA4GA1UECxMH
+QW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDAeFw0xNzA4MDQxNjUzMzdaFw00NzA4
+MDQxNjUzMzdaMHQxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYw
+FAYDVQQHEw1Nb3VudGFpbiBWaWV3MRQwEgYDVQQKEwtHb29nbGUgSW5jLjEQMA4G
+A1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBAImYZG9H/DM9sJZEwwMQTtGD6QTjURUqpmpgO3f2M4nU
+XW/P+uPJT63x8oA44mXWl/6jRzJ/kIGn8LkHTVsUjbW/NXxhGnf4f4RKFQaIGL3N
+WyHRh+k/olUWdhcO7c4EoVDDXsCnke71B/qbQGVzw29vIHdkhC5Wd+NaKBpCJlnp
+HibrT+z7BTtck20JdsN/h1ettXo3lT2lhE6jUGlYVNNDphrTQbY6HEJdIoVa9+v+
+4Bjhc2zumFNr5bmUfyiOKib5nrn5G13pP+zFEwGdLpDxKzhhDR8C6qgd7KTOkcGc
+vONtbDAlziQys9F4YWvq+vQ3wIRRvEaca8b0UXpxSlsCAwEAAaNQME4wDAYDVR0T
+BAUwAwEB/zAdBgNVHQ4EFgQUGahkwPJhjGfIA6I9qQm8cFIfJpswHwYDVR0jBBgw
+FoAUGahkwPJhjGfIA6I9qQm8cFIfJpswDQYJKoZIhvcNAQELBQADggEBAFQD/Fb9
+78RAN2oDN4FQArlqFb/8L+Qt5sWPUvrk2AZS43BEVbiFQJ7vgf+7TETboQS2uOJM
+ni4OegQzjuc7qltxv7RIj44EvvPQ6vfUOqQrA7J4wzzB8N04AlcWJLqhYdhR+rN9
+tLySuQlLaIXf9itADs2B8GnVahvh20bYGYxQyWKM2244aG72QP04Z3X1A3b5V+JO
+pF7RlClo8gyC8Ylgf9si8Rz9/Qdgp3pgzrNBbPs/SPE/n4Pzg0oBABdQp8eLwf2B
+8LU6fEHcup9aARglnQg8Mrueu4TWRdb2ucMZI9ircOfwollA7Mn0lFFEQZ+G6MQh
+07mXdPS489CSYuc=
+-----END CERTIFICATE-----
+
diff --git a/sepolicy/vendor/certs/arcore_userdev.x509.pem b/sepolicy/vendor/certs/arcore_userdev.x509.pem
new file mode 100644
index 0000000..8128ed2
--- /dev/null
+++ b/sepolicy/vendor/certs/arcore_userdev.x509.pem
@@ -0,0 +1,23 @@
+-----BEGIN CERTIFICATE-----
+MIIDmTCCAoGgAwIBAgIEXT5J7jANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJV
+UzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEU
+MBIGA1UEChMLR29vZ2xlIEluYy4xEDAOBgNVBAsTB0FuZHJvaWQxGTAXBgNVBAMM
+EGFyY29yZV91c2VyYnVpbGQwHhcNMTcwODA4MjIyMzUzWhcNNDQxMjI0MjIyMzUz
+WjB9MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMN
+TW91bnRhaW4gVmlldzEUMBIGA1UEChMLR29vZ2xlIEluYy4xEDAOBgNVBAsTB0Fu
+ZHJvaWQxGTAXBgNVBAMMEGFyY29yZV91c2VyYnVpbGQwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQDI+9aEC0Zg3Bjid1Pa/PWmC1tmyKx57QJIN/8kPq9b
+p3qH1fOVkCsNQq7lzmd4jT4m3weZPtwNCYWFQDnTzeywm6/1+kFg52ilPkKQiLc/
+Ew3YcJ5aSfACECP7GMwr3WpL/jsuVR11X2I98tvUJ0aOjwS1u25Z8AMscpZNOvE6
+MRcfmE/mcFKMqwFo5hGiAwirQznAykOcHZIwANAGiQMQkiidSvTMq/fDF6iP9giH
+xGvJqaLs55aNSTweMGLWGPjiNERxhA9bBo3vwMyMR6zM6PSPnYHhy/Xm7NwGVLBU
+gkHomhpQpGioaAnQes6mTvdR8SA+MpYQDNEoXbHx2eOpAgMBAAGjITAfMB0GA1Ud
+DgQWBBSdLVDMs0DfeLCiHxL07bCyNub7wzANBgkqhkiG9w0BAQUFAAOCAQEAggrm
+iZBZ8hpbN4IUaSy6HEiLuiQZoLXE8cegAGJGXg4Y95dtk+8tUQu3fSXY+RNbc0JZ
+FaYJN2deD3zRFC7nLjIMiHdo6+JE7W9s4omrLvm7rEs7tXszP2/JR3dvS+5III62
+9CrPf4DdAHYffeZJWXsGUmP+wBKb4TsVSO+8pcqM69178A9IvQ3EnLYRCZ0YDnwz
+IBDSBANEkAqTxDUMSi909ziusiAmHINcKelxAB8DhE6PuU0tcAfpqFOeZdh0T7hF
+fEwhLK6lklnP6DyEPgJiBYHsIP4jycc26Pa5OKDSv7kho/MvWLhCzDeTyOIg7LVu
+MgY5FIrpuaqIowB/4A==
+-----END CERTIFICATE-----
+
diff --git a/sepolicy/vendor/keys.conf b/sepolicy/vendor/keys.conf
index 9f18907..2b72a8b 100644
--- a/sepolicy/vendor/keys.conf
+++ b/sepolicy/vendor/keys.conf
@@ -11,3 +11,11 @@
[@EASEL]
ALL : device/google/wahoo/sepolicy/vendor/certs/easel.x509.pem
+
+[@ARCORE]
+ALL : device/google/wahoo/sepolicy/vendor/certs/arcore_release.x509.pem
+
+[@ARCORE_DEV]
+ENG : device/google/wahoo/sepolicy/vendor/certs/arcore.x509.pem
+USERDEBUG : device/google/wahoo/sepolicy/vendor/certs/arcore.x509.pem
+USER : device/google/wahoo/sepolicy/vendor/certs/arcore_userdev.x509.pem
diff --git a/sepolicy/vendor/mac_permissions.xml b/sepolicy/vendor/mac_permissions.xml
index 401dc83..95feba7 100644
--- a/sepolicy/vendor/mac_permissions.xml
+++ b/sepolicy/vendor/mac_permissions.xml
@@ -33,4 +33,10 @@
<signer signature="@EASEL" >
<seinfo value="easel" />
</signer>
+ <signer signature="@ARCORE" >
+ <seinfo value="arcore" />
+ </signer>
+ <signer signature="@ARCORE_DEV" >
+ <seinfo value="arcore" />
+ </signer>
</policy>
diff --git a/sepolicy/vendor/seapp_contexts b/sepolicy/vendor/seapp_contexts
index cad27de..d13ddad 100644
--- a/sepolicy/vendor/seapp_contexts
+++ b/sepolicy/vendor/seapp_contexts
@@ -11,9 +11,8 @@
user=system seinfo=platform name=.dataservices domain=dataservice_app type=system_app_data_file
# The default domain for tango_core / arcore process
-user=_app seinfo=tango name=com.google.tango domain=tango_core type=app_data_file levelFrom=user
-user=_app seinfo=tango name=com.google.tango.* domain=tango_core type=app_data_file levelFrom=user
-user=_app seinfo=tango name=com.google.arcore* domain=tango_core type=app_data_file levelFrom=user
+user=_app seinfo=tango name=com.google.tango* domain=tango_core type=app_data_file levelFrom=user
+user=_app seinfo=arcore name=com.google.ar.core* domain=tango_core type=app_data_file levelFrom=user
# A fallback in case tango_core is missing something critical that untrusted_app provides
user=_app seinfo=tango name=com.google.tango:app domain=untrusted_app type=app_data_file levelFrom=user
