commit bf213ad25f3870193b92fb5ac94a36ff0484add3
author Junyu Lai <junyulai@google.com> Mon May 03 03:16:24 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon May 03 03:16:24 2021 +0000
tree 609fd0b91916e2e4464452954c202cc73979e8fd
parent 1c9a1c1353f2767f92260710085d05ffc332f460
parent 39b21a37513804be75549f21dacffcbfd5f32a7e

Merge "Add doc to getNetworkCapabilities"

framework/src/android/net/ConnectivityManager.java

diff --git a/framework/src/android/net/ConnectivityManager.java b/framework/src/android/net/ConnectivityManager.java
index 3e2fbea..19764dd 100644
--- a/framework/src/android/net/ConnectivityManager.java
+++ b/framework/src/android/net/ConnectivityManager.java
@@ -1561,7 +1561,7 @@
 
     /**
      * Get the {@link NetworkCapabilities} for the given {@link Network}.  This
-     * will return {@code null} if the network is unknown.
+     * will return {@code null} if the network is unknown or if the |network| argument is null.
      *
      * This will remove any location sensitive data in {@link TransportInfo} embedded in
      * {@link NetworkCapabilities#getTransportInfo()}. Some transport info instances like