diff options
| author | Sungsoo Lim <sungsoo@google.com> | 2015-04-14 00:36:38 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-14 00:36:40 +0000 |
| commit | ef2eaa9697a668f067e1fd44327f4eacc0a6f4f1 (patch) | |
| tree | 1699e860cbca139a49ec80fa35b91d9ae04c361e | |
| parent | e1eaacd52d8c677007be465f7e6f32f9b8b0607b (diff) | |
| parent | 0a44cdbee4ef0e1f5b08e798c08c030c0deedb80 (diff) | |
| download | android_device_google_atv-ef2eaa9697a668f067e1fd44327f4eacc0a6f4f1.tar.gz android_device_google_atv-ef2eaa9697a668f067e1fd44327f4eacc0a6f4f1.tar.bz2 android_device_google_atv-ef2eaa9697a668f067e1fd44327f4eacc0a6f4f1.zip | |
Merge "TV pakcage and com.google.android.tv.installed feature policy"
| -rw-r--r-- | permissions/com.google.android.tv.installed.xml (renamed from permissions/com.google.android.tv.live_channels.xml) | 2 | ||||
| -rw-r--r-- | products/atv_base.mk | 11 |
2 files changed, 8 insertions, 5 deletions
diff --git a/permissions/com.google.android.tv.live_channels.xml b/permissions/com.google.android.tv.installed.xml index de0dc98..41fa21f 100644 --- a/permissions/com.google.android.tv.live_channels.xml +++ b/permissions/com.google.android.tv.installed.xml @@ -14,5 +14,5 @@ limitations under the License. --> <permissions> - <feature name="com.google.android.tv.live_channels" /> + <feature name="com.google.android.tv.installed" /> </permissions> diff --git a/products/atv_base.mk b/products/atv_base.mk index e058157..7350135 100644 --- a/products/atv_base.mk +++ b/products/atv_base.mk @@ -100,11 +100,14 @@ EXTENDED_FONT_FOOTPRINT := true # Use full NotoSans font FONT_NOTOSANS_FULL := true -# A feature com.google.android.tv.live_channels is used to whitelist -# devices which can support Live Channels app -ifeq ($(USE_GMS_LIVECHANNELS),true) +# Do not include the Live Channels app if USE_OEM_TV_APP flag is set. +# The feature com.google.android.tv.installed is used to tell whether a device +# has the pre-installed Live Channels app. This is necessary for the Play Store +# to identify the compatible devices that can install later updates of the app. +ifneq ($(USE_OEM_TV_APP),true) + PRODUCT_PACKAGES += TV PRODUCT_COPY_FILES += \ - device/google/atv/permissions/com.google.android.tv.live_channels.xml:system/etc/permissions/com.google.android.tv.live_channels.xml + device/google/atv/permissions/com.google.android.tv.installed.xml:system/etc/permissions/com.google.android.tv.installed.xml endif $(call inherit-product-if-exists, frameworks/base/data/sounds/AllAudio.mk) |