summaryrefslogtreecommitdiffstats
path: root/docs/html/training
diff options
context:
space:
mode:
authorRobert Schaub <rschaub@google.com>2015-07-16 18:57:39 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-07-16 18:57:39 +0000
commit081649c2b5ffc1d9ea7a389cc9687659544a535e (patch)
tree1789f98c8e385e8e0285590bc16172be9b66631b /docs/html/training
parent8983420d30d3e962c519d7f9a5d8b8ea4bc3f42c (diff)
parentf4db2de881d197db0dfd76645dfd7a95b1f8f0de (diff)
downloadframeworks_base-081649c2b5ffc1d9ea7a389cc9687659544a535e.zip
frameworks_base-081649c2b5ffc1d9ea7a389cc9687659544a535e.tar.gz
frameworks_base-081649c2b5ffc1d9ea7a389cc9687659544a535e.tar.bz2
am f4db2de8: am 1b29a957: Merge "docs: Added "location" before "gps" in list under "Declaring hardware ..."" into mnc-preview-docs
* commit 'f4db2de881d197db0dfd76645dfd7a95b1f8f0de': docs: Added "location" before "gps" in list under "Declaring hardware ..."
Diffstat (limited to 'docs/html/training')
-rw-r--r--docs/html/training/tv/start/hardware.jd2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/html/training/tv/start/hardware.jd b/docs/html/training/tv/start/hardware.jd
index 57651e6..5747b56 100644
--- a/docs/html/training/tv/start/hardware.jd
+++ b/docs/html/training/tv/start/hardware.jd
@@ -163,7 +163,7 @@ if (uiModeManager.getCurrentModeType() == Configuration.UI_MODE_TYPE_TELEVISION)
android:required="false"/&gt;
&lt;uses-feature android:name="android.hardware.nfc"
android:required="false"/&gt;
-&lt;uses-feature android:name="android.hardware.gps"
+&lt;uses-feature android:name="android.hardware.location.gps"
android:required="false"/&gt;
&lt;uses-feature android:name="android.hardware.microphone"
android:required="false"/&gt;