diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2019-06-05 03:03:08 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-06-05 03:03:08 +0000 |
| commit | 6cd40a48ed742a61e8c8edc8f246e76e515eaa0f (patch) | |
| tree | 7dac80a9dbfc486cf9b3685d48a97d510917581f | |
| parent | 304f24715477bd48aa03caeda4791b666a699ffe (diff) | |
| parent | a3a24dee1c9a3e59dfa86db0317452343863d796 (diff) | |
| download | atv-6cd40a48ed742a61e8c8edc8f246e76e515eaa0f.tar.gz | |
Snap for 5633838 from a3a24dee1c9a3e59dfa86db0317452343863d796 to qt-release
Change-Id: I83e6c3999bb6b84090d32fdccfa8cd4e9be4534d
| -rw-r--r-- | permissions/privapp-permissions-atv-gsi.xml | 41 | ||||
| -rw-r--r-- | products/treble_atv_common.mk | 8 |
2 files changed, 43 insertions, 6 deletions
diff --git a/permissions/privapp-permissions-atv-gsi.xml b/permissions/privapp-permissions-atv-gsi.xml new file mode 100644 index 0000000..92550a9 --- /dev/null +++ b/permissions/privapp-permissions-atv-gsi.xml @@ -0,0 +1,41 @@ +<?xml version="1.0" encoding="utf-8"?> +<permissions> + <privapp-permissions package="com.android.connectivity.metrics"> + <permission name="android.permission.DUMP"/> + <permission name="android.permission.MODIFY_PHONE_STATE"/> + <permission name="android.permission.PACKAGE_USAGE_STATS"/> + </privapp-permissions> + + <privapp-permissions package="com.android.tv.provision"> + <permission name="android.permission.MANAGE_USERS"/> + <permission name="android.permission.WRITE_SECURE_SETTINGS"/> + </privapp-permissions> + + <privapp-permissions package="com.android.tv.settings"> + <permission name="android.permission.BACKUP"/> + <permission name="android.permission.DELETE_CACHE_FILES"/> + <permission name="android.permission.DUMP"/> + <permission name="android.permission.FORCE_STOP_PACKAGES"/> + <permission name="android.permission.GET_ACCOUNTS_PRIVILEGED"/> + <permission name="android.permission.MANAGE_USERS"/> + <permission name="android.permission.OVERRIDE_WIFI_CONFIG"/> + <permission name="android.permission.REBOOT"/> + <permission name="android.permission.SET_TIME"/> + <permission name="android.permission.SET_TIME_ZONE"/> + <permission name="android.permission.USE_RESERVED_DISK"/> + <permission name="android.permission.WRITE_MEDIA_STORAGE"/> + <permission name="android.permission.WRITE_SECURE_SETTINGS"/> + </privapp-permissions> + + <privapp-permissions package="com.google.android.tv"> + <permission name="android.permission.CHANGE_HDMI_CEC_ACTIVE_SOURCE"/> + <permission name="android.permission.DVB_DEVICE"/> + <permission name="android.permission.HDMI_CEC"/> + <permission name="android.permission.MODIFY_PARENTAL_CONTROLS"/> + <permission name="android.permission.READ_CONTENT_RATING_SYSTEMS"/> + </privapp-permissions> + + <privapp-permissions package="com.example.sampleleanbacklauncher"> + <permission name="android.permission.ACCESS_NOTIFICATIONS"/> + </privapp-permissions> +</permissions> diff --git a/products/treble_atv_common.mk b/products/treble_atv_common.mk index b01ac86..c7d64ce 100644 --- a/products/treble_atv_common.mk +++ b/products/treble_atv_common.mk @@ -62,10 +62,8 @@ PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \ netutils-wrapper-1.0 -# Support for the devices with no VNDK enforcing PRODUCT_COPY_FILES += \ - build/make/target/product/vndk/init.gsi.rc:system/etc/init/init.gsi.rc \ - build/make/target/product/vndk/init.noenforce.rc:system/etc/init/gsi/init.noenforce.rc + build/make/target/product/gsi/init.gsi.rc:system/etc/init/init.gsi.rc # Name space configuration file for non-enforcing VNDK PRODUCT_PACKAGES += \ @@ -77,6 +75,4 @@ PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \ # privapp-permissions whitelisting PRODUCT_COPY_FILES += \ - vendor/google/data/etc/permissions/privapp-permissions-atv.xml:system/etc/permissions/privapp-permissions-atv.xml - -$(call inherit-product, vendor/google/data/etc/permissions/privapp-permissions-google.mk) + device/google/atv/permissions/privapp-permissions-atv-gsi.xml:system/etc/permissions/privapp-permissions-atv-gsi.xml |