From 871fbf5057f3f54a45ba3618a64b9fa335b5c310 Mon Sep 17 00:00:00 2001
From: David Friedman <dmail@google.com>
Date: Mon, 12 Oct 2015 17:35:28 -0700
Subject: [PATCH] Docs: Clarifies requirements in order for Auto Backup to work
 in API 23.

Bug: 24673628

Change-Id: If472558cc6d7d5136261f9dcfdb3d25b22723aa6
---
 docs/html/training/backup/autosyncapi.jd | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/docs/html/training/backup/autosyncapi.jd b/docs/html/training/backup/autosyncapi.jd
index d216f70002aea..0e2a9a9b992e7 100644
--- a/docs/html/training/backup/autosyncapi.jd
+++ b/docs/html/training/backup/autosyncapi.jd
@@ -26,12 +26,20 @@ page.image=images/cards/card-auto-backup_2x.png
 
 <p>
   Users frequently invest time and effort to configure apps just the way they like them. Switching
-  to a new device can cancel out all that careful configuration. Devices running Android 6.0 and
-  higher automatically back up app data to the cloud. The system performs this automatic backup
+  to a new device can cancel out all that careful configuration. For apps whose <a href=
+  "{@docRoot}guide/topics/manifest/uses-sdk-element.html#target">target SDK version</a>
+  is Android 6.0 (API level 23) and higher, devices running Android 6.0 and higher automatically
+  back up app data to the cloud. The system performs this automatic backup
   for nearly all app data by default, and does so without your having to write any additional app
   code.
 </p>
 
+<p class="note">
+<strong>Note:</strong> To protect user privacy, the device user must have opted in to Google
+services for Auto Backup to work. The Google services opt-in dialog appears when the user goes
+through the Setup Wizard or configures the first Google account on the device.
+</p>
+
 <p>
   When a user installs your app on
   a new device, or reinstalls your app on one (for example, after a factory reset), the system
@@ -82,8 +90,8 @@ page.image=images/cards/card-auto-backup_2x.png
 &lt;manifest xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:tools="http://schemas.android.com/tools"
         package="com.my.appexample"&gt;
-    &lt;uses-sdk android:minSdkVersion="MNC"/&gt;
-    &lt;uses-sdk android:targetSdkVersion="MNC"/&gt;
+    &lt;uses-sdk android:minSdkVersion="23"/&gt;
+    &lt;uses-sdk android:targetSdkVersion="23"/&gt;
     &lt;application ...
 <strong>        android:fullBackupContent="&#64;xml/mybackupscheme"&gt;</strong>
     &lt;/app&gt;
@@ -222,8 +230,8 @@ page.image=images/cards/card-auto-backup_2x.png
 &lt;manifest xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:tools="http://schemas.android.com/tools"
         package="com.my.appexample"&gt;
-    &lt;uses-sdk android:minSdkVersion="MNC"/&gt;
-    &lt;uses-sdk android:targetSdkVersion="MNC"/&gt;
+    &lt;uses-sdk android:minSdkVersion="23"/&gt;
+    &lt;uses-sdk android:targetSdkVersion="23"/&gt;
     &lt;application ...
 <strong>        android:allowBackup="false"&gt;</strong>
     &lt;/application&gt;