commit fc5cbc90cf9708fd7ab7a34e8c2925db2028854e
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Feb 22 23:58:19 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Feb 22 23:58:24 2017 +0000
tree 82af3d600ff286d7448008e01743c65431c7da72
parent 7be469ad9d58843947284d9a5c1d342f85c6339e
parent ac495240b1dc63dc94ce77053d00ce62333004a7

Merge "TelephonyManager#setAllowedCarriers: comment update"

telephony/java/android/telephony/TelephonyManager.java

diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index 7c9c0e8..a4235d7 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -6144,7 +6144,7 @@
      * android.content.pm.PackageManager#FEATURE_TELEPHONY_CARRIERLOCK} enabled.
      *
      * @return The number of carriers set successfully. Should be length of
-     * carrierList on success; -1 on error.
+     * carrierList on success; -1 if carrierList null or on error.
      * @hide
      */
     @SystemApi