LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "wifi data usage: Update calling API name"

Browse Source
This commit is contained in:
Les Lee
2022-01-22 16:06:58 +00:00
committed by Android (Google) Code Review
parent 485be2ee5b 909741d0c2
commit 525e7b96c7
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
framework-t/src/android/net/NetworkIdentity.java
View File

@@ -206,7 +206,7 @@ public class NetworkIdentity implements Comparable<NetworkIdentity> {
return mSubscriberId; return mSubscriberId;
} }
/** Get the Wifi Network Key of this instance. See {@link WifiInfo#getCurrentNetworkKey()}. */ /** Get the Wifi Network Key of this instance. See {@link WifiInfo#getNetworkKey()}. */
@Nullable @Nullable
public String getWifiNetworkKey() { public String getWifiNetworkKey() {
return mWifiNetworkKey; return mWifiNetworkKey;
@@ -375,7 +375,7 @@ public class NetworkIdentity implements Comparable<NetworkIdentity> {
if (transportInfo instanceof WifiInfo) { if (transportInfo instanceof WifiInfo) {
final WifiInfo info = (WifiInfo) transportInfo; final WifiInfo info = (WifiInfo) transportInfo;
if (info != null) { if (info != null) {
setWifiNetworkKey(info.getCurrentNetworkKey()); setWifiNetworkKey(info.getNetworkKey());
} }
} }
} }
@@ -436,7 +436,7 @@ public class NetworkIdentity implements Comparable<NetworkIdentity> {
* Set the Wifi Network Key. * Set the Wifi Network Key.
* *
* @param wifiNetworkKey Wifi Network Key of the network, * @param wifiNetworkKey Wifi Network Key of the network,
* see {@link WifiInfo#getCurrentNetworkKey()}. * see {@link WifiInfo#getNetworkKey()}.
* Or null if not applicable. * Or null if not applicable.
* @return this builder. * @return this builder.
*/ */

12
framework-t/src/android/net/NetworkTemplate.java
View File

@@ -263,7 +263,7 @@ public final class NetworkTemplate implements Parcelable {
* Template to match {@link ConnectivityManager#TYPE_WIFI} networks with the * Template to match {@link ConnectivityManager#TYPE_WIFI} networks with the
* given key of the wifi network. * given key of the wifi network.
* *
* @param wifiNetworkKey key of the wifi network. see {@link WifiInfo#getCurrentNetworkKey()} * @param wifiNetworkKey key of the wifi network. see {@link WifiInfo#getNetworkKey()}
* to know details about the key. * to know details about the key.
* @hide * @hide
*/ */
@@ -283,7 +283,7 @@ public final class NetworkTemplate implements Parcelable {
* Call with {@link #WIFI_NETWORK_KEY_ALL} for {@code wifiNetworkKey} to get result regardless * Call with {@link #WIFI_NETWORK_KEY_ALL} for {@code wifiNetworkKey} to get result regardless
* of key of the wifi network. * of key of the wifi network.
* *
* @param wifiNetworkKey key of the wifi network. see {@link WifiInfo#getCurrentNetworkKey()} * @param wifiNetworkKey key of the wifi network. see {@link WifiInfo#getNetworkKey()}
* to know details about the key. * to know details about the key.
* @param subscriberId the IMSI associated to this wifi network. * @param subscriberId the IMSI associated to this wifi network.
* *
@@ -593,7 +593,7 @@ public final class NetworkTemplate implements Parcelable {
/** /**
* Get the set of Wifi Network Keys of the template. * Get the set of Wifi Network Keys of the template.
* See {@link WifiInfo#getCurrentNetworkKey()}. * See {@link WifiInfo#getNetworkKey()}.
*/ */
@NonNull @NonNull
public Set<String> getWifiNetworkKeys() { public Set<String> getWifiNetworkKeys() {
@@ -729,7 +729,7 @@ public final class NetworkTemplate implements Parcelable {
* Returns true when the key matches, or when {@code mMatchWifiNetworkKeys} is * Returns true when the key matches, or when {@code mMatchWifiNetworkKeys} is
* empty. * empty.
* *
* @param wifiNetworkKey key of the wifi network. see {@link WifiInfo#getCurrentNetworkKey()} * @param wifiNetworkKey key of the wifi network. see {@link WifiInfo#getNetworkKey()}
* to know details about the key. * to know details about the key.
*/ */
private boolean matchesWifiNetworkKey(@NonNull String wifiNetworkKey) { private boolean matchesWifiNetworkKey(@NonNull String wifiNetworkKey) {
@@ -1059,9 +1059,9 @@ public final class NetworkTemplate implements Parcelable {
* the intention of matching any Wifi Network Key. * the intention of matching any Wifi Network Key.
* *
* @param wifiNetworkKeys the list of Wifi Network Key, * @param wifiNetworkKeys the list of Wifi Network Key,
* see {@link WifiInfo#getCurrentNetworkKey()}. * see {@link WifiInfo#getNetworkKey()}.
* Or an empty list to match all networks. * Or an empty list to match all networks.
* Note that {@code getCurrentNetworkKey()} might get null key * Note that {@code getNetworkKey()} might get null key
* when wifi disconnects. However, the caller should never invoke * when wifi disconnects. However, the caller should never invoke
* this function with a null Wifi Network Key since such statistics * this function with a null Wifi Network Key since such statistics
* never exists. * never exists.