summaryrefslogtreecommitdiffstats
path: root/docs/html/google/play-services
diff options
context:
space:
mode:
authorDirk Dougherty <ddougherty@google.com>2014-07-22 01:04:30 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-07-22 01:04:30 +0000
commit4ebdd2f0755405e5ff6b0e30444d9dcc00666a2c (patch)
tree8373071d224000fee485b9265a08850cc767d121 /docs/html/google/play-services
parent4f64c048505a432e549ccb756634ecebf28f9e80 (diff)
parentb81099963772f886e68129c33f32fefb85ac673e (diff)
downloadframeworks_base-4ebdd2f0755405e5ff6b0e30444d9dcc00666a2c.zip
frameworks_base-4ebdd2f0755405e5ff6b0e30444d9dcc00666a2c.tar.gz
frameworks_base-4ebdd2f0755405e5ff6b0e30444d9dcc00666a2c.tar.bz2
am b8109996: am d1929c50: am f3659284: Doc change: add reminder for developers on using ad id.
* commit 'b81099963772f886e68129c33f32fefb85ac673e': Doc change: add reminder for developers on using ad id.
Diffstat (limited to 'docs/html/google/play-services')
-rw-r--r--docs/html/google/play-services/ads.jd5
-rw-r--r--docs/html/google/play-services/id.jd13
2 files changed, 18 insertions, 0 deletions
diff --git a/docs/html/google/play-services/ads.jd b/docs/html/google/play-services/ads.jd
index ed346c6..52f643e 100644
--- a/docs/html/google/play-services/ads.jd
+++ b/docs/html/google/play-services/ads.jd
@@ -59,6 +59,11 @@ header.hide=1
<h4>Flexible and powerful tools </h4>
<p>Filters and controls help you manage your ads. If you want to use multiple ad
networks, you can do that too, with free ad network mediation.</p>
+
+ <h4>Ad Policy Compliant</h4>
+ <p>The Google Mobile Ads SDK available in Google Play services is compliant with
+ Google Play Ad Poilcy regarding the usage of
+ <a href="{@docRoot}google/play-services/id.html">advertising ID</a>.</p>
</div>
<div class="col-6 normal-links">
diff --git a/docs/html/google/play-services/id.jd b/docs/html/google/play-services/id.jd
index db50c7f..43d1809 100644
--- a/docs/html/google/play-services/id.jd
+++ b/docs/html/google/play-services/id.jd
@@ -55,6 +55,19 @@ href="{@docRoot}reference/com/google/android/gms/ads/identifier/package-summary.
</div>
</div>
+<p class="caution" style=
+"background-color:#fffdeb;width:100%;margin-bottom:1em;padding:.5em;">
+ As a reminder, please note that starting <strong>1 August 2014</strong>, new
+ apps and app updates distributed through Google Play must use the advertising
+ ID in lieu of any other persistent identifiers for any advertising purposes,
+ on devices that support the advertising ID.<br>
+ <br>
+ To learn how to check your app's compliance through the Developer Console, or
+ for details on the associated developer policy changes, please see the
+ <a href=
+ "https://support.google.com/googleplay/android-developer/answer/6048248">Advertising
+ ID topic</a> in the Google Play developer help center.
+</p>
<h2 id="get_started">Using the Advertising ID</h2>