diff options
| -rw-r--r-- | core/java/android/os/UserManager.java | 6 | ||||
| -rw-r--r-- | docs/html/_redirects.yaml | 2 | ||||
| -rw-r--r-- | docs/html/distribute/index.jd | 4 | ||||
| -rw-r--r-- | docs/html/preview/features/data-saver.jd | 30 | ||||
| -rw-r--r-- | docs/html/preview/index.jd | 2 |
5 files changed, 35 insertions, 9 deletions
diff --git a/core/java/android/os/UserManager.java b/core/java/android/os/UserManager.java index f3dc43237a4d..7146448ad5d7 100644 --- a/core/java/android/os/UserManager.java +++ b/core/java/android/os/UserManager.java @@ -2021,7 +2021,7 @@ public class UserManager { } /** - * Returns a {@code Bundle} containing any saved application restrictions for this user, for the + * Returns a {@link Bundle} containing any saved application restrictions for this user, for the * given package name. Only an application with this package name can call this method. * * <p>The returned {@link Bundle} consists of key-value pairs, as defined by the application, @@ -2034,8 +2034,8 @@ public class UserManager { * </ul> * * @param packageName the package name of the calling application - * @return a {@code Bundle} with the restrictions for that package, or {@code null} if there - * are no saved restrictions. + * @return a {@link Bundle} with the restrictions for that package, or an empty {@link Bundle} + * if there are no saved restrictions. * * @see #KEY_RESTRICTIONS_PENDING */ diff --git a/docs/html/_redirects.yaml b/docs/html/_redirects.yaml index 3bf6d2583caa..f287f51fa770 100644 --- a/docs/html/_redirects.yaml +++ b/docs/html/_redirects.yaml @@ -841,6 +841,8 @@ redirects: to: /studio/run/index.html#instant-run - from: /r/studio-ui/test-recorder.html to: http://tools.android.com/tech-docs/test-recorder +- from: /r/studio-ui/export-licenses.html + to: http://tools.android.com/tech-docs/new-build-system/license - from: /reference/org/apache/http/... to: /about/versions/marshmallow/android-6.0-changes.html#behavior-apache-http-client - from: /shareables/... diff --git a/docs/html/distribute/index.jd b/docs/html/distribute/index.jd index 638477302d0a..424983d4d286 100644 --- a/docs/html/distribute/index.jd +++ b/docs/html/distribute/index.jd @@ -67,7 +67,9 @@ page.metaDescription=The most visited store in the world for Android apps. Cloud </li> <li class="dac-tab-view" data-tab-view="type"> + <!-- <div class="dac-filter-item" data-filter-value="type:distribute" data-filter-name="Articles"></div> + --> <div class="dac-filter-item" data-filter-value="type:youtube" data-filter-name="Videos"></div> <div class="dac-filter-item" data-filter-value="type:blog" data-filter-name="Blog posts"></div> </li> @@ -78,7 +80,7 @@ page.metaDescription=The most visited store in the world for Android apps. Cloud </div> <div class="resource-flow-layout col-16" id="latest-resources" - data-query="type:distribute, type:youtube+tag:googleplay, type:blog+tag:googleplay+tag:featured" + data-query="type:youtube+tag:googleplay, type:blog+tag:googleplay+tag:featured" data-sortOrder="-timestamp" data-cardSizes="6x6" data-items-per-page="6" diff --git a/docs/html/preview/features/data-saver.jd b/docs/html/preview/features/data-saver.jd index 761556e1ead6..abc47eaa3837 100644 --- a/docs/html/preview/features/data-saver.jd +++ b/docs/html/preview/features/data-saver.jd @@ -179,10 +179,13 @@ if (connMgr.isActiveNetworkMetered()) { Testing with Android Debug Bridge Commands </h2> -The <a href="{@docRoot}tools/help/adb.html">Android Debug Bridge (ADB)</a> -provides a few commands that you can use to check and configure network -permissions: - +<p> + The <a href="{@docRoot}tools/help/adb.html">Android Debug Bridge (ADB)</a> + provides a few commands that you can use to test your app in Data Saver + conditions. You can check and configure network + permissions or set wireless networks as metered to test your app on unmetered + networks. +</p> <dl> <dt> <code>$ adb shell dumpsys netpolicy</code> @@ -231,4 +234,23 @@ permissions: Removes the specified package UID from the whitelist to block background metered data usage while Data Saver is enabled. </dd> + + <dt> + <code>$ adb shell cmd netpolicy list wifi-networks</code> + </dt> + + <dd> + Lists all wifi networks, displaying whether they're metered. + </dd> + + + <dt> + <code>$ adb shell cmd netpolicy set metered-network <WIFI_SSID> + true</code> + </dt> + + <dd> + Sets wifi with the specified SSID as metered, allowing you to simulate a + metered network on an unmetered network. + </dd> </dl>
\ No newline at end of file diff --git a/docs/html/preview/index.jd b/docs/html/preview/index.jd index b0631add8b13..918de48c41d3 100644 --- a/docs/html/preview/index.jd +++ b/docs/html/preview/index.jd @@ -57,7 +57,7 @@ footer.hide=1 <div id="useUpdatedTemplates" style="display:none" class="dac-section dac-slim dac-gray dac-expand"> <div class="wrap dac-offset-parent"> - <a class="dac-fab dac-scroll-button" data-scroll-button href="#build-apps"> + <a class="dac-fab dac-scroll-button" data-scroll-button href="#latest"> <i class="dac-sprite dac-arrow-down-gray"></i> </a> <ul class="dac-actions"> |