Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 07e33646 authored by Junyu Lai's avatar Junyu Lai Committed by Automerger Merge Worker
Browse files

Merge "Add doc to getNetworkCapabilities" am: c4520f13 am: 1e15e969 am:... 

Merge "Add doc to getNetworkCapabilities" am: c4520f13 am: 1e15e969 am: 488b6ef0 am: 7c003ae0 am: 33f897b8

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1690668

Change-Id: I30e0385d2d8dce858ae86568b25dcc2db8768aa4
parents 43a27adc 33f897b8

packages/Connectivity/framework/src/android/net/ConnectivityManager.java

+1 −1
Original line number Diff line number Diff line
@@ -1525,7 +1525,7 @@ public class ConnectivityManager { 


    /**

     * 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