From 99e44c903c67512146c0c7c80e86a68185fdecd3 Mon Sep 17 00:00:00 2001
From: "smain@google.com" <smain@google.com>
Date: Fri, 26 Aug 2016 16:25:24 -0700
Subject: [PATCH] add a notice that Work profiles are not compatible with
 Instant Run Also includes the redirect for links from the Studio UI bug:
 31098748

Change-Id: Ief7296e512ccf387d738426026413dfe19785ff7
---
 docs/html/_redirects.yaml |  2 ++
 docs/html/work/guide.jd   | 11 +++++++++++
 2 files changed, 13 insertions(+)

diff --git a/docs/html/_redirects.yaml b/docs/html/_redirects.yaml
index aefe1c1f1ab56..c68937877f852 100644
--- a/docs/html/_redirects.yaml
+++ b/docs/html/_redirects.yaml
@@ -1219,6 +1219,8 @@ redirects:
   to: /studio/intro/index.html?utm_medium=android-studio
 - from: /r/studio-ui/menu-start.html
   to: /training/index.html?utm_medium=android-studio
+- from: /r/studio-ui/run-with-work-profile.html
+  to: /studio/run/index.html#ir-work-profile?utm_medium=android-studio
 
 # Redirects from (removed) N Preview documentation
 - from: /preview/features/afw.html
diff --git a/docs/html/work/guide.jd b/docs/html/work/guide.jd
index 30b895bdb66bf..b2be94990ff1a 100644
--- a/docs/html/work/guide.jd
+++ b/docs/html/work/guide.jd
@@ -412,6 +412,17 @@ page.image=images/work/cards/android-studio_600px.png
   </li>
 </ol>
 
+<p class="caution"><b>Caution</b>: When running your app with Instant Run in
+Android Studio, attempting to open your app with a Work profile or secondary
+profile will crash your app. To use your app with the Work profile, we
+recommend you create a new <a href="/studio/run/rundebugconfig.html">run
+configuration</a> that includes the <code>--user <var>user_id</var></code> flag,
+specifying the Work profile user ID. You can find the user ID by executing
+<code>adb shell pm list users</code> from command line. For more information,
+see the <a href="/studio/run/index.html#ir-work-profile">Instant Run
+documentation</a>.</p>
+
+
 <h3>Provision a device owner</h3>
 
 <p>