summaryrefslogtreecommitdiff
path: root/service
diff options
context:
space:
mode:
authorChalard Jean <jchalard@google.com>2020-03-19 15:05:30 +0900
committerChalard Jean <jchalard@google.com>2020-03-19 15:56:59 +0900
commit3dbd6635bfd8a750a37bad5a9b5441ab4ee58d77 (patch)
tree4b0920306bdf646d922703829b8b2d1b56cf7ba4 /service
parent27d2604a9a7c5673ba9c8779400d8a660093d7a9 (diff)
Give netId a getter as requested by the API council.
Bug: 151156820 Test: FrameworksWifiTests Change-Id: I79569c8605ef55cecb30424c452af77ff15f25b9
Diffstat (limited to 'service')
-rw-r--r--service/java/com/android/server/wifi/ClientModeImpl.java5
-rw-r--r--service/java/com/android/server/wifi/WifiScoreReport.java2
2 files changed, 4 insertions, 3 deletions
diff --git a/service/java/com/android/server/wifi/ClientModeImpl.java b/service/java/com/android/server/wifi/ClientModeImpl.java
index f5f96a134..fd32e5d96 100644
--- a/service/java/com/android/server/wifi/ClientModeImpl.java
+++ b/service/java/com/android/server/wifi/ClientModeImpl.java
@@ -4650,7 +4650,8 @@ public class ClientModeImpl extends StateMachine {
clearTargetBssid("L2ConnectedState");
mCountryCode.setReadyForChange(false);
mWifiMetrics.setWifiState(WifiMetricsProto.WifiLog.WIFI_ASSOCIATED);
- mWifiScoreCard.noteNetworkAgentCreated(mWifiInfo, mNetworkAgent.getNetwork().netId);
+ mWifiScoreCard.noteNetworkAgentCreated(mWifiInfo,
+ mNetworkAgent.getNetwork().getNetId());
mBssidBlocklistMonitor.handleBssidConnectionSuccess(mLastBssid, mWifiInfo.getSSID());
}
@@ -5252,7 +5253,7 @@ public class ClientModeImpl extends StateMachine {
//Inform WifiLockManager
WifiLockManager wifiLockManager = mWifiInjector.getWifiLockManager();
wifiLockManager.updateWifiClientConnected(true);
- mWifiScoreReport.startConnectedNetworkScorer(mNetworkAgent.getNetwork().netId);
+ mWifiScoreReport.startConnectedNetworkScorer(mNetworkAgent.getNetwork().getNetId());
}
@Override
public boolean processMessage(Message message) {
diff --git a/service/java/com/android/server/wifi/WifiScoreReport.java b/service/java/com/android/server/wifi/WifiScoreReport.java
index 3e8a1d9c4..ad3c1ca27 100644
--- a/service/java/com/android/server/wifi/WifiScoreReport.java
+++ b/service/java/com/android/server/wifi/WifiScoreReport.java
@@ -358,7 +358,7 @@ public class WifiScoreReport {
if (mNetworkAgent != null) {
final Network network = mNetworkAgent.getNetwork();
if (network != null) {
- netId = network.netId;
+ netId = network.getNetId();
}
}