diff options
| author | Sungsoo Lim <sungsoo@google.com> | 2015-04-06 12:04:52 +0900 |
|---|---|---|
| committer | Sungsoo Lim <sungsoo@google.com> | 2015-04-07 13:46:34 +0900 |
| commit | 3e1dafbb10f20c041de4009fc7f7117586293968 (patch) | |
| tree | 0c641ed0f1e0d2fc6f5e020467c584c1aba22c95 | |
| parent | 8a19d38ddce31cec1efef6abcccc508028b3b79a (diff) | |
| download | android_device_google_atv-3e1dafbb10f20c041de4009fc7f7117586293968.tar.gz android_device_google_atv-3e1dafbb10f20c041de4009fc7f7117586293968.tar.bz2 android_device_google_atv-3e1dafbb10f20c041de4009fc7f7117586293968.zip | |
Add a feature com.google.android.tv.live_channels
The feature will be used for whitelisting devices which can support
Live Channels app in Play Store.
Bug: 18755988
Change-Id: Ie4985c10cff794915149352bfef7c3a6fbd72c86
| -rw-r--r-- | permissions/com.google.android.tv.live_channels.xml | 18 | ||||
| -rw-r--r-- | permissions/tv_core_hardware.xml (renamed from tv_core_hardware.xml) | 0 | ||||
| -rw-r--r-- | products/atv_base.mk | 9 |
3 files changed, 26 insertions, 1 deletions
diff --git a/permissions/com.google.android.tv.live_channels.xml b/permissions/com.google.android.tv.live_channels.xml new file mode 100644 index 0000000..de0dc98 --- /dev/null +++ b/permissions/com.google.android.tv.live_channels.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright 2015 Google Inc. All rights reserved. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<permissions> + <feature name="com.google.android.tv.live_channels" /> +</permissions> diff --git a/tv_core_hardware.xml b/permissions/tv_core_hardware.xml index 7ea515f..7ea515f 100644 --- a/tv_core_hardware.xml +++ b/permissions/tv_core_hardware.xml diff --git a/products/atv_base.mk b/products/atv_base.mk index 12ec75d..d85c40a 100644 --- a/products/atv_base.mk +++ b/products/atv_base.mk @@ -22,7 +22,7 @@ PRODUCT_PACKAGES := \ tv_input.default PRODUCT_COPY_FILES := \ - device/google/atv/tv_core_hardware.xml:system/etc/permissions/tv_core_hardware.xml + device/google/atv/permissions/tv_core_hardware.xml:system/etc/permissions/tv_core_hardware.xml DEVICE_PACKAGE_OVERLAYS := \ device/google/atv/overlay @@ -100,6 +100,13 @@ 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) + PRODUCT_COPY_FILES += \ + device/google/atv/permissions/com.google.android.tv.live_channels.xml:system/etc/permissions/com.google.android.tv.live_channels.xml +endif + $(call inherit-product-if-exists, frameworks/base/data/sounds/AllAudio.mk) $(call inherit-product-if-exists, external/svox/pico/lang/all_pico_languages.mk) $(call inherit-product-if-exists, frameworks/base/data/fonts/fonts.mk) |