Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "wifi data usage: Update calling API name" am: e98b325f6d am: b4440b1868 am: 827604bd45

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

Change-Id: Ibb62adac7a454b5dc15db743ff77df14c8788d1d
This commit is contained in:
Les Lee
2022-01-23 01:14:28 +00:00
committed by Automerger Merge Worker
parent a265ac0a00 827604bd45
commit a81afedba3
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

12
packages/ConnectivityT/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
* 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.
* @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
* 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.
* @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.
* See {@link WifiInfo#getCurrentNetworkKey()}.
* See {@link WifiInfo#getNetworkKey()}.
*/
@NonNull
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
* 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.
*/
private boolean matchesWifiNetworkKey(@NonNull String wifiNetworkKey) {
@@ -1059,9 +1059,9 @@ public final class NetworkTemplate implements Parcelable {
* the intention of matching any 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.
* 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
* this function with a null Wifi Network Key since such statistics
* never exists.

2
services/core/java/com/android/server/net/NetworkPolicyManagerService.java
View File

@@ -2707,7 +2707,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
final List<WifiConfiguration> configs = wm.getConfiguredNetworks();
for (int i = 0; i < configs.size(); ++i) {
final WifiConfiguration config = configs.get(i);
for (String key : config.getAllPersistableNetworkKeys()) {
for (String key : config.getAllNetworkKeys()) {
final Boolean metered = wifiNetworkKeys.get(key);
if (metered != null) {
Slog.d(TAG, "Found network " + key + "; upgrading metered hint");

2
services/tests/servicestests/src/com/android/server/net/NetworkPolicyManagerServiceTest.java
View File

@@ -2046,7 +2046,7 @@ public class NetworkPolicyManagerServiceTest {
private static NetworkStateSnapshot buildWifi() {
WifiInfo mockWifiInfo = mock(WifiInfo.class);
when(mockWifiInfo.makeCopy(anyLong())).thenReturn(mockWifiInfo);
when(mockWifiInfo.getCurrentNetworkKey()).thenReturn(TEST_WIFI_NETWORK_KEY);
when(mockWifiInfo.getNetworkKey()).thenReturn(TEST_WIFI_NETWORK_KEY);
final LinkProperties prop = new LinkProperties();
prop.setInterfaceName(TEST_IFACE);
final NetworkCapabilities networkCapabilities = new NetworkCapabilities.Builder()