diff options
| author | Ji-Hwan Lee <jihwan@google.com> | 2014-06-17 17:45:14 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-17 17:45:14 +0000 |
| commit | 58e82ae7b140f911cdb16edeb5939bfea8a43c17 (patch) | |
| tree | bd7c72cb29817db6a606756a773dfd391f317587 | |
| parent | bf5193c9b7f0def773fdae838286223734a1839d (diff) | |
| parent | 37970d11ca6fa3766ff159fedac93cd85180fc76 (diff) | |
| download | device_google_atv-58e82ae7b140f911cdb16edeb5939bfea8a43c17.tar.gz device_google_atv-58e82ae7b140f911cdb16edeb5939bfea8a43c17.tar.bz2 device_google_atv-58e82ae7b140f911cdb16edeb5939bfea8a43c17.zip | |
am 37970d11: Add TelephonyProvider and rild to ATV emulator targets
* commit '37970d11ca6fa3766ff159fedac93cd85180fc76':
Add TelephonyProvider and rild to ATV emulator targets
| -rw-r--r-- | products/atv_generic.mk | 8 | ||||
| -rw-r--r-- | products/atv_sdk.mk | 4 | ||||
| -rw-r--r-- | sdk_overlay/frameworks/base/core/res/res/values/config.xml | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/products/atv_generic.mk b/products/atv_generic.mk index 5883e41..de8aa22 100644 --- a/products/atv_generic.mk +++ b/products/atv_generic.mk @@ -14,13 +14,17 @@ # limitations under the License. # -PRODUCT_COPY_FILES := \ - device/google/atv/config.ini:config.ini +PRODUCT_PACKAGES := \ + TelephonyProvider \ + rild DEVICE_PACKAGE_OVERLAYS := \ device/google/atv/sdk_overlay \ development/sdk_overlay +PRODUCT_COPY_FILES := \ + device/google/atv/config.ini:config.ini + # Put en_US first in the list, so make it default. PRODUCT_LOCALES := en_US diff --git a/products/atv_sdk.mk b/products/atv_sdk.mk index 60cb233..0004cda 100644 --- a/products/atv_sdk.mk +++ b/products/atv_sdk.mk @@ -15,8 +15,10 @@ # PRODUCT_PACKAGES := \ + EmulatorSmokeTests \ + TelephonyProvider \ audio.primary.goldfish \ - EmulatorSmokeTests + rild DEVICE_PACKAGE_OVERLAYS := \ device/google/atv/sdk_overlay \ diff --git a/sdk_overlay/frameworks/base/core/res/res/values/config.xml b/sdk_overlay/frameworks/base/core/res/res/values/config.xml index 41d5669..110752f 100644 --- a/sdk_overlay/frameworks/base/core/res/res/values/config.xml +++ b/sdk_overlay/frameworks/base/core/res/res/values/config.xml @@ -19,10 +19,4 @@ <!-- development/sdk_overlay enables voice. Reset to data-only. --> <bool name="config_voice_capable">false</bool> - <!-- development/sdk_overlay enables only default location providers. - Add a mock location provider for network location. --> - <string-array name="config_testLocationProviders" translatable="false"> - <item>network,false,false,false,false,true,true,true,1,2</item> - </string-array> - </resources> |