commit 522787f39a759cf8af8438641fa8df7470a1b959
author TreeHugger Robot <treehugger-gerrit@google.com> Mon May 16 22:17:41 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon May 16 22:17:42 2016 +0000
tree 2f95fb238f52101d57f4f176a4b13fdd08f3f31f
parent 5bfaa9c1283e05567cd88d35f13ae6872dd687e2
parent c9c7be58a59ba43d09ff4ab4d540e4fb517db0b1

Merge "Documented return value of getRestrictBackgroundStatus()." into nyc-dev

core/java/android/net/ConnectivityManager.java

diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java
index 43d9bf32..a45e6f5 100644
--- a/core/java/android/net/ConnectivityManager.java
+++ b/core/java/android/net/ConnectivityManager.java
@@ -3362,6 +3362,10 @@
     /**
      * Determines if the calling application is subject to metered network restrictions while
      * running on background.
+     *
+     * @return {@link #RESTRICT_BACKGROUND_STATUS_DISABLED},
+     * {@link #RESTRICT_BACKGROUND_STATUS_ENABLED},
+     * or {@link #RESTRICT_BACKGROUND_STATUS_WHITELISTED}
      */
     public @RestrictBackgroundStatus int getRestrictBackgroundStatus() {
         try {