From cdfe5e4f554fe7269c1234a838dbc9ea8ce63ab1 Mon Sep 17 00:00:00 2001
From: Bert McMeen <amcmeen@google.com>
Date: Tue, 28 Jun 2016 16:24:13 -0700
Subject: [PATCH] Docs: Links added to pages for permissions and configuration
 activity

Bug: 28864917
Change-Id: Ieab325f20dac3bba6028e5c70813d4035063d0cf
---
 docs/html/wear/preview/features/complications.jd | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/docs/html/wear/preview/features/complications.jd b/docs/html/wear/preview/features/complications.jd
index d33fd2a789e5f..3334cb79b1430 100644
--- a/docs/html/wear/preview/features/complications.jd
+++ b/docs/html/wear/preview/features/complications.jd
@@ -113,8 +113,8 @@ page.image=/wear/preview/images/complications-main-image.png
 
     <p>
       To start receiving complication data, a watch face calls
-      <code>setActiveComplications</code> within the
-      <code>WatchFaceService.Engine</code> class with a list of watch face
+      <code>setActiveComplications</code>, in the
+      <code>WatchFaceService.Engine</code> class, with a list of watch face
       complication IDs. A watch face creates these IDs to uniquely identify
       slots on the watch face where complications can appear, and passes them
       to the <code>createProviderChooserIntent</code> method (of the
@@ -283,7 +283,12 @@ android.support.wearable.complications.UPDATE_PERIOD_SECONDS
     </p>
 
     <p>
-      The configuration activity may also be used as an opportunity to request
+      If a data provider needs a specific permission to access a user's data,
+      then standard code
+      for runtime <a href="{@docRoot}training/articles/wear-permissions.html">
+      permissions</a> is needed.
+      A <a href="{@docRoot}training/wearables/watch-faces/configuration.html">
+      configuration activity</a> may be used as an opportunity to request
       any permissions required by the provider.
     </p>