| | | |
Offset 16, 15 lines modified | Offset 16, 14 lines modified |
16 | import·java.util.function.Function; | 16 | import·java.util.function.Function; |
17 | import·com.android.server.wifi.hotspot2.ANQPNetworkKey; | 17 | import·com.android.server.wifi.hotspot2.ANQPNetworkKey; |
18 | import·com.android.server.wifi.hotspot2.Utils; | 18 | import·com.android.server.wifi.hotspot2.Utils; |
19 | import·com.android.server.wifi.hotspot2.PasspointProvider; | 19 | import·com.android.server.wifi.hotspot2.PasspointProvider; |
20 | import·java.util.HashSet; | 20 | import·java.util.HashSet; |
21 | import·android.net.wifi.WifiInfo; | 21 | import·android.net.wifi.WifiInfo; |
22 | import·com.android.server.wifi.proto.WifiStatsLog; | 22 | import·com.android.server.wifi.proto.WifiStatsLog; |
23 | import·java.util.Set; | |
24 | import·org.json.JSONException; | 23 | import·org.json.JSONException; |
25 | import·org.json.JSONArray; | 24 | import·org.json.JSONArray; |
26 | import·org.json.JSONObject; | 25 | import·org.json.JSONObject; |
27 | import·android.util.Base64; | 26 | import·android.util.Base64; |
28 | import·com.android.wifi.x.com.google.protobuf.nano.MessageNano; | 27 | import·com.android.wifi.x.com.google.protobuf.nano.MessageNano; |
29 | import·java.io.FileDescriptor; | 28 | import·java.io.FileDescriptor; |
30 | import·com.android.server.wifi.hotspot2.NetworkDetail$HSRelease; | 29 | import·com.android.server.wifi.hotspot2.NetworkDetail$HSRelease; |
Offset 33, 24 lines modified | Offset 32, 25 lines modified |
33 | import·com.android.server.wifi.hotspot2.NetworkDetail; | 32 | import·com.android.server.wifi.hotspot2.NetworkDetail; |
34 | import·android.net.wifi.SupplicantState; | 33 | import·android.net.wifi.SupplicantState; |
35 | import·com.android.wifi.x.android.hardware.wifi.supplicant.V1_0.ISupplicantStaIfaceCallback$StatusCode; | 34 | import·com.android.wifi.x.android.hardware.wifi.supplicant.V1_0.ISupplicantStaIfaceCallback$StatusCode; |
36 | import·com.android.wifi.x.android.hardware.wifi.supplicant.V1_0.ISupplicantStaIfaceCallback$ReasonCode; | 35 | import·com.android.wifi.x.android.hardware.wifi.supplicant.V1_0.ISupplicantStaIfaceCallback$ReasonCode; |
37 | import·android.os.RemoteException; | 36 | import·android.os.RemoteException; |
38 | import·android.net.wifi.IOnWifiUsabilityStatsListener; | 37 | import·android.net.wifi.IOnWifiUsabilityStatsListener; |
39 | import·com.android.server.wifi.util.MetricsUtils$GenericBucket; | 38 | import·com.android.server.wifi.util.MetricsUtils$GenericBucket; |
40 | import·com.android.server.wifi.util.MetricsUtils; | |
41 | import·com.android.server.wifi.proto.nano.WifiMetricsProto$WifiConfigStoreIO$DurationBucket; | 39 | import·com.android.server.wifi.proto.nano.WifiMetricsProto$WifiConfigStoreIO$DurationBucket; |
42 | import·com.android.server.wifi.proto.nano.WifiMetricsProto$NumConnectableNetworksBucket; | 40 | import·com.android.server.wifi.proto.nano.WifiMetricsProto$NumConnectableNetworksBucket; |
43 | import·com.android.server.wifi.proto.nano.WifiMetricsProto$NetworkSelectionExperimentDecisions; | 41 | import·com.android.server.wifi.proto.nano.WifiMetricsProto$NetworkSelectionExperimentDecisions; |
44 | import·android.util.Pair; | 42 | import·android.util.Pair; |
45 | import·java.io.PrintWriter; | 43 | import·java.io.PrintWriter; |
46 | import·android.util.Log; | 44 | import·android.util.Log; |
47 | import·android.net.wifi.WifiUsabilityStatsEntry; | 45 | import·android.net.wifi.WifiUsabilityStatsEntry; |
48 | import·com.android.server.wifi.proto.nano.WifiMetricsProto$WifiUsabilityStatsEntry; | 46 | import·com.android.server.wifi.proto.nano.WifiMetricsProto$WifiUsabilityStatsEntry; |
49 | import·android.net.wifi.WifiConfiguration; | 47 | import·android.net.wifi.WifiConfiguration$NetworkSelectionStatus; |
| 48 | import·java.util.function.ToIntFunction; |
| 49 | import·com.android.server.wifi.util.MetricsUtils; |
50 | import·com.android.server.wifi.proto.nano.WifiMetricsProto$PasspointProfileTypeCount; | 50 | import·com.android.server.wifi.proto.nano.WifiMetricsProto$PasspointProfileTypeCount; |
51 | import·com.android.server.wifi.proto.nano.WifiMetricsProto$HealthMonitorMetrics; | 51 | import·com.android.server.wifi.proto.nano.WifiMetricsProto$HealthMonitorMetrics; |
52 | import·java.util.Iterator; | 52 | import·java.util.Iterator; |
53 | import·com.android.server.wifi.proto.nano.WifiMetricsProto$InitPartialScanStats; | 53 | import·com.android.server.wifi.proto.nano.WifiMetricsProto$InitPartialScanStats; |
54 | import·com.android.server.wifi.proto.nano.WifiMetricsProto$ThroughputMbpsHistogram; | 54 | import·com.android.server.wifi.proto.nano.WifiMetricsProto$ThroughputMbpsHistogram; |
55 | import·com.android.server.wifi.proto.nano.WifiMetricsProto$ChannelUtilizationHistogram; | 55 | import·com.android.server.wifi.proto.nano.WifiMetricsProto$ChannelUtilizationHistogram; |
56 | import·com.android.server.wifi.proto.nano.WifiMetricsProto$PasspointProvisionStats$ProvisionFailureCount; | 56 | import·com.android.server.wifi.proto.nano.WifiMetricsProto$PasspointProvisionStats$ProvisionFailureCount; |
Offset 81, 14 lines modified | Offset 81, 17 lines modified |
81 | import·com.android.server.wifi.proto.nano.WifiMetricsProto$RssiPollCount; | 81 | import·com.android.server.wifi.proto.nano.WifiMetricsProto$RssiPollCount; |
82 | import·com.android.server.wifi.proto.nano.WifiMetricsProto$StaEvent$ConfigInfo; | 82 | import·com.android.server.wifi.proto.nano.WifiMetricsProto$StaEvent$ConfigInfo; |
83 | import·java.util.BitSet; | 83 | import·java.util.BitSet; |
84 | import·com.android.server.wifi.proto.nano.WifiMetricsProto$StaEvent; | 84 | import·com.android.server.wifi.proto.nano.WifiMetricsProto$StaEvent; |
85 | import·com.android.server.wifi.proto.nano.WifiMetricsProto$SoftApConnectedClientsEvent; | 85 | import·com.android.server.wifi.proto.nano.WifiMetricsProto$SoftApConnectedClientsEvent; |
86 | import·android.net.wifi.ScanResult; | 86 | import·android.net.wifi.ScanResult; |
87 | import·android.os.Message; | 87 | import·android.os.Message; |
| 88 | import·com.android.server.wifi.proto.nano.WifiMetricsProto$NetworkDisableReason; |
| 89 | import·java.util.Set; |
| 90 | import·android.net.wifi.WifiConfiguration; |
88 | import·com.android.server.wifi.proto.nano.WifiMetricsProto$DeviceMobilityStatePnoScanStats; | 91 | import·com.android.server.wifi.proto.nano.WifiMetricsProto$DeviceMobilityStatePnoScanStats; |
89 | import·android.util.ArrayMap; | 92 | import·android.util.ArrayMap; |
90 | import·java.util.HashMap; | 93 | import·java.util.HashMap; |
91 | import·java.util.ArrayList; | 94 | import·java.util.ArrayList; |
92 | import·android.os.Looper; | 95 | import·android.os.Looper; |
93 | import·com.android.server.wifi.proto.nano.WifiMetricsProto$WifiToggleStats; | 96 | import·com.android.server.wifi.proto.nano.WifiMetricsProto$WifiToggleStats; |
94 | import·com.android.server.wifi.p2p.WifiP2pMetrics; | 97 | import·com.android.server.wifi.p2p.WifiP2pMetrics; |
Offset 326, 14 lines modified | Offset 329, 15 lines modified |
326 | ····private·final·WifiMetricsProto$WifiNetworkSuggestionApiLog·mWifiNetworkSuggestionApiLog; | 329 | ····private·final·WifiMetricsProto$WifiNetworkSuggestionApiLog·mWifiNetworkSuggestionApiLog; |
327 | ····private·final·WifiMetrics$WifiOffMetrics·mWifiOffMetrics; | 330 | ····private·final·WifiMetrics$WifiOffMetrics·mWifiOffMetrics; |
328 | ····private·final·WifiP2pMetrics·mWifiP2pMetrics; | 331 | ····private·final·WifiP2pMetrics·mWifiP2pMetrics; |
329 | ····private·WifiPowerMetrics·mWifiPowerMetrics; | 332 | ····private·WifiPowerMetrics·mWifiPowerMetrics; |
330 | ····private·WifiScoreCard·mWifiScoreCard; | 333 | ····private·WifiScoreCard·mWifiScoreCard; |
331 | ····private·final·SparseIntArray·mWifiScoreCounts; | 334 | ····private·final·SparseIntArray·mWifiScoreCounts; |
332 | ····private·int·mWifiState; | 335 | ····private·int·mWifiState; |
| 336 | ····private·WifiMetrics$WifiStatusBuilder·mWifiStatusBuilder; |
333 | ····private·final·SparseIntArray·mWifiSystemStateEntries; | 337 | ····private·final·SparseIntArray·mWifiSystemStateEntries; |
334 | ····private·final·WifiMetricsProto$WifiToggleStats·mWifiToggleStats; | 338 | ····private·final·WifiMetricsProto$WifiToggleStats·mWifiToggleStats; |
335 | ····private·final·SparseIntArray·mWifiUsabilityScoreCounts; | 339 | ····private·final·SparseIntArray·mWifiUsabilityScoreCounts; |
336 | ····private·int·mWifiUsabilityStatsCounter; | 340 | ····private·int·mWifiUsabilityStatsCounter; |
337 | ····private·final·LinkedList·mWifiUsabilityStatsEntriesList; | 341 | ····private·final·LinkedList·mWifiUsabilityStatsEntriesList; |
338 | ····private·final·LinkedList·mWifiUsabilityStatsListBad; | 342 | ····private·final·LinkedList·mWifiUsabilityStatsListBad; |
339 | ····private·final·LinkedList·mWifiUsabilityStatsListGood; | 343 | ····private·final·LinkedList·mWifiUsabilityStatsListGood; |
Offset 448, 14 lines modified | Offset 452, 15 lines modified |
448 | ········this.mProbeStatusSinceLastUpdate·=·n; | 452 | ········this.mProbeStatusSinceLastUpdate·=·n; |
449 | ········this.mProbeElapsedTimeSinceLastUpdateMs·=·mLastScoreNoReset; | 453 | ········this.mProbeElapsedTimeSinceLastUpdateMs·=·mLastScoreNoReset; |
450 | ········this.mProbeMcsRateSinceLastUpdate·=·mLastScoreNoReset; | 454 | ········this.mProbeMcsRateSinceLastUpdate·=·mLastScoreNoReset; |
451 | ········final·long·mCurrentDeviceMobilityStatePnoScanStartMs·=·(long)(-1); | 455 | ········final·long·mCurrentDeviceMobilityStatePnoScanStartMs·=·(long)(-1); |
452 | ········this.mScoreBreachLowTimeMillis·=·mCurrentDeviceMobilityStatePnoScanStartMs; | 456 | ········this.mScoreBreachLowTimeMillis·=·mCurrentDeviceMobilityStatePnoScanStartMs; |
453 | ········this.mStaEventList·=·new·LinkedList(); | 457 | ········this.mStaEventList·=·new·LinkedList(); |
454 | ········this.mUserActionEventList·=·new·LinkedList(); | 458 | ········this.mUserActionEventList·=·new·LinkedList(); |
| 459 | ········this.mWifiStatusBuilder·=·new·WifiMetrics$WifiStatusBuilder(this); |
455 | ········this.mLastPollRssi·=·-127; | 460 | ········this.mLastPollRssi·=·-127; |
456 | ········this.mLastPollLinkSpeed·=·mLastScoreNoReset; | 461 | ········this.mLastPollLinkSpeed·=·mLastScoreNoReset; |
457 | ········this.mLastPollRxLinkSpeed·=·mLastScoreNoReset; | 462 | ········this.mLastPollRxLinkSpeed·=·mLastScoreNoReset; |
458 | ········this.mLastPollFreq·=·mLastScoreNoReset; | 463 | ········this.mLastPollFreq·=·mLastScoreNoReset; |
459 | ········this.mLastScore·=·mLastScoreNoReset; | 464 | ········this.mLastScore·=·mLastScoreNoReset; |
460 | ········this.mAdaptiveConnectivityEnabled·=·(n·!=·0); | 465 | ········this.mAdaptiveConnectivityEnabled·=·(n·!=·0); |
461 | ········this.mWifiLogProto·=·new·WifiMetricsProto$WifiLog(); | 466 | ········this.mWifiLogProto·=·new·WifiMetricsProto$WifiLog(); |
Offset 611, 26 lines modified | Offset 616, 28 lines modified |
611 | ············Label_0028:·{ | 616 | ············Label_0028:·{ |
612 | ················if·(n·==·2)·{ | 617 | ················if·(n·==·2)·{ |
613 | ····················break·Label_0028; | 618 | ····················break·Label_0028; |
614 | ················} | 619 | ················} |
615 | ················try·{ | 620 | ················try·{ |
616 | ····················//·monitorexit(mLock) | 621 | ····················//·monitorexit(mLock) |
617 | ····················return; | 622 | ····················return; |
618 | ····················List·list·=·this.mSoftApEventListTethered; | 623 | ····················//·iftrue(Label_0067:,·list.size()·<=·256) |
619 | ····················Label_0043:·{ | 624 | ····················List·list; |
620 | ························break·Label_0043; | 625 | ····················while·(true)·{ |
621 | ························Label_0067:·{ | |
622 | ····························wifiMetricsProto$SoftApConnectedClientsEvent.timeStampMillis·=·this.mClock.getElapsedSinceBootMillis(); | |
623 | ························} | |
624 | ························list.add(wifiMetricsProto$SoftApConnectedClientsEvent); | |
625 | ························return; | 626 | ························return; |
| 627 | ························list·=·this.mSoftApEventListTethered; |
| 628 | ························continue; |
626 | ························list·=·this.mSoftApEventListLocalOnly; | 629 | ························list·=·this.mSoftApEventListLocalOnly; |
| 630 | ························continue; |
| 631 | ····················} |
| 632 | ····················Label_0067:·{ |
| 633 | ························wifiMetricsProto$SoftApConnectedClientsEvent.timeStampMillis·=·this.mClock.getElapsedSinceBootMillis(); |
627 | ····················} | 634 | ····················} |
| 635 | ····················list.add(wifiMetricsProto$SoftApConnectedClientsEvent); |
628 | ················} | 636 | ················} |
629 | ················//·iftrue(Label_0067:,·list.size()·<=·256) | |
630 | ················finally·{ | 637 | ················finally·{ |
631 | ················} | 638 | ················} |
632 | ················//·monitorexit(mLock) | 639 | ················//·monitorexit(mLock) |
633 | ············} | 640 | ············} |
634 | ········} | 641 | ········} |
635 | ····} | 642 | ····} |
636 | ···· | 643 | ···· |
Offset 1060, 36 lines modified | Offset 1067, 36 lines modified |
1060 | ············linkProbeStats.successRssiCounts·=·this.mLinkProbeSuccessRssiCounts.toProto(); | 1067 | ············linkProbeStats.successRssiCounts·=·this.mLinkProbeSuccessRssiCounts.toProto(); |
1061 | ············linkProbeStats.failureRssiCounts·=·this.mLinkProbeFailureRssiCounts.toProto(); | 1068 | ············linkProbeStats.failureRssiCounts·=·this.mLinkProbeFailureRssiCounts.toProto(); |
1062 | ············linkProbeStats.successLinkSpeedCounts·=·this.mLinkProbeSuccessLinkSpeedCounts.toProto(); | 1069 | ············linkProbeStats.successLinkSpeedCounts·=·this.mLinkProbeSuccessLinkSpeedCounts.toProto(); |
1063 | ············linkProbeStats.failureLinkSpeedCounts·=·this.mLinkProbeFailureLinkSpeedCounts.toProto(); | 1070 | ············linkProbeStats.failureLinkSpeedCounts·=·this.mLinkProbeFailureLinkSpeedCounts.toProto(); |
1064 | ············linkProbeStats.successSecondsSinceLastTxSuccessHistogram·=·this.mLinkProbeSuccessSecondsSinceLastTxSuccessHistogram.toProto(); | 1071 | ············linkProbeStats.successSecondsSinceLastTxSuccessHistogram·=·this.mLinkProbeSuccessSecondsSinceLastTxSuccessHistogram.toProto(); |
1065 | ············linkProbeStats.failureSecondsSinceLastTxSuccessHistogram·=·this.mLinkProbeFailureSecondsSinceLastTxSuccessHistogram.toProto(); | 1072 | ············linkProbeStats.failureSecondsSinceLastTxSuccessHistogram·=·this.mLinkProbeFailureSecondsSinceLastTxSuccessHistogram.toProto(); |
1066 | ············linkProbeStats.successElapsedTimeMsHistogram·=·this.mLinkProbeSuccessElapsedTimeMsHistogram.toProto(); | 1073 | ············linkProbeStats.successElapsedTimeMsHistogram·=·this.mLinkProbeSuccessElapsedTimeMsHistogram.toProto(); |
1067 | ············linkProbeStats.failureReasonCounts·=·(WifiMetricsProto$LinkProbeStats$LinkProbeFailureReasonCount[])this.mLinkProbeFailureReasonCounts.toProto((Class)WifiMetricsProto$LinkProbeStats$LinkProbeFailureReasonCount.class,·(IntCounter$ProtobufConverter)-$$Lambda$WifiMetrics$vcvg6LFIJBJG-KkHvXgCZflUqM8.INSTANCE); | 1074 | ············linkProbeStats.failureReasonCounts·=·(WifiMetricsProto$LinkProbeStats$LinkProbeFailureReasonCount[])this.mLinkProbeFailureReasonCounts.toProto((Class)WifiMetricsProto$LinkProbeStats$LinkProbeFailureReasonCount.class,·(IntCounter$ProtobufConverter)-$$Lambda$WifiMetrics$T1JW2IOhhO1BZIdcRsXDLI5p_jU.INSTANCE); |
1068 | ············linkProbeStats.experimentProbeCounts·=·(WifiMetricsProto$LinkProbeStats$ExperimentProbeCounts[])this.mLinkProbeExperimentProbeCounts.toProto((Class)WifiMetricsProto$LinkProbeStats$ExperimentProbeCounts.class,·(ObjectCounter$ProtobufConverter)-$$Lambda$WifiMetrics$Ec3r-2QpFu8lQqDC7DTY1ZWwG98.INSTANCE); | 1075 | ············linkProbeStats.experimentProbeCounts·=·(WifiMetricsProto$LinkProbeStats$ExperimentProbeCounts[])this.mLinkProbeExperimentProbeCounts.toProto((Class)WifiMetricsProto$LinkProbeStats$ExperimentProbeCounts.class,·(ObjectCounter$ProtobufConverter)-$$Lambda$WifiMetrics$Xm75btlTre4RyOGergfq257VAhA.INSTANCE); |
1069 | ············this.mWifiLogProto.linkProbeStats·=·linkProbeStats; | 1076 | ············this.mWifiLogProto.linkProbeStats·=·linkProbeStats; |
1070 | ············this.mWifiLogProto.networkSelectionExperimentDecisionsList·=·this.makeNetworkSelectionExperimentDecisionsList(); | 1077 | ············this.mWifiLogProto.networkSelectionExperimentDecisionsList·=·this.makeNetworkSelectionExperimentDecisionsList(); |
1071 | ············this.mWifiNetworkRequestApiLog.networkMatchSizeHistogram·=·this.mWifiNetworkRequestApiMatchSizeHistogram.toProto(); | 1078 | ············this.mWifiNetworkRequestApiLog.networkMatchSizeHistogram·=·this.mWifiNetworkRequestApiMatchSizeHistogram.toProto(); |
1072 | ············this.mWifiLogProto.wifiNetworkRequestApiLog·=·this.mWifiNetworkRequestApiLog; | 1079 | ············this.mWifiLogProto.wifiNetworkRequestApiLog·=·this.mWifiNetworkRequestApiLog; |
1073 | ············this.mWifiNetworkSuggestionApiLog.networkListSizeHistogram·=·this.mWifiNetworkSuggestionApiListSizeHistogram.toProto(); | 1080 | ············this.mWifiNetworkSuggestionApiLog.networkListSizeHistogram·=·this.mWifiNetworkSuggestionApiListSizeHistogram.toProto(); |
1074 | ············this.mWifiNetworkSuggestionApiLog.appCountPerType·=·(WifiMetricsProto$WifiNetworkSuggestionApiLog$SuggestionAppCount[])this.mWifiNetworkSuggestionApiAppTypeCounter.toProto((Class)WifiMetricsProto$WifiNetworkSuggestionApiLog$SuggestionAppCount.class,·(IntCounter$ProtobufConverter)-$$Lambda$WifiMetrics$g-i2Nizi6VjfljRFrCm5K8kpyCA.INSTANCE); | 1081 | ············this.mWifiNetworkSuggestionApiLog.appCountPerType·=·(WifiMetricsProto$WifiNetworkSuggestionApiLog$SuggestionAppCount[])this.mWifiNetworkSuggestionApiAppTypeCounter.toProto((Class)WifiMetricsProto$WifiNetworkSuggestionApiLog$SuggestionAppCount.class,·(IntCounter$ProtobufConverter)-$$Lambda$WifiMetrics$OvjpwQPe_nNiIDZ818Wor5vYCTg.INSTANCE); |
1075 | ············this.mWifiLogProto.wifiNetworkSuggestionApiLog·=·this.mWifiNetworkSuggestionApiLog; | 1082 | ············this.mWifiLogProto.wifiNetworkSuggestionApiLog·=·this.mWifiNetworkSuggestionApiLog; |
1076 | ············final·WifiMetricsProto$UserReactionToApprovalUiEvent·userReactionToApprovalUiEvent·=·new·WifiMetricsProto$UserReactionToApprovalUiEvent(); | 1083 | ············final·WifiMetricsProto$UserReactionToApprovalUiEvent·userReactionToApprovalUiEvent·=·new·WifiMetricsProto$UserReactionToApprovalUiEvent(); |
1077 | ············userReactionToApprovalUiEvent.userApprovalAppUiReaction·=·this.mUserApprovalSuggestionAppUiReactionList.toArray(new·WifiMetricsProto$UserReactionToApprovalUiEvent$UserReaction[0]); | 1084 | ············userReactionToApprovalUiEvent.userApprovalAppUiReaction·=·this.mUserApprovalSuggestionAppUiReactionList.toArray(new·WifiMetricsProto$UserReactionToApprovalUiEvent$UserReaction[0]); |
1078 | ············userReactionToApprovalUiEvent.userApprovalCarrierUiReaction·=·this.mUserApprovalCarrierUiReactionList.toArray(new·WifiMetricsProto$UserReactionToApprovalUiEvent$UserReaction[0]); | 1085 | ············userReactionToApprovalUiEvent.userApprovalCarrierUiReaction·=·this.mUserApprovalCarrierUiReactionList.toArray(new·WifiMetricsProto$UserReactionToApprovalUiEvent$UserReaction[0]); |
1079 | ············this.mWifiLogProto.userReactionToApprovalUiEvent·=·userReactionToApprovalUiEvent; | 1086 | ············this.mWifiLogProto.userReactionToApprovalUiEvent·=·userReactionToApprovalUiEvent; |
1080 | ············this.mWifiLockStats.highPerfLockAcqDurationSecHistogram·=·this.mWifiLockHighPerfAcqDurationSecHistogram.toProto(); | 1087 | ············this.mWifiLockStats.highPerfLockAcqDurationSecHistogram·=·this.mWifiLockHighPerfAcqDurationSecHistogram.toProto(); |
1081 | ············this.mWifiLockStats.lowLatencyLockAcqDurationSecHistogram·=·this.mWifiLockLowLatencyAcqDurationSecHistogram.toProto(); | 1088 | ············this.mWifiLockStats.lowLatencyLockAcqDurationSecHistogram·=·this.mWifiLockLowLatencyAcqDurationSecHistogram.toProto(); |
1082 | ············this.mWifiLockStats.highPerfActiveSessionDurationSecHistogram·=·this.mWifiLockHighPerfActiveSessionDurationSecHistogram.toProto(); | 1089 | ············this.mWifiLockStats.highPerfActiveSessionDurationSecHistogram·=·this.mWifiLockHighPerfActiveSessionDurationSecHistogram.toProto(); |
1083 | ············this.mWifiLockStats.lowLatencyActiveSessionDurationSecHistogram·=·this.mWifiLockLowLatencyActiveSessionDurationSecHistogram.toProto(); | 1090 | ············this.mWifiLockStats.lowLatencyActiveSessionDurationSecHistogram·=·this.mWifiLockLowLatencyActiveSessionDurationSecHistogram.toProto(); |
1084 | ············this.mWifiLogProto.wifiLockStats·=·this.mWifiLockStats; | 1091 | ············this.mWifiLogProto.wifiLockStats·=·this.mWifiLockStats; |
1085 | ············this.mWifiLogProto.wifiToggleStats·=·this.mWifiToggleStats; | 1092 | ············this.mWifiLogProto.wifiToggleStats·=·this.mWifiToggleStats; |
1086 | ············this.mWifiLogProto.passpointProvisionStats·=·new·WifiMetricsProto$PasspointProvisionStats(); | 1093 | ············this.mWifiLogProto.passpointProvisionStats·=·new·WifiMetricsProto$PasspointProvisionStats(); |
1087 | ············this.mWifiLogProto.passpointProvisionStats.numProvisionSuccess·=·this.mNumProvisionSuccess; | 1094 | ············this.mWifiLogProto.passpointProvisionStats.numProvisionSuccess·=·this.mNumProvisionSuccess; |
1088 | ············this.mWifiLogProto.passpointProvisionStats.provisionFailureCount·=·(WifiMetricsProto$PasspointProvisionStats$ProvisionFailureCount[])this.mPasspointProvisionFailureCounts.toProto((Class)WifiMetricsProto$PasspointProvisionStats$ProvisionFailureCount.class,·(IntCounter$ProtobufConverter)-$$Lambda$WifiMetrics$hCQnbfHa4CszDg9W7E2N3YuYGH0.INSTANCE); | 1095 | ············this.mWifiLogProto.passpointProvisionStats.provisionFailureCount·=·(WifiMetricsProto$PasspointProvisionStats$ProvisionFailureCount[])this.mPasspointProvisionFailureCounts.toProto((Class)WifiMetricsProto$PasspointProvisionStats$ProvisionFailureCount.class,·(IntCounter$ProtobufConverter)-$$Lambda$WifiMetrics$16WVNho1AvmpxQo_EpVKAzc0TGA.INSTANCE); |
1089 | ············this.mWifiLogProto.txLinkSpeedCount2G·=·this.mTxLinkSpeedCount2g.toProto(); | 1096 | ············this.mWifiLogProto.txLinkSpeedCount2G·=·this.mTxLinkSpeedCount2g.toProto(); |
1090 | ············this.mWifiLogProto.txLinkSpeedCount5GLow·=·this.mTxLinkSpeedCount5gLow.toProto(); | 1097 | ············this.mWifiLogProto.txLinkSpeedCount5GLow·=·this.mTxLinkSpeedCount5gLow.toProto(); |
1091 | ············this.mWifiLogProto.txLinkSpeedCount5GMid·=·this.mTxLinkSpeedCount5gMid.toProto(); | 1098 | ············this.mWifiLogProto.txLinkSpeedCount5GMid·=·this.mTxLinkSpeedCount5gMid.toProto(); |
1092 | ············this.mWifiLogProto.txLinkSpeedCount5GHigh·=·this.mTxLinkSpeedCount5gHigh.toProto(); | 1099 | ············this.mWifiLogProto.txLinkSpeedCount5GHigh·=·this.mTxLinkSpeedCount5gHigh.toProto(); |
1093 | ············this.mWifiLogProto.txLinkSpeedCount6GLow·=·this.mTxLinkSpeedCount6gLow.toProto(); | 1100 | ············this.mWifiLogProto.txLinkSpeedCount6GLow·=·this.mTxLinkSpeedCount6gLow.toProto(); |
1094 | ············this.mWifiLogProto.txLinkSpeedCount6GMid·=·this.mTxLinkSpeedCount6gMid.toProto(); | 1101 | ············this.mWifiLogProto.txLinkSpeedCount6GMid·=·this.mTxLinkSpeedCount6gMid.toProto(); |
1095 | ············this.mWifiLogProto.txLinkSpeedCount6GHigh·=·this.mTxLinkSpeedCount6gHigh.toProto(); | 1102 | ············this.mWifiLogProto.txLinkSpeedCount6GHigh·=·this.mTxLinkSpeedCount6gHigh.toProto(); |
Offset 1176, 15 lines modified | Offset 1183, 42 lines modified |
1176 | ········else·{ | 1183 | ········else·{ |
1177 | ············n·=·12; | 1184 | ············n·=·12; |
1178 | ········} | 1185 | ········} |
1179 | ········return·n; | 1186 | ········return·n; |
1180 | ····} | 1187 | ····} |
1181 | ···· | 1188 | ···· |
1182 | ····private·WifiMetricsProto$PasspointProfileTypeCount[]·convertPasspointProfilesToProto(final·IntCounter·intCounter)·{ | 1189 | ····private·WifiMetricsProto$PasspointProfileTypeCount[]·convertPasspointProfilesToProto(final·IntCounter·intCounter)·{ |
1183 | ········return·(WifiMetricsProto$PasspointProfileTypeCount[])intCounter.toProto((Class)WifiMetricsProto$PasspointProfileTypeCount.class,·(IntCounter$ProtobufConverter)-$$Lambda$WifiMetrics$44hWFHu2Ow6KJRWvZOKPKcJF7Ks.INSTANCE); | 1190 | ········return·(WifiMetricsProto$PasspointProfileTypeCount[])intCounter.toProto((Class)WifiMetricsProto$PasspointProfileTypeCount.class,·(IntCounter$ProtobufConverter)-$$Lambda$WifiMetrics$VfkmgOBI-fE761gbKu5kyfEh7ZY.INSTANCE); |
| 1191 | ····} |
| 1192 | ···· |
| 1193 | ····private·WifiMetricsProto$NetworkDisableReason·convertToNetworkDisableReason(final·WifiConfiguration·wifiConfiguration,·final·Set·set)·{ |
| 1194 | ········final·WifiConfiguration$NetworkSelectionStatus·networkSelectionStatus·=·wifiConfiguration.getNetworkSelectionStatus(); |
| 1195 | ········final·WifiMetricsProto$NetworkDisableReason·wifiMetricsProto$NetworkDisableReason·=·new·WifiMetricsProto$NetworkDisableReason(); |
| 1196 | ········final·boolean·allowAutojoin·=·wifiConfiguration.allowAutojoin; |
| 1197 | ········final·boolean·configPermanentlyDisabled·=·true; |
| 1198 | ········if·(allowAutojoin)·{ |
| 1199 | ············if·(!networkSelectionStatus.isNetworkEnabled())·{ |
| 1200 | ················wifiMetricsProto$NetworkDisableReason.disableReason·=·MetricsUtils.convertNetworkSelectionDisableReasonToWifiProtoEnum(networkSelectionStatus.getNetworkSelectionDisableReason()); |
| 1201 | ················if·(networkSelectionStatus.isNetworkPermanentlyDisabled())·{ |
| 1202 | ····················wifiMetricsProto$NetworkDisableReason.configPermanentlyDisabled·=·configPermanentlyDisabled; |
| 1203 | ················} |
| 1204 | ················else·{ |
| 1205 | ····················wifiMetricsProto$NetworkDisableReason.configTemporarilyDisabled·=·configPermanentlyDisabled; |
| 1206 | ················} |
| 1207 | ············} |
| 1208 | ········} |
| 1209 | ········else·{ |
| 1210 | ············wifiMetricsProto$NetworkDisableReason.disableReason·=·15; |
| 1211 | ············wifiMetricsProto$NetworkDisableReason.configPermanentlyDisabled·=·configPermanentlyDisabled; |
| 1212 | ········} |
| 1213 | ········final·int[]·array·=·set.stream().mapToInt((ToIntFunction)-$$Lambda$WifiMetrics$gtlE7S-z8oAxhHJ_WaqIJsUzgAo.INSTANCE).toArray(); |
| 1214 | ········if·(array.length·>·0)·{ |
| 1215 | ············wifiMetricsProto$NetworkDisableReason.bssidDisableReasons·=·array; |
| 1216 | ········} |
| 1217 | ········return·wifiMetricsProto$NetworkDisableReason; |
1184 | ····} | 1218 | ····} |
1185 | ···· | 1219 | ···· |
1186 | ····private·WifiMetricsProto$StaEvent$ConfigInfo·createConfigInfo(final·WifiConfiguration·wifiConfiguration)·{ | 1220 | ····private·WifiMetricsProto$StaEvent$ConfigInfo·createConfigInfo(final·WifiConfiguration·wifiConfiguration)·{ |
1187 | ········if·(wifiConfiguration·==·null)·{ | 1221 | ········if·(wifiConfiguration·==·null)·{ |
1188 | ············return·null; | 1222 | ············return·null; |
1189 | ········} | 1223 | ········} |
1190 | ········final·WifiMetricsProto$StaEvent$ConfigInfo·wifiMetricsProto$StaEvent$ConfigInfo·=·new·WifiMetricsProto$StaEvent$ConfigInfo(); | 1224 | ········final·WifiMetricsProto$StaEvent$ConfigInfo·wifiMetricsProto$StaEvent$ConfigInfo·=·new·WifiMetricsProto$StaEvent$ConfigInfo(); |
Offset 2201, 15 lines modified | Offset 2235, 15 lines modified |
2201 | ········orCreateDeviceMobilityStatePnoScanStats.totalDurationMs·+=·mCurrentDeviceMobilityStateStartMs·-·this.mCurrentDeviceMobilityStateStartMs; | 2235 | ········orCreateDeviceMobilityStatePnoScanStats.totalDurationMs·+=·mCurrentDeviceMobilityStateStartMs·-·this.mCurrentDeviceMobilityStateStartMs; |
2202 | ········this.mCurrentDeviceMobilityStateStartMs·=·mCurrentDeviceMobilityStateStartMs; | 2236 | ········this.mCurrentDeviceMobilityStateStartMs·=·mCurrentDeviceMobilityStateStartMs; |
2203 | ····} | 2237 | ····} |
2204 | ···· | 2238 | ···· |
2205 | ····private·void·updateMetricsFromNetworkDetail(final·NetworkDetail·networkDetail)·{ | 2239 | ····private·void·updateMetricsFromNetworkDetail(final·NetworkDetail·networkDetail)·{ |
2206 | ········final·int·dtimInterval·=·networkDetail.getDtimInterval(); | 2240 | ········final·int·dtimInterval·=·networkDetail.getDtimInterval(); |
2207 | ········if·(dtimInterval·>·0)·{ | 2241 | ········if·(dtimInterval·>·0)·{ |
2208 | ············WifiMetrics$RouterFingerPrint.access$1000(this.mCurrentConnectionEvent.mRouterFingerPrint).dtim·=·dtimInterval; | 2242 | ············WifiMetrics$RouterFingerPrint.access$1300(this.mCurrentConnectionEvent.mRouterFingerPrint).dtim·=·dtimInterval; |
2209 | ········} | 2243 | ········} |
2210 | ········final·int·wifiMode·=·networkDetail.getWifiMode(); | 2244 | ········final·int·wifiMode·=·networkDetail.getWifiMode(); |
2211 | ········final·int·n·=·1; | 2245 | ········final·int·n·=·1; |
2212 | ········int·routerTechnology·=·0; | 2246 | ········int·routerTechnology·=·0; |
2213 | ········switch·(wifiMode)·{ | 2247 | ········switch·(wifiMode)·{ |
2214 | ············default:·{ | 2248 | ············default:·{ |
2215 | ················routerTechnology·=·6; | 2249 | ················routerTechnology·=·6; |
Offset 2240, 46 lines modified | Offset 2274, 46 lines modified |
2240 | ················break; | 2274 | ················break; |
2241 | ············} | 2275 | ············} |
2242 | ············case·0:·{ | 2276 | ············case·0:·{ |
2243 | ················routerTechnology·=·0; | 2277 | ················routerTechnology·=·0; |
2244 | ················break; | 2278 | ················break; |
2245 | ············} | 2279 | ············} |
2246 | ········} | 2280 | ········} |
2247 | ········WifiMetrics$RouterFingerPrint.access$1000(this.mCurrentConnectionEvent.mRouterFingerPrint).routerTechnology·=·routerTechnology; | 2281 | ········WifiMetrics$RouterFingerPrint.access$1300(this.mCurrentConnectionEvent.mRouterFingerPrint).routerTechnology·=·routerTechnology; |
2248 | ········if·(networkDetail.isMboSupported())·{ | 2282 | ········if·(networkDetail.isMboSupported())·{ |
2249 | ············final·WifiMetricsProto$WifiLog·mWifiLogProto·=·this.mWifiLogProto; | 2283 | ············final·WifiMetricsProto$WifiLog·mWifiLogProto·=·this.mWifiLogProto; |
2250 | ············mWifiLogProto.numConnectToNetworkSupportingMbo·+=·n; | 2284 | ············mWifiLogProto.numConnectToNetworkSupportingMbo·+=·n; |
2251 | ············if·(networkDetail.isOceSupported())·{ | 2285 | ············if·(networkDetail.isOceSupported())·{ |
2252 | ················final·WifiMetricsProto$WifiLog·mWifiLogProto2·=·this.mWifiLogProto; | 2286 | ················final·WifiMetricsProto$WifiLog·mWifiLogProto2·=·this.mWifiLogProto; |
2253 | ················mWifiLogProto2.numConnectToNetworkSupportingOce·+=·n; | 2287 | ················mWifiLogProto2.numConnectToNetworkSupportingOce·+=·n; |
2254 | ············} | 2288 | ············} |
2255 | ········} | 2289 | ········} |
2256 | ····} | 2290 | ····} |
2257 | ···· | 2291 | ···· |
2258 | ····private·void·updateMetricsFromScanResult(final·ScanResult·scanResult)·{ | 2292 | ····private·void·updateMetricsFromScanResult(final·ScanResult·scanResult)·{ |
2259 | ········final·WifiMetrics$ConnectionEvent·mCurrentConnectionEvent·=·this.mCurrentConnectionEvent; | 2293 | ········final·WifiMetrics$ConnectionEvent·mCurrentConnectionEvent·=·this.mCurrentConnectionEvent; |
2260 | ········mCurrentConnectionEvent.mConnectionEvent.signalStrength·=·scanResult.level; | 2294 | ········mCurrentConnectionEvent.mConnectionEvent.signalStrength·=·scanResult.level; |
2261 | ········WifiMetrics$RouterFingerPrint.access$1000(mCurrentConnectionEvent.mRouterFingerPrint).authentication·=·1; | 2295 | ········WifiMetrics$RouterFingerPrint.access$1300(mCurrentConnectionEvent.mRouterFingerPrint).authentication·=·1; |
2262 | ········WifiMetrics$ConnectionEvent.access$1302(this.mCurrentConnectionEvent,·scanResult.BSSID); | 2296 | ········WifiMetrics$ConnectionEvent.access$1602(this.mCurrentConnectionEvent,·scanResult.BSSID); |
2263 | ········if·(scanResult.capabilities·!=·null)·{ | 2297 | ········if·(scanResult.capabilities·!=·null)·{ |
2264 | ············final·boolean·scanResultForWepNetwork·=·ScanResultUtil.isScanResultForWepNetwork(scanResult); | 2298 | ············final·boolean·scanResultForWepNetwork·=·ScanResultUtil.isScanResultForWepNetwork(scanResult); |
2265 | ············final·int·n·=·2; | 2299 | ············final·int·n·=·2; |
2266 | ············if·(scanResultForWepNetwork)·{ | 2300 | ············if·(scanResultForWepNetwork)·{ |
2267 | ················WifiMetrics$RouterFingerPrint.access$1000(this.mCurrentConnectionEvent.mRouterFingerPrint).authentication·=·n; | 2301 | ················WifiMetrics$RouterFingerPrint.access$1300(this.mCurrentConnectionEvent.mRouterFingerPrint).authentication·=·n; |
2268 | ············} | 2302 | ············} |
2269 | ············else·if·(!ScanResultUtil.isScanResultForPskNetwork(scanResult)·&&·!ScanResultUtil.isScanResultForSaeNetwork(scanResult))·{ | 2303 | ············else·if·(!ScanResultUtil.isScanResultForPskNetwork(scanResult)·&&·!ScanResultUtil.isScanResultForSaeNetwork(scanResult))·{ |
2270 | ················if·(ScanResultUtil.isScanResultForEapNetwork(scanResult)·||·ScanResultUtil.isScanResultForEapSuiteBNetwork(scanResult))·{ | 2304 | ················if·(ScanResultUtil.isScanResultForEapNetwork(scanResult)·||·ScanResultUtil.isScanResultForEapSuiteBNetwork(scanResult))·{ |
2271 | ····················WifiMetrics$RouterFingerPrint.access$1000(this.mCurrentConnectionEvent.mRouterFingerPrint).authentication·=·3; | 2305 | ····················WifiMetrics$RouterFingerPrint.access$1300(this.mCurrentConnectionEvent.mRouterFingerPrint).authentication·=·3; |
2272 | ················} | 2306 | ················} |
2273 | ············} | 2307 | ············} |
2274 | ············else·{ | 2308 | ············else·{ |
2275 | ················WifiMetrics$RouterFingerPrint.access$1000(this.mCurrentConnectionEvent.mRouterFingerPrint).authentication·=·n; | 2309 | ················WifiMetrics$RouterFingerPrint.access$1300(this.mCurrentConnectionEvent.mRouterFingerPrint).authentication·=·n; |
2276 | ············} | 2310 | ············} |
2277 | ········} | 2311 | ········} |
2278 | ········WifiMetrics$RouterFingerPrint.access$1000(this.mCurrentConnectionEvent.mRouterFingerPrint).channelInfo·=·scanResult.frequency; | 2312 | ········WifiMetrics$RouterFingerPrint.access$1300(this.mCurrentConnectionEvent.mRouterFingerPrint).channelInfo·=·scanResult.frequency; |
2279 | ····} | 2313 | ····} |
2280 | ···· | 2314 | ···· |
2281 | ····private·String·wifiSystemStateToString(final·int·n)·{ | 2315 | ····private·String·wifiSystemStateToString(final·int·n)·{ |
2282 | ········if·(n·==·0)·{ | 2316 | ········if·(n·==·0)·{ |
2283 | ············return·"WIFI_UNKNOWN"; | 2317 | ············return·"WIFI_UNKNOWN"; |
2284 | ········} | 2318 | ········} |
2285 | ········if·(n·==·1)·{ | 2319 | ········if·(n·==·1)·{ |
Offset 2364, 37 lines modified | Offset 2398, 38 lines modified |
2364 | ············Label_0031:·{ | 2398 | ············Label_0031:·{ |
2365 | ················if·(n·==·2)·{ | 2399 | ················if·(n·==·2)·{ |
2366 | ····················break·Label_0031; | 2400 | ····················break·Label_0031; |
2367 | ················} | 2401 | ················} |
2368 | ················try·{ | 2402 | ················try·{ |
2369 | ····················//·monitorexit(mLock) | 2403 | ····················//·monitorexit(mLock) |
2370 | ····················return; | 2404 | ····················return; |
2371 | ····················List·list·=·this.mSoftApEventListTethered; | 2405 | ····················Label_0113:·{ |
2372 | ················Block_6_Outer: | 2406 | ························return; |
| 2407 | ····················} |
| 2408 | ····················Label_0106: |
| 2409 | ····················--n; |
2373 | ····················while·(true)·{ | 2410 | ····················while·(true)·{ |
2374 | ························n·=·list.size()·-·n2; | 2411 | ························List·list·=·null; |
2375 | ························while·(true)·{ | 2412 | ························Label_0054:·{ |
2376 | ····························Label_0054:·{ | 2413 | ····························break·Label_0054; |
2377 | ································break·Label_0054; | 2414 | ····························list·=·this.mSoftApEventListTethered; |
| 2415 | ····························while·(true)·{ |
| 2416 | ································break·Label_0044; |
2378 | ································final·WifiMetricsProto$SoftApConnectedClientsEvent·wifiMetricsProto$SoftApConnectedClientsEvent; | 2417 | ································final·WifiMetricsProto$SoftApConnectedClientsEvent·wifiMetricsProto$SoftApConnectedClientsEvent; |
2379 | ································wifiMetricsProto$SoftApConnectedClientsEvent.channelFrequency·=·channelFrequency; | 2418 | ································wifiMetricsProto$SoftApConnectedClientsEvent.channelFrequency·=·channelFrequency; |
2380 | ································wifiMetricsProto$SoftApConnectedClientsEvent.channelBandwidth·=·channelBandwidth; | 2419 | ································wifiMetricsProto$SoftApConnectedClientsEvent.channelBandwidth·=·channelBandwidth; |
2381 | ································return; | 2420 | ································return; |
2382 | ································Label_0106:·{ | 2421 | ································n·=·list.size()·-·n2; |
2383 | ····································--n; | |
2384 | ································} | |
2385 | ································break·Label_0054; | 2422 | ································break·Label_0054; |
2386 | ································Label_0113: | 2423 | ································list·=·this.mSoftApEventListLocalOnly; |
2387 | ································return; | 2424 | ································continue; |
2388 | ····························} | 2425 | ····························} |
2389 | ····························final·WifiMetricsProto$SoftApConnectedClientsEvent·wifiMetricsProto$SoftApConnectedClientsEvent·=·(WifiMetricsProto$SoftApConnectedClientsEvent)list.get(n); | |
2390 | ····························continue; | |
2391 | ························} | 2426 | ························} |
2392 | ························list·=·this.mSoftApEventListLocalOnly; | 2427 | ························final·WifiMetricsProto$SoftApConnectedClientsEvent·wifiMetricsProto$SoftApConnectedClientsEvent·=·(WifiMetricsProto$SoftApConnectedClientsEvent)list.get(n); |
2393 | ························continue·Block_6_Outer; | 2428 | ························continue; |
2394 | ····················} | 2429 | ····················} |
2395 | ················} | 2430 | ················} |
2396 | ················//·iftrue(Label_0113:,·n·<·0) | 2431 | ················//·iftrue(Label_0113:,·n·<·0) |
2397 | ················//·iftrue(Label_0106:,·wifiMetricsProto$SoftApConnectedClientsEvent·==·null·||·wifiMetricsProto$SoftApConnectedClientsEvent.eventType·!=·0) | 2432 | ················//·iftrue(Label_0106:,·wifiMetricsProto$SoftApConnectedClientsEvent·==·null·||·wifiMetricsProto$SoftApConnectedClientsEvent.eventType·!=·0) |
2398 | ················finally·{ | 2433 | ················finally·{ |
2399 | ················} | 2434 | ················} |
2400 | ················//·monitorexit(mLock) | 2435 | ················//·monitorexit(mLock) |
Offset 4351, 37 lines modified | Offset 4386, 38 lines modified |
4351 | ····} | 4386 | ····} |
4352 | ···· | 4387 | ···· |
4353 | ····public·void·endConnectionEvent(int·connectionResultFailureCode,·int·connectivityLevelFailureCode,·int·signalStrength)·{ | 4388 | ····public·void·endConnectionEvent(int·connectionResultFailureCode,·int·connectivityLevelFailureCode,·int·signalStrength)·{ |
4354 | ········synchronized·(this.mLock)·{ | 4389 | ········synchronized·(this.mLock)·{ |
4355 | ············if·(this.mCurrentConnectionEvent·!=·null)·{ | 4390 | ············if·(this.mCurrentConnectionEvent·!=·null)·{ |
4356 | ················int·connectionResult·=·0; | 4391 | ················int·connectionResult·=·0; |
4357 | ················final·boolean·b·=·true; | 4392 | ················final·boolean·b·=·true; |
4358 | ················final·boolean·b2·=·connectionResultFailureCode·==·(b·?·1·:·0)·&&·connectivityLevelFailureCode·==·(b·?·1·:·0)·&&·b; | 4393 | ················final·boolean·connected·=·connectionResultFailureCode·==·(b·?·1·:·0)·&&·connectivityLevelFailureCode·==·(b·?·1·:·0)·&&·b; |
4359 | ················final·WifiMetricsProto$ConnectionEvent·mConnectionEvent·=·this.mCurrentConnectionEvent.mConnectionEvent; | 4394 | ················final·WifiMetricsProto$ConnectionEvent·mConnectionEvent·=·this.mCurrentConnectionEvent.mConnectionEvent; |
4360 | ················if·(b2)·{ | 4395 | ················if·(connected)·{ |
4361 | ····················connectionResult·=·(b·?·1·:·0); | 4396 | ····················connectionResult·=·(b·?·1·:·0); |
4362 | ················} | 4397 | ················} |
4363 | ················mConnectionEvent.connectionResult·=·connectionResult; | 4398 | ················mConnectionEvent.connectionResult·=·connectionResult; |
4364 | ················WifiMetrics$ConnectionEvent.access$1702(this.mCurrentConnectionEvent,·this.mClock.getElapsedSinceBootMillis()); | 4399 | ················WifiMetrics$ConnectionEvent.access$2002(this.mCurrentConnectionEvent,·this.mClock.getElapsedSinceBootMillis()); |
4365 | ················this.mCurrentConnectionEvent.mConnectionEvent.durationTakenToConnectMillis·=·(int)(WifiMetrics$ConnectionEvent.access$1700(this.mCurrentConnectionEvent)·-·WifiMetrics$ConnectionEvent.access$1200(this.mCurrentConnectionEvent)); | 4400 | ················this.mCurrentConnectionEvent.mConnectionEvent.durationTakenToConnectMillis·=·(int)(WifiMetrics$ConnectionEvent.access$2000(this.mCurrentConnectionEvent)·-·WifiMetrics$ConnectionEvent.access$1500(this.mCurrentConnectionEvent)); |
4366 | ················this.mCurrentConnectionEvent.mConnectionEvent.level2FailureCode·=·connectionResultFailureCode; | 4401 | ················this.mCurrentConnectionEvent.mConnectionEvent.level2FailureCode·=·connectionResultFailureCode; |
4367 | ················this.mCurrentConnectionEvent.mConnectionEvent.connectivityLevelFailureCode·=·connectivityLevelFailureCode; | 4402 | ················this.mCurrentConnectionEvent.mConnectionEvent.connectivityLevelFailureCode·=·connectivityLevelFailureCode; |
4368 | ················this.mCurrentConnectionEvent.mConnectionEvent.level2FailureReason·=·signalStrength; | 4403 | ················this.mCurrentConnectionEvent.mConnectionEvent.level2FailureReason·=·signalStrength; |
4369 | ················connectionResultFailureCode·=·this.getConnectionResultFailureCode(connectionResultFailureCode,·signalStrength); | 4404 | ················connectionResultFailureCode·=·this.getConnectionResultFailureCode(connectionResultFailureCode,·signalStrength); |
4370 | ················connectivityLevelFailureCode·=·-1; | 4405 | ················connectivityLevelFailureCode·=·-1; |
4371 | ················if·(connectionResultFailureCode·!=·connectivityLevelFailureCode)·{ | 4406 | ················if·(connectionResultFailureCode·!=·connectivityLevelFailureCode)·{ |
4372 | ····················connectivityLevelFailureCode·=·253; | 4407 | ····················connectivityLevelFailureCode·=·253; |
4373 | ····················signalStrength·=·this.mCurrentConnectionEvent.mConnectionEvent.signalStrength; | 4408 | ····················signalStrength·=·this.mCurrentConnectionEvent.mConnectionEvent.signalStrength; |
4374 | ····················WifiStatsLog.write(connectivityLevelFailureCode,·b2,·connectionResultFailureCode,·signalStrength); | 4409 | ····················WifiStatsLog.write(connectivityLevelFailureCode,·connected,·connectionResultFailureCode,·signalStrength); |
4375 | ················} | 4410 | ················} |
4376 | ················connectionResultFailureCode·=·0; | 4411 | ················connectionResultFailureCode·=·0; |
4377 | ················this.mCurrentConnectionEvent·=·null; | 4412 | ················this.mCurrentConnectionEvent·=·null; |
4378 | ················if·(!b2)·{ | 4413 | ················if·(!connected)·{ |
4379 | ····················this.mScanResultRssiTimestampMillis·=·-1; | 4414 | ····················this.mScanResultRssiTimestampMillis·=·-1; |
4380 | ················} | 4415 | ················} |
| 4416 | ················this.mWifiStatusBuilder.setConnected(connected); |
4381 | ············} | 4417 | ············} |
4382 | ········} | 4418 | ········} |
4383 | ····} | 4419 | ····} |
4384 | ···· | 4420 | ···· |
4385 | ····public·void·enterDeviceMobilityState(int·n)·{ | 4421 | ····public·void·enterDeviceMobilityState(int·n)·{ |
4386 | ········synchronized·(this.mLock)·{ | 4422 | ········synchronized·(this.mLock)·{ |
4387 | ············this.updateCurrentMobilityStateTotalDuration(this.mClock.getElapsedSinceBootMillis()); | 4423 | ············this.updateCurrentMobilityStateTotalDuration(this.mClock.getElapsedSinceBootMillis()); |
Offset 4465, 14 lines modified | Offset 4501, 16 lines modified |
4465 | ········this.mLastPollRssi·=·wifiInfo.getRssi(); | 4501 | ········this.mLastPollRssi·=·wifiInfo.getRssi(); |
4466 | ········this.mLastPollLinkSpeed·=·wifiInfo.getLinkSpeed(); | 4502 | ········this.mLastPollLinkSpeed·=·wifiInfo.getLinkSpeed(); |
4467 | ········this.incrementRssiPollRssiCount(this.mLastPollFreq·=·wifiInfo.getFrequency(),·this.mLastPollRssi); | 4503 | ········this.incrementRssiPollRssiCount(this.mLastPollFreq·=·wifiInfo.getFrequency(),·this.mLastPollRssi); |
4468 | ········this.incrementLinkSpeedCount(this.mLastPollLinkSpeed,·this.mLastPollRssi); | 4504 | ········this.incrementLinkSpeedCount(this.mLastPollLinkSpeed,·this.mLastPollRssi); |
4469 | ········this.mLastPollRxLinkSpeed·=·wifiInfo.getRxLinkSpeedMbps(); | 4505 | ········this.mLastPollRxLinkSpeed·=·wifiInfo.getRxLinkSpeedMbps(); |
4470 | ········this.incrementTxLinkSpeedBandCount(this.mLastPollLinkSpeed,·this.mLastPollFreq); | 4506 | ········this.incrementTxLinkSpeedBandCount(this.mLastPollLinkSpeed,·this.mLastPollFreq); |
4471 | ········this.incrementRxLinkSpeedBandCount(this.mLastPollRxLinkSpeed,·this.mLastPollFreq); | 4507 | ········this.incrementRxLinkSpeedBandCount(this.mLastPollRxLinkSpeed,·this.mLastPollFreq); |
| 4508 | ········this.mWifiStatusBuilder.setRssi(this.mLastPollRssi); |
| 4509 | ········this.mWifiStatusBuilder.setNetworkId(wifiInfo.getNetworkId()); |
4472 | ····} | 4510 | ····} |
4473 | ···· | 4511 | ···· |
4474 | ····public·void·incrementAvailableNetworksHistograms(final·List·list,·final·boolean·b)·{ | 4512 | ····public·void·incrementAvailableNetworksHistograms(final·List·list,·final·boolean·b)·{ |
4475 | ········synchronized·(this.mLock)·{ | 4513 | ········synchronized·(this.mLock)·{ |
4476 | ············if·(this.mWifiConfigManager·==·null·||·this.mWifiNetworkSelector·==·null·||·this.mPasspointManager·==·null)·{ | 4514 | ············if·(this.mWifiConfigManager·==·null·||·this.mWifiNetworkSelector·==·null·||·this.mPasspointManager·==·null)·{ |
4477 | ················return; | 4515 | ················return; |
4478 | ············} | 4516 | ············} |
Offset 5240, 42 lines modified | Offset 5278, 49 lines modified |
5240 | ····public·void·incrementNumWifiToggles(final·boolean·b,·final·boolean·b2)·{ | 5278 | ····public·void·incrementNumWifiToggles(final·boolean·b,·final·boolean·b2)·{ |
5241 | ········final·Object·mLock·=·this.mLock; | 5279 | ········final·Object·mLock·=·this.mLock; |
5242 | ········//·monitorenter(mLock) | 5280 | ········//·monitorenter(mLock) |
5243 | ········Label_0039:·{ | 5281 | ········Label_0039:·{ |
5244 | ············if·(!b·||·!b2)·{ | 5282 | ············if·(!b·||·!b2)·{ |
5245 | ················break·Label_0039; | 5283 | ················break·Label_0039; |
5246 | ············} | 5284 | ············} |
| 5285 | ············WifiMetricsProto$WifiToggleStats·mWifiToggleStats; |
| 5286 | ············WifiMetricsProto$WifiToggleStats·mWifiToggleStats2; |
| 5287 | ············WifiMetricsProto$WifiToggleStats·mWifiToggleStats3; |
| 5288 | ············WifiMetricsProto$WifiToggleStats·mWifiToggleStats4; |
| 5289 | ············Block_6_Outer:Block_8_Outer: |
5247 | ············while·(true)·{ | 5290 | ············while·(true)·{ |
5248 | ················try·{ | 5291 | ················try·{ |
5249 | ····················final·WifiMetricsProto$WifiToggleStats·mWifiToggleStats·=·this.mWifiToggleStats; | 5292 | ····················mWifiToggleStats·=·this.mWifiToggleStats; |
5250 | ····················++mWifiToggleStats.numToggleOnPrivileged; | 5293 | ····················++mWifiToggleStats.numToggleOnPrivileged; |
5251 | ····················break·Label_0112; | 5294 | ····················break·Label_0112; |
5252 | ················} | 5295 | ················} |
5253 | ················finally·{ | 5296 | ················finally·{ |
5254 | ····················//·monitorexit(mLock) | 5297 | ····················//·monitorexit(mLock) |
5255 | ····················//·monitorexit(mLock) | 5298 | ····················//·monitorexit(mLock) |
5256 | ····················return; | 5299 | ····················//·iftrue(Label_0067:,·!b·||·b2) |
5257 | ····················final·WifiMetricsProto$WifiToggleStats·mWifiToggleStats2; | 5300 | ····················while·(true)·{ |
5258 | ····················Label_0067:·{ | |
5259 | ························mWifiToggleStats2·=·this.mWifiToggleStats; | 5301 | ························mWifiToggleStats2·=·this.mWifiToggleStats; |
| 5302 | ························++mWifiToggleStats2.numToggleOffPrivileged; |
| 5303 | ························return; |
| 5304 | ························continue·Block_8_Outer; |
5260 | ····················} | 5305 | ····················} |
5261 | ····················//·iftrue(Label_0095:,·b·||·!b2) | |
5262 | ····················++mWifiToggleStats2.numToggleOnNormal; | |
5263 | ····················continue; | |
5264 | ····················final·WifiMetricsProto$WifiToggleStats·mWifiToggleStats3; | |
5265 | ····················Label_0095:·{ | 5306 | ····················Label_0095:·{ |
5266 | ························mWifiToggleStats3·=·this.mWifiToggleStats; | 5307 | ························mWifiToggleStats3·=·this.mWifiToggleStats; |
5267 | ····················} | 5308 | ····················} |
5268 | ····················++mWifiToggleStats3.numToggleOffNormal; | 5309 | ····················++mWifiToggleStats3.numToggleOffNormal; |
5269 | ····················continue; | 5310 | ····················continue·Block_6_Outer; |
5270 | ····················//·iftrue(Label_0067:,·!b·||·b2) | 5311 | ····················while·(true)·{ |
5271 | ····················final·WifiMetricsProto$WifiToggleStats·mWifiToggleStats4·=·this.mWifiToggleStats; | 5312 | ························mWifiToggleStats4·=·this.mWifiToggleStats; |
5272 | ····················++mWifiToggleStats4.numToggleOffPrivileged; | 5313 | ························++mWifiToggleStats4.numToggleOnNormal; |
5273 | ····················continue; | 5314 | ························continue·Block_6_Outer; |
| 5315 | ························Label_0067: |
| 5316 | ························continue; |
| 5317 | ····················} |
5274 | ················} | 5318 | ················} |
| 5319 | ················//·iftrue(Label_0095:,·b·||·!b2) |
5275 | ················break; | 5320 | ················break; |
5276 | ············} | 5321 | ············} |
5277 | ········} | 5322 | ········} |
5278 | ····} | 5323 | ····} |
5279 | ···· | 5324 | ···· |
5280 | ····public·void·incrementNumWificondCrashes()·{ | 5325 | ····public·void·incrementNumWificondCrashes()·{ |
5281 | ········synchronized·(this.mLock)·{ | 5326 | ········synchronized·(this.mLock)·{ |
Offset 5471, 15 lines modified | Offset 5516, 15 lines modified |
5471 | ····················} | 5516 | ····················} |
5472 | ····················else·if·(n2·<=·6425)·{ | 5517 | ····················else·if·(n2·<=·6425)·{ |
5473 | ························this.mRxLinkSpeedCount6gLow.increment(n); | 5518 | ························this.mRxLinkSpeedCount6gLow.increment(n); |
5474 | ····················} | 5519 | ····················} |
5475 | ····················else·if·(n2·<=·6875)·{ | 5520 | ····················else·if·(n2·<=·6875)·{ |
5476 | ························this.mRxLinkSpeedCount6gMid.increment(n); | 5521 | ························this.mRxLinkSpeedCount6gMid.increment(n); |
5477 | ····················} | 5522 | ····················} |
5478 | ····················else·if·(n2·<=·7105)·{ | 5523 | ····················else·if·(n2·<=·7115)·{ |
5479 | ························this.mRxLinkSpeedCount6gHigh.increment(n); | 5524 | ························this.mRxLinkSpeedCount6gHigh.increment(n); |
5480 | ····················} | 5525 | ····················} |
5481 | ················} | 5526 | ················} |
5482 | ············} | 5527 | ············} |
5483 | ········} | 5528 | ········} |
5484 | ····} | 5529 | ····} |
5485 | ···· | 5530 | ···· |
Offset 5499, 82 lines modified | Offset 5544, 72 lines modified |
5499 | ············} | 5544 | ············} |
5500 | ············try·{ | 5545 | ············try·{ |
5501 | ················this.mSoftApManagerReturnCodeCounts.put(n,·this.mSoftApManagerReturnCodeCounts.get(n)·+·n); | 5546 | ················this.mSoftApManagerReturnCodeCounts.put(n,·this.mSoftApManagerReturnCodeCounts.get(n)·+·n); |
5502 | ············} | 5547 | ············} |
5503 | ············//·monitorexit(mLock) | 5548 | ············//·monitorexit(mLock) |
5504 | ············finally·{ | 5549 | ············finally·{ |
5505 | ················//·monitorexit(mLock) | 5550 | ················//·monitorexit(mLock) |
5506 | ················Label_0092:·{ | 5551 | ················int·n2·=·0; |
5507 | ····················final·int·n2·=·2; | 5552 | ················Label_0133:·{ |
5508 | ················} | 5553 | ····················value·=·this.mSoftApManagerReturnCodeCounts.get(n2); |
| 5554 | ················} |
| 5555 | ················final·SparseIntArray·mSoftApManagerReturnCodeCounts·=·this.mSoftApManagerReturnCodeCounts; |
| 5556 | ················value·+=·n; |
| 5557 | ················mSoftApManagerReturnCodeCounts.put(n2,·value); |
5509 | ················//·iftrue(Label_0133:,·value·!=·n2) | 5558 | ················//·iftrue(Label_0133:,·value·!=·n2) |
5510 | ················//·iftrue(Label_0092:,·value·!=·n) | 5559 | ················//·iftrue(Label_0092:,·value·!=·n) |
5511 | ················//·monitorexit(mLock) | 5560 | ················Label_0162:·{ |
5512 | ················while·(true)·{ | 5561 | ····················break·Label_0162; |
5513 | ····················Block_5:·{ | 5562 | ····················while·(true)·{ |
5514 | ························break·Block_5; | |
5515 | ························Block_4:·{ | |
5516 | ····························break·Block_4; | |
5517 | ····························return; | |
5518 | ························} | |
5519 | ························final·SparseIntArray·mSoftApManagerReturnCodeCounts·=·this.mSoftApManagerReturnCodeCounts; | |
5520 | ························value·=·3; | |
5521 | ························this.mSoftApManagerReturnCodeCounts.put(value,·mSoftApManagerReturnCodeCounts.get(value)·+·n); | |
5522 | ························continue; | |
5523 | ························final·int·n2; | |
5524 | ························Label_0133: | |
5525 | ························value·=·this.mSoftApManagerReturnCodeCounts.get(n2); | |
5526 | ························final·SparseIntArray·mSoftApManagerReturnCodeCounts2·=·this.mSoftApManagerReturnCodeCounts; | 5563 | ························final·SparseIntArray·mSoftApManagerReturnCodeCounts2·=·this.mSoftApManagerReturnCodeCounts; |
5527 | ························value·+=·n; | 5564 | ························value·=·3; |
5528 | ························mSoftApManagerReturnCodeCounts2.put(n2,·value); | 5565 | ························this.mSoftApManagerReturnCodeCounts.put(value,·mSoftApManagerReturnCodeCounts2.get(value)·+·n); |
| 5566 | ························break·Label_0162; |
| 5567 | ························Label_0092: |
| 5568 | ························n2·=·2; |
| 5569 | ························final·SparseIntArray·mSoftApManagerReturnCodeCounts3·=·this.mSoftApManagerReturnCodeCounts; |
| 5570 | ························value·=·4; |
| 5571 | ························this.mSoftApManagerReturnCodeCounts.put(value,·mSoftApManagerReturnCodeCounts3.get(value)·+·n); |
| 5572 | ························break·Label_0162; |
5529 | ························continue; | 5573 | ························continue; |
5530 | ····················} | 5574 | ····················} |
5531 | ····················final·SparseIntArray·mSoftApManagerReturnCodeCounts3·=·this.mSoftApManagerReturnCodeCounts; | |
5532 | ····················value·=·4; | |
5533 | ····················this.mSoftApManagerReturnCodeCounts.put(value,·mSoftApManagerReturnCodeCounts3.get(value)·+·n); | |
5534 | ····················continue; | |
5535 | ················} | 5575 | ················} |
5536 | ············} | 5576 | ············} |
| 5577 | ············//·monitorexit(mLock) |
5537 | ········} | 5578 | ········} |
5538 | ····} | 5579 | ····} |
5539 | ···· | 5580 | ···· |
5540 | ····public·void·incrementSteeringRequestCountIncludingMboAssocRetryDelay()·{ | 5581 | ····public·void·incrementSteeringRequestCountIncludingMboAssocRetryDelay()·{ |
5541 | ········synchronized·(this.mLock)·{ | 5582 | ········synchronized·(this.mLock)·{ |
5542 | ············final·WifiMetricsProto$WifiLog·mWifiLogProto·=·this.mWifiLogProto; | 5583 | ············final·WifiMetricsProto$WifiLog·mWifiLogProto·=·this.mWifiLogProto; |
5543 | ············++mWifiLogProto.numSteeringRequestIncludingMboAssocRetryDelay; | 5584 | ············++mWifiLogProto.numSteeringRequestIncludingMboAssocRetryDelay; |
5544 | ········} | 5585 | ········} |
5545 | ····} | 5586 | ····} |
5546 | ···· | 5587 | ···· |
5547 | ····public·void·incrementThroughputKbpsCount(int·n,·int·n2,·int·is24GHz)·{ | 5588 | ····public·void·incrementThroughputKbpsCount(final·int·estimatedTxKbps,·final·int·estimatedRxKbps,·int·is24GHz)·{ |
5548 | ········synchronized·(this.mLock)·{ | 5589 | ········synchronized·(this.mLock)·{ |
5549 | ············is24GHz·=·(ScanResult.is24GHz(is24GHz)·?·1·:·0); | 5590 | ············is24GHz·=·(ScanResult.is24GHz(is24GHz)·?·1·:·0); |
5550 | ············if·(is24GHz·!=·0)·{ | 5591 | ············if·(is24GHz·!=·0)·{ |
5551 | ················if·(n·>=·0)·{ | 5592 | ················if·(estimatedTxKbps·>=·0)·{ |
5552 | ····················final·IntHistogram·mTxThroughputMbpsHistogram2G·=·this.mTxThroughputMbpsHistogram2G; | 5593 | ····················this.mTxThroughputMbpsHistogram2G.increment(estimatedTxKbps·/·1000); |
5553 | ····················n·/=·1000; | 5594 | ················} |
5554 | ····················mTxThroughputMbpsHistogram2G.increment(n); | 5595 | ················if·(estimatedRxKbps·>=·0)·{ |
5555 | ················} | 5596 | ····················this.mRxThroughputMbpsHistogram2G.increment(estimatedRxKbps·/·1000); |
5556 | ················if·(n2·>=·0)·{ | |
5557 | ····················final·IntHistogram·mRxThroughputMbpsHistogram2G·=·this.mRxThroughputMbpsHistogram2G; | |
5558 | ····················n2·/=·1000; | |
5559 | ····················mRxThroughputMbpsHistogram2G.increment(n2); | |
5560 | ················} | 5597 | ················} |
5561 | ············} | 5598 | ············} |
5562 | ············else·{ | 5599 | ············else·{ |
5563 | ················if·(n·>=·0)·{ | 5600 | ················if·(estimatedTxKbps·>=·0)·{ |
5564 | ····················final·IntHistogram·mTxThroughputMbpsHistogramAbove2G·=·this.mTxThroughputMbpsHistogramAbove2G; | 5601 | ····················this.mTxThroughputMbpsHistogramAbove2G.increment(estimatedTxKbps·/·1000); |
5565 | ····················n·/=·1000; | 5602 | ················} |
5566 | ····················mTxThroughputMbpsHistogramAbove2G.increment(n); | 5603 | ················if·(estimatedRxKbps·>=·0)·{ |
5567 | ················} | 5604 | ····················this.mRxThroughputMbpsHistogramAbove2G.increment(estimatedRxKbps·/·1000); |
5568 | ················if·(n2·>=·0)·{ | |
5569 | ····················final·IntHistogram·mRxThroughputMbpsHistogramAbove2G·=·this.mRxThroughputMbpsHistogramAbove2G; | |
5570 | ····················n2·/=·1000; | |
5571 | ····················mRxThroughputMbpsHistogramAbove2G.increment(n2); | |
5572 | ················} | 5605 | ················} |
5573 | ············} | 5606 | ············} |
| 5607 | ············this.mWifiStatusBuilder.setEstimatedTxKbps(estimatedTxKbps); |
| 5608 | ············this.mWifiStatusBuilder.setEstimatedRxKbps(estimatedRxKbps); |
5574 | ········} | 5609 | ········} |
5575 | ····} | 5610 | ····} |
5576 | ···· | 5611 | ···· |
5577 | ····public·void·incrementTxLinkSpeedBandCount(final·int·n,·final·int·n2)·{ | 5612 | ····public·void·incrementTxLinkSpeedBandCount(final·int·n,·final·int·n2)·{ |
5578 | ········if·(this.mContext.getResources().getBoolean(2130837513))·{ | 5613 | ········if·(this.mContext.getResources().getBoolean(2130837513))·{ |
5579 | ············if·(n·>=·0)·{ | 5614 | ············if·(n·>=·0)·{ |
5580 | ················synchronized·(this.mLock)·{ | 5615 | ················synchronized·(this.mLock)·{ |
Offset 5592, 15 lines modified | Offset 5627, 15 lines modified |
5592 | ····················} | 5627 | ····················} |
5593 | ····················else·if·(n2·<=·6425)·{ | 5628 | ····················else·if·(n2·<=·6425)·{ |
5594 | ························this.mTxLinkSpeedCount6gLow.increment(n); | 5629 | ························this.mTxLinkSpeedCount6gLow.increment(n); |
5595 | ····················} | 5630 | ····················} |
5596 | ····················else·if·(n2·<=·6875)·{ | 5631 | ····················else·if·(n2·<=·6875)·{ |
5597 | ························this.mTxLinkSpeedCount6gMid.increment(n); | 5632 | ························this.mTxLinkSpeedCount6gMid.increment(n); |
5598 | ····················} | 5633 | ····················} |
5599 | ····················else·if·(n2·<=·7105)·{ | 5634 | ····················else·if·(n2·<=·7115)·{ |
5600 | ························this.mTxLinkSpeedCount6gHigh.increment(n); | 5635 | ························this.mTxLinkSpeedCount6gHigh.increment(n); |
5601 | ····················} | 5636 | ····················} |
5602 | ················} | 5637 | ················} |
5603 | ············} | 5638 | ············} |
5604 | ········} | 5639 | ········} |
5605 | ····} | 5640 | ····} |
5606 | ···· | 5641 | ···· |
Offset 5815, 15 lines modified | Offset 5850, 15 lines modified |
5815 | ············sb.append("comparing·the·same·experiment·id:·"); | 5850 | ············sb.append("comparing·the·same·experiment·id:·"); |
5816 | ············sb.append(n); | 5851 | ············sb.append(n); |
5817 | ············Log.e("WifiMetrics",·sb.toString()); | 5852 | ············Log.e("WifiMetrics",·sb.toString()); |
5818 | ············return; | 5853 | ············return; |
5819 | ········} | 5854 | ········} |
5820 | ········final·Pair·pair·=·new·Pair((Object)n,·(Object)n2); | 5855 | ········final·Pair·pair·=·new·Pair((Object)n,·(Object)n2); |
5821 | ········synchronized·(this.mLock)·{ | 5856 | ········synchronized·(this.mLock)·{ |
5822 | ············final·WifiMetrics$NetworkSelectionExperimentResults·wifiMetrics$NetworkSelectionExperimentResults·=·(WifiMetrics$NetworkSelectionExperimentResults)this.mNetworkSelectionExperimentPairNumChoicesCounts.computeIfAbsent(pair,·(Function<?·super·Pair,·?·extends·WifiMetrics$NetworkSelectionExperimentResults>)-$$Lambda$WifiMetrics$TjxJXDOgKTkkf3v-hb8u3gJN0Pg.INSTANCE); | 5857 | ············final·WifiMetrics$NetworkSelectionExperimentResults·wifiMetrics$NetworkSelectionExperimentResults·=·(WifiMetrics$NetworkSelectionExperimentResults)this.mNetworkSelectionExperimentPairNumChoicesCounts.computeIfAbsent(pair,·(Function<?·super·Pair,·?·extends·WifiMetrics$NetworkSelectionExperimentResults>)-$$Lambda$WifiMetrics$Zw6AplRlKCKiR1pApp0LiBzd_GI.INSTANCE); |
5823 | ············IntCounter·intCounter; | 5858 | ············IntCounter·intCounter; |
5824 | ············if·(b)·{ | 5859 | ············if·(b)·{ |
5825 | ················intCounter·=·wifiMetrics$NetworkSelectionExperimentResults.sameSelectionNumChoicesCounter; | 5860 | ················intCounter·=·wifiMetrics$NetworkSelectionExperimentResults.sameSelectionNumChoicesCounter; |
5826 | ············} | 5861 | ············} |
5827 | ············else·{ | 5862 | ············else·{ |
5828 | ················intCounter·=·wifiMetrics$NetworkSelectionExperimentResults.differentSelectionNumChoicesCounter; | 5863 | ················intCounter·=·wifiMetrics$NetworkSelectionExperimentResults.differentSelectionNumChoicesCounter; |
5829 | ············} | 5864 | ············} |
Offset 5869, 15 lines modified | Offset 5904, 17 lines modified |
5869 | ············} | 5904 | ············} |
5870 | ············case·7: | 5905 | ············case·7: |
5871 | ············case·8: | 5906 | ············case·8: |
5872 | ············case·9: | 5907 | ············case·9: |
5873 | ············case·11: | 5908 | ············case·11: |
5874 | ············case·12: | 5909 | ············case·12: |
5875 | ············case·13: | 5910 | ············case·13: |
5876 | ············case·14: | 5911 | ············case·14:·{ |
| 5912 | ················this.mWifiStatusBuilder.setValidated(true); |
| 5913 | ············} |
5877 | ············case·15: | 5914 | ············case·15: |
5878 | ············case·16: | 5915 | ············case·16: |
5879 | ············case·17: | 5916 | ············case·17: |
5880 | ············case·18: | 5917 | ············case·18: |
5881 | ············case·19: | 5918 | ············case·19: |
5882 | ············case·20:·{ | 5919 | ············case·20:·{ |
5883 | ················final·WifiMetricsProto$StaEvent·wifiMetricsProto$StaEvent·=·new·WifiMetricsProto$StaEvent(); | 5920 | ················final·WifiMetricsProto$StaEvent·wifiMetricsProto$StaEvent·=·new·WifiMetricsProto$StaEvent(); |
Offset 6203, 26 lines modified | Offset 6240, 38 lines modified |
6203 | ···· | 6240 | ···· |
6204 | ····public·void·setNetworkSelectorExperimentId(final·int·mNetworkSelectorExperimentId)·{ | 6241 | ····public·void·setNetworkSelectorExperimentId(final·int·mNetworkSelectorExperimentId)·{ |
6205 | ········synchronized·(this.mLock)·{ | 6242 | ········synchronized·(this.mLock)·{ |
6206 | ············this.mNetworkSelectorExperimentId·=·mNetworkSelectorExperimentId; | 6243 | ············this.mNetworkSelectorExperimentId·=·mNetworkSelectorExperimentId; |
6207 | ········} | 6244 | ········} |
6208 | ····} | 6245 | ····} |
6209 | ···· | 6246 | ···· |
6210 | ····public·void·setNominatorForNetwork(final·int·n,·final·int·n2)·{ | 6247 | ····public·void·setNominatorForNetwork(int·userChoice,·int·networkId)·{ |
6211 | ········final·Object·mLock·=·this.mLock; | 6248 | ········final·Object·mLock·=·this.mLock; |
6212 | ········//·monitorenter(mLock) | 6249 | ········//·monitorenter(mLock) |
6213 | ········Label_0019:·{ | 6250 | ········Label_0019:·{ |
6214 | ············if·(n·!=·-1)·{ | 6251 | ············if·(userChoice·!=·-1)·{ |
6215 | ················break·Label_0019; | 6252 | ················break·Label_0019; |
6216 | ············} | 6253 | ············} |
6217 | ············try·{ | 6254 | ············try·{ |
6218 | ················//·monitorexit(mLock) | 6255 | ················//·monitorexit(mLock) |
6219 | ················return; | 6256 | ················return; |
6220 | ················this.mNetworkIdToNominatorId.put(n,·n2); | 6257 | ················while·(true)·{ |
| 6258 | ····················final·WifiMetrics$WifiStatusBuilder·mWifiStatusBuilder·=·this.mWifiStatusBuilder; |
| 6259 | ····················userChoice·=·1; |
| 6260 | ····················mWifiStatusBuilder.setUserChoice((boolean)(userChoice·!=·0)); |
| 6261 | ····················Label_0071:·{ |
| 6262 | ························return; |
| 6263 | ····················} |
| 6264 | ····················this.mNetworkIdToNominatorId.put(userChoice,·networkId); |
| 6265 | ····················networkId·=·this.mWifiStatusBuilder.getNetworkId(); |
| 6266 | ····················continue; |
| 6267 | ················} |
6221 | ············} | 6268 | ············} |
| 6269 | ············//·iftrue(Label_0071:,·networkId·!=·8) |
| 6270 | ············//·iftrue(Label_0071:,·networkId·!=·userChoice) |
6222 | ············finally·{ | 6271 | ············finally·{ |
6223 | ············} | 6272 | ············} |
6224 | ············//·monitorexit(mLock) | 6273 | ············//·monitorexit(mLock) |
6225 | ········} | 6274 | ········} |
6226 | ····} | 6275 | ····} |
6227 | ···· | 6276 | ···· |
6228 | ····public·void·setPasspointManager(final·PasspointManager·mPasspointManager)·{ | 6277 | ····public·void·setPasspointManager(final·PasspointManager·mPasspointManager)·{ |
Offset 6270, 21 lines modified | Offset 6319, 25 lines modified |
6270 | ····public·void·setWifiScoreCard(final·WifiScoreCard·mWifiScoreCard)·{ | 6319 | ····public·void·setWifiScoreCard(final·WifiScoreCard·mWifiScoreCard)·{ |
6271 | ········this.mWifiScoreCard·=·mWifiScoreCard; | 6320 | ········this.mWifiScoreCard·=·mWifiScoreCard; |
6272 | ····} | 6321 | ····} |
6273 | ···· | 6322 | ···· |
6274 | ····public·void·setWifiState(final·int·mWifiState)·{ | 6323 | ····public·void·setWifiState(final·int·mWifiState)·{ |
6275 | ········synchronized·(this.mLock)·{ | 6324 | ········synchronized·(this.mLock)·{ |
6276 | ············this.mWifiState·=·mWifiState; | 6325 | ············this.mWifiState·=·mWifiState; |
6277 | ············boolean·mWifiWinsUsabilityScore·=·true; | 6326 | ············boolean·mWifiWinsUsabilityScore·=·false; |
6278 | ············final·int·n·=·3; | 6327 | ············final·int·n·=·3; |
6279 | ············this.mWifiWins·=·(mWifiState·==·n·&&·mWifiWinsUsabilityScore); | 6328 | ············final·boolean·b·=·true; |
6280 | ············if·(mWifiState·!=·n)·{ | 6329 | ············this.mWifiWins·=·(mWifiState·==·n·&&·b); |
6281 | ················mWifiWinsUsabilityScore·=·false; | 6330 | ············if·(mWifiState·==·n)·{ |
| 6331 | ················mWifiWinsUsabilityScore·=·b; |
6282 | ············} | 6332 | ············} |
6283 | ············this.mWifiWinsUsabilityScore·=·mWifiWinsUsabilityScore; | 6333 | ············this.mWifiWinsUsabilityScore·=·mWifiWinsUsabilityScore; |
| 6334 | ············if·(mWifiState·==·2·||·mWifiState·==·(b·?·1·:·0))·{ |
| 6335 | ················this.mWifiStatusBuilder·=·new·WifiMetrics$WifiStatusBuilder(this); |
| 6336 | ············} |
6284 | ········} | 6337 | ········} |
6285 | ····} | 6338 | ····} |
6286 | ···· | 6339 | ···· |
6287 | ····public·void·setWifiWakeEnabled(final·boolean·isWifiWakeEnabled)·{ | 6340 | ····public·void·setWifiWakeEnabled(final·boolean·isWifiWakeEnabled)·{ |
6288 | ········synchronized·(this.mLock)·{ | 6341 | ········synchronized·(this.mLock)·{ |
6289 | ············this.mWifiLogProto.isWifiWakeEnabled·=·isWifiWakeEnabled; | 6342 | ············this.mWifiLogProto.isWifiWakeEnabled·=·isWifiWakeEnabled; |
6290 | ········} | 6343 | ········} |
Offset 6293, 17 lines modified | Offset 6346, 17 lines modified |
6293 | ····public·int·startConnectionEvent(final·WifiConfiguration·wifiConfiguration,·String·access$200,·int·n)·{ | 6346 | ····public·int·startConnectionEvent(final·WifiConfiguration·wifiConfiguration,·String·access$200,·int·n)·{ |
6294 | ········synchronized·(this.mLock)·{ | 6347 | ········synchronized·(this.mLock)·{ |
6295 | ············final·WifiMetrics$ConnectionEvent·mCurrentConnectionEvent·=·this.mCurrentConnectionEvent; | 6348 | ············final·WifiMetrics$ConnectionEvent·mCurrentConnectionEvent·=·this.mCurrentConnectionEvent; |
6296 | ············final·int·n2·=·7; | 6349 | ············final·int·n2·=·7; |
6297 | ············final·int·n3·=·1; | 6350 | ············final·int·n3·=·1; |
6298 | ············int·n4; | 6351 | ············int·n4; |
6299 | ············if·(mCurrentConnectionEvent·!=·null)·{ | 6352 | ············if·(mCurrentConnectionEvent·!=·null)·{ |
6300 | ················n4·=·(int)(this.mClock.getElapsedSinceBootMillis()·-·WifiMetrics$ConnectionEvent.access$1200(this.mCurrentConnectionEvent)); | 6353 | ················n4·=·(int)(this.mClock.getElapsedSinceBootMillis()·-·WifiMetrics$ConnectionEvent.access$1500(this.mCurrentConnectionEvent)); |
6301 | ················if·(WifiMetrics$ConnectionEvent.access$200(this.mCurrentConnectionEvent)·!=·null·&&·WifiMetrics$ConnectionEvent.access$1300(this.mCurrentConnectionEvent)·!=·null·&&·wifiConfiguration·!=·null·&&·WifiMetrics$ConnectionEvent.access$200(this.mCurrentConnectionEvent).equals(wifiConfiguration.SSID)·&&·(WifiMetrics$ConnectionEvent.access$1300(this.mCurrentConnectionEvent).equals("any")·||·WifiMetrics$ConnectionEvent.access$1300(this.mCurrentConnectionEvent).equals(access$200)))·{ | 6354 | ················if·(WifiMetrics$ConnectionEvent.access$200(this.mCurrentConnectionEvent)·!=·null·&&·WifiMetrics$ConnectionEvent.access$1600(this.mCurrentConnectionEvent)·!=·null·&&·wifiConfiguration·!=·null·&&·WifiMetrics$ConnectionEvent.access$200(this.mCurrentConnectionEvent).equals(wifiConfiguration.SSID)·&&·(WifiMetrics$ConnectionEvent.access$1600(this.mCurrentConnectionEvent).equals("any")·||·WifiMetrics$ConnectionEvent.access$1600(this.mCurrentConnectionEvent).equals(access$200)))·{ |
6302 | ····················WifiMetrics$ConnectionEvent.access$1302(this.mCurrentConnectionEvent,·access$200); | 6355 | ····················WifiMetrics$ConnectionEvent.access$1602(this.mCurrentConnectionEvent,·access$200); |
6303 | ····················this.endConnectionEvent(8,·n3,·0); | 6356 | ····················this.endConnectionEvent(8,·n3,·0); |
6304 | ················} | 6357 | ················} |
6305 | ················else·{ | 6358 | ················else·{ |
6306 | ····················this.endConnectionEvent(n2,·n3,·0); | 6359 | ····················this.endConnectionEvent(n2,·n3,·0); |
6307 | ················} | 6360 | ················} |
6308 | ············} | 6361 | ············} |
6309 | ············else·{ | 6362 | ············else·{ |
Offset 6311, 28 lines modified | Offset 6364, 28 lines modified |
6311 | ············} | 6364 | ············} |
6312 | ············while·(this.mConnectionEventList.size()·>=·256)·{ | 6365 | ············while·(this.mConnectionEventList.size()·>=·256)·{ |
6313 | ················this.mConnectionEventList.remove(0); | 6366 | ················this.mConnectionEventList.remove(0); |
6314 | ············} | 6367 | ············} |
6315 | ············final·WifiMetrics$ConnectionEvent·mCurrentConnectionEvent2·=·new·WifiMetrics$ConnectionEvent(this,·(WifiMetrics$1)null); | 6368 | ············final·WifiMetrics$ConnectionEvent·mCurrentConnectionEvent2·=·new·WifiMetrics$ConnectionEvent(this,·(WifiMetrics$1)null); |
6316 | ············this.mCurrentConnectionEvent·=·mCurrentConnectionEvent2; | 6369 | ············this.mCurrentConnectionEvent·=·mCurrentConnectionEvent2; |
6317 | ············mCurrentConnectionEvent2.mConnectionEvent.startTimeMillis·=·this.mClock.getWallClockMillis(); | 6370 | ············mCurrentConnectionEvent2.mConnectionEvent.startTimeMillis·=·this.mClock.getWallClockMillis(); |
6318 | ············WifiMetrics$ConnectionEvent.access$1302(this.mCurrentConnectionEvent,·access$200); | 6371 | ············WifiMetrics$ConnectionEvent.access$1602(this.mCurrentConnectionEvent,·access$200); |
6319 | ············this.mCurrentConnectionEvent.mConnectionEvent.roamType·=·n; | 6372 | ············this.mCurrentConnectionEvent.mConnectionEvent.roamType·=·n; |
6320 | ············final·WifiMetricsProto$ConnectionEvent·mConnectionEvent·=·this.mCurrentConnectionEvent.mConnectionEvent; | 6373 | ············final·WifiMetricsProto$ConnectionEvent·mConnectionEvent·=·this.mCurrentConnectionEvent.mConnectionEvent; |
6321 | ············n·=·this.mNetworkSelectorExperimentId; | 6374 | ············n·=·this.mNetworkSelectorExperimentId; |
6322 | ············mConnectionEvent.networkSelectorExperimentId·=·n; | 6375 | ············mConnectionEvent.networkSelectorExperimentId·=·n; |
6323 | ············this.mCurrentConnectionEvent.mRouterFingerPrint.updateFromWifiConfiguration(wifiConfiguration); | 6376 | ············this.mCurrentConnectionEvent.mRouterFingerPrint.updateFromWifiConfiguration(wifiConfiguration); |
6324 | ············WifiMetrics$ConnectionEvent.access$1302(this.mCurrentConnectionEvent,·"any"); | 6377 | ············WifiMetrics$ConnectionEvent.access$1602(this.mCurrentConnectionEvent,·"any"); |
6325 | ············WifiMetrics$ConnectionEvent.access$1202(this.mCurrentConnectionEvent,·this.mClock.getElapsedSinceBootMillis()); | 6378 | ············WifiMetrics$ConnectionEvent.access$1502(this.mCurrentConnectionEvent,·this.mClock.getElapsedSinceBootMillis()); |
6326 | ············final·WifiMetrics$ConnectionEvent·mCurrentConnectionEvent3·=·this.mCurrentConnectionEvent; | 6379 | ············final·WifiMetrics$ConnectionEvent·mCurrentConnectionEvent3·=·this.mCurrentConnectionEvent; |
6327 | ············n·=·this.mWifiState; | 6380 | ············n·=·this.mWifiState; |
6328 | ············WifiMetrics$ConnectionEvent.access$1502(mCurrentConnectionEvent3,·n); | 6381 | ············WifiMetrics$ConnectionEvent.access$1802(mCurrentConnectionEvent3,·n); |
6329 | ············final·WifiMetrics$ConnectionEvent·mCurrentConnectionEvent4·=·this.mCurrentConnectionEvent; | 6382 | ············final·WifiMetrics$ConnectionEvent·mCurrentConnectionEvent4·=·this.mCurrentConnectionEvent; |
6330 | ············n·=·(this.mScreenOn·?·1·:·0); | 6383 | ············n·=·(this.mScreenOn·?·1·:·0); |
6331 | ············WifiMetrics$ConnectionEvent.access$1602(mCurrentConnectionEvent4,·(boolean)(n·!=·0)); | 6384 | ············WifiMetrics$ConnectionEvent.access$1902(mCurrentConnectionEvent4,·(boolean)(n·!=·0)); |
6332 | ············this.mConnectionEventList.add(this.mCurrentConnectionEvent); | 6385 | ············this.mConnectionEventList.add(this.mCurrentConnectionEvent); |
6333 | ············this.mScanResultRssiTimestampMillis·=·-1; | 6386 | ············this.mScanResultRssiTimestampMillis·=·-1; |
6334 | ············if·(wifiConfiguration·!=·null)·{ | 6387 | ············if·(wifiConfiguration·!=·null)·{ |
6335 | ················final·WifiMetricsProto$ConnectionEvent·mConnectionEvent2·=·this.mCurrentConnectionEvent.mConnectionEvent; | 6388 | ················final·WifiMetricsProto$ConnectionEvent·mConnectionEvent2·=·this.mCurrentConnectionEvent.mConnectionEvent; |
6336 | ················n·=·wifiConfiguration.macRandomizationSetting; | 6389 | ················n·=·wifiConfiguration.macRandomizationSetting; |
6337 | ················if·(n·==·n3)·{ | 6390 | ················if·(n·==·n3)·{ |
6338 | ····················n·=·n3; | 6391 | ····················n·=·n3; |
Offset 6349, 15 lines modified | Offset 6402, 15 lines modified |
6349 | ················mConnectionEvent4.connectionNominator·=·n; | 6402 | ················mConnectionEvent4.connectionNominator·=·n; |
6350 | ················final·ScanResult·candidate·=·wifiConfiguration.getNetworkSelectionStatus().getCandidate(); | 6403 | ················final·ScanResult·candidate·=·wifiConfiguration.getNetworkSelectionStatus().getCandidate(); |
6351 | ················if·(candidate·!=·null)·{ | 6404 | ················if·(candidate·!=·null)·{ |
6352 | ····················this.mScanResultRssi·=·candidate.level; | 6405 | ····················this.mScanResultRssi·=·candidate.level; |
6353 | ····················this.mScanResultRssiTimestampMillis·=·this.mClock.getElapsedSinceBootMillis(); | 6406 | ····················this.mScanResultRssiTimestampMillis·=·this.mClock.getElapsedSinceBootMillis(); |
6354 | ················} | 6407 | ················} |
6355 | ················final·WifiMetricsProto$ConnectionEvent·mConnectionEvent5·=·this.mCurrentConnectionEvent.mConnectionEvent; | 6408 | ················final·WifiMetricsProto$ConnectionEvent·mConnectionEvent5·=·this.mCurrentConnectionEvent.mConnectionEvent; |
6356 | ················n·=·this.mBssidBlocklistMonitor.getNumBlockedBssidsForSsid(wifiConfiguration.SSID); | 6409 | ················n·=·this.mBssidBlocklistMonitor.updateAndGetNumBlockedBssidsForSsid(wifiConfiguration.SSID); |
6357 | ················mConnectionEvent5.numBssidInBlocklist·=·n; | 6410 | ················mConnectionEvent5.numBssidInBlocklist·=·n; |
6358 | ················this.mCurrentConnectionEvent.mConnectionEvent.networkType·=·0; | 6411 | ················this.mCurrentConnectionEvent.mConnectionEvent.networkType·=·0; |
6359 | ················this.mCurrentConnectionEvent.mConnectionEvent.isOsuProvisioned·=·false; | 6412 | ················this.mCurrentConnectionEvent.mConnectionEvent.isOsuProvisioned·=·false; |
6360 | ················final·boolean·passpoint·=·wifiConfiguration.isPasspoint(); | 6413 | ················final·boolean·passpoint·=·wifiConfiguration.isPasspoint(); |
6361 | ················n·=·2; | 6414 | ················n·=·2; |
6362 | ················if·(passpoint)·{ | 6415 | ················if·(passpoint)·{ |
6363 | ····················this.mCurrentConnectionEvent.mConnectionEvent.networkType·=·3; | 6416 | ····················this.mCurrentConnectionEvent.mConnectionEvent.networkType·=·3; |
Offset 6561, 40 lines modified | Offset 6614, 45 lines modified |
6561 | ············Label_0028:·{ | 6614 | ············Label_0028:·{ |
6562 | ················if·(n·==·2)·{ | 6615 | ················if·(n·==·2)·{ |
6563 | ····················break·Label_0028; | 6616 | ····················break·Label_0028; |
6564 | ················} | 6617 | ················} |
6565 | ················try·{ | 6618 | ················try·{ |
6566 | ····················//·monitorexit(mLock) | 6619 | ····················//·monitorexit(mLock) |
6567 | ····················return; | 6620 | ····················return; |
6568 | ····················List·list·=·this.mSoftApEventListLocalOnly; | 6621 | ····················List·list·=·this.mSoftApEventListTethered; |
6569 | ····················//·iftrue(Label_0111:,·n·<·0) | 6622 | ················Label_0051_Outer: |
6570 | ····················//·iftrue(Label_0104:,·wifiMetricsProto$SoftApConnectedClientsEvent·==·null·||·wifiMetricsProto$SoftApConnectedClientsEvent.eventType·!=·0) | |
6571 | ····················while·(true)·{ | 6623 | ····················while·(true)·{ |
6572 | ························Label_0041:·{ | 6624 | ························n·=·list.size()·-·n2; |
6573 | ····························break·Label_0041; | 6625 | ····················Block_4_Outer: |
6574 | ····························while·(true)·{ | 6626 | ························while·(true)·{ |
6575 | ································final·WifiMetricsProto$SoftApConnectedClientsEvent·wifiMetricsProto$SoftApConnectedClientsEvent; | 6627 | ····························break·Label_0051; |
6576 | ································wifiMetricsProto$SoftApConnectedClientsEvent.maxNumClientsSettingInSoftapCapability·=·softApCapability.getMaxSupportedClients(); | 6628 | ····························WifiMetricsProto$SoftApConnectedClientsEvent·wifiMetricsProto$SoftApConnectedClientsEvent·=·null; |
6577 | ································return; | 6629 | ····························Block_6:·{ |
6578 | ································wifiMetricsProto$SoftApConnectedClientsEvent·=·list.get(n); | 6630 | ································while·(true)·{ |
6579 | ································continue; | 6631 | ····································wifiMetricsProto$SoftApConnectedClientsEvent·=·list.get(n); |
| 6632 | ····································break·Block_6; |
| 6633 | ····································continue; |
| 6634 | ································} |
| 6635 | ································Label_0111:·{ |
| 6636 | ····································return; |
| 6637 | ································} |
6580 | ····························} | 6638 | ····························} |
6581 | ····························Label_0111:·{ | 6639 | ····························wifiMetricsProto$SoftApConnectedClientsEvent.maxNumClientsSettingInSoftapCapability·=·softApCapability.getMaxSupportedClients(); |
6582 | ································return; | 6640 | ····························return; |
| 6641 | ····························Label_0104:·{ |
| 6642 | ································--n; |
6583 | ····························} | 6643 | ····························} |
6584 | ····························list·=·this.mSoftApEventListTethered; | 6644 | ····························continue·Block_4_Outer; |
6585 | ····························break·Label_0041; | |
6586 | ····························Label_0104: | |
6587 | ····························--n; | |
6588 | ····························continue; | |
6589 | ························} | 6645 | ························} |
6590 | ························n·=·list.size()·-·n2; | 6646 | ························list·=·this.mSoftApEventListLocalOnly; |
6591 | ························continue; | 6647 | ························continue·Label_0051_Outer; |
6592 | ····················} | 6648 | ····················} |
6593 | ················} | 6649 | ················} |
| 6650 | ················//·iftrue(Label_0104:,·wifiMetricsProto$SoftApConnectedClientsEvent·==·null·||·wifiMetricsProto$SoftApConnectedClientsEvent.eventType·!=·0) |
| 6651 | ················//·iftrue(Label_0111:,·n·<·0) |
6594 | ················finally·{ | 6652 | ················finally·{ |
6595 | ················} | 6653 | ················} |
6596 | ················//·monitorexit(mLock) | 6654 | ················//·monitorexit(mLock) |
6597 | ············} | 6655 | ············} |
6598 | ········} | 6656 | ········} |
6599 | ····} | 6657 | ····} |
6600 | ···· | 6658 | ···· |
Offset 6611, 44 lines modified | Offset 6669, 40 lines modified |
6611 | ····················break·Label_0028; | 6669 | ····················break·Label_0028; |
6612 | ················} | 6670 | ················} |
6613 | ················try·{ | 6671 | ················try·{ |
6614 | ····················//·monitorexit(mLock) | 6672 | ····················//·monitorexit(mLock) |
6615 | ····················return; | 6673 | ····················return; |
6616 | ····················List·list·=·this.mSoftApEventListLocalOnly; | 6674 | ····················List·list·=·this.mSoftApEventListLocalOnly; |
6617 | ····················//·iftrue(Label_0137:,·n·<·0) | 6675 | ····················//·iftrue(Label_0137:,·n·<·0) |
6618 | ····················//·iftrue(Label_0130:,·wifiMetricsProto$SoftApConnectedClientsEvent·==·null·||·wifiMetricsProto$SoftApConnectedClientsEvent.eventType·!=·0) | |
6619 | ····················while·(true)·{ | 6676 | ····················while·(true)·{ |
6620 | ························Label_0041:·{ | 6677 | ····················Block_4: |
6621 | ····························break·Label_0041; | 6678 | ························while·(true)·{ |
6622 | ····························Label_0137:·{ | 6679 | ····························Label_0041:·{ |
6623 | ································return; | 6680 | ································break·Label_0041; |
6624 | ····························} | 6681 | ································break·Block_4; |
6625 | ····························list·=·this.mSoftApEventListTethered; | 6682 | ································final·WifiMetricsProto$SoftApConnectedClientsEvent·wifiMetricsProto$SoftApConnectedClientsEvent; |
6626 | ····························break·Label_0041; | 6683 | ································wifiMetricsProto$SoftApConnectedClientsEvent.maxNumClientsSettingInSoftapConfiguration·=·softApConfiguration.getMaxNumberOfClients(); |
6627 | ····························while·(true)·{ | 6684 | ································wifiMetricsProto$SoftApConnectedClientsEvent.shutdownTimeoutSettingInSoftapConfiguration·=·softApConfiguration.getShutdownTimeoutMillis(); |
6628 | ································Block_4:·{ | 6685 | ································wifiMetricsProto$SoftApConnectedClientsEvent.clientControlIsEnabled·=·softApConfiguration.isClientControlByUserEnabled(); |
6629 | ····································break·Block_4; | 6686 | ································Label_0137:·{ |
6630 | ····································final·WifiMetricsProto$SoftApConnectedClientsEvent·wifiMetricsProto$SoftApConnectedClientsEvent; | |
6631 | ····································wifiMetricsProto$SoftApConnectedClientsEvent.maxNumClientsSettingInSoftapConfiguration·=·softApConfiguration.getMaxNumberOfClients(); | |
6632 | ····································wifiMetricsProto$SoftApConnectedClientsEvent.shutdownTimeoutSettingInSoftapConfiguration·=·softApConfiguration.getShutdownTimeoutMillis(); | |
6633 | ····································wifiMetricsProto$SoftApConnectedClientsEvent.clientControlIsEnabled·=·softApConfiguration.isClientControlByUserEnabled(); | |
6634 | ····································return; | 6687 | ····································return; |
6635 | ································} | 6688 | ································} |
6636 | ································final·WifiMetricsProto$SoftApConnectedClientsEvent·wifiMetricsProto$SoftApConnectedClientsEvent·=·(WifiMetricsProto$SoftApConnectedClientsEvent)list.get(n); | 6689 | ································Label_0130: |
| 6690 | ································--n; |
6637 | ································continue; | 6691 | ································continue; |
| 6692 | ································list·=·this.mSoftApEventListTethered; |
6638 | ····························} | 6693 | ····························} |
| 6694 | ····························n·=·list.size()·-·n2; |
| 6695 | ····························continue; |
6639 | ························} | 6696 | ························} |
6640 | ························n·=·list.size()·-·n2; | 6697 | ························final·WifiMetricsProto$SoftApConnectedClientsEvent·wifiMetricsProto$SoftApConnectedClientsEvent·=·(WifiMetricsProto$SoftApConnectedClientsEvent)list.get(n); |
6641 | ························continue; | |
6642 | ························Label_0130:·{ | |
6643 | ····························--n; | |
6644 | ························} | |
6645 | ························continue; | 6698 | ························continue; |
6646 | ····················} | 6699 | ····················} |
6647 | ················} | 6700 | ················} |
| 6701 | ················//·iftrue(Label_0130:,·wifiMetricsProto$SoftApConnectedClientsEvent·==·null·||·wifiMetricsProto$SoftApConnectedClientsEvent.eventType·!=·0) |
6648 | ················finally·{ | 6702 | ················finally·{ |
6649 | ················} | 6703 | ················} |
6650 | ················//·monitorexit(mLock) | 6704 | ················//·monitorexit(mLock) |
6651 | ············} | 6705 | ············} |
6652 | ········} | 6706 | ········} |
6653 | ····} | 6707 | ····} |
6654 | ···· | 6708 | ···· |
Offset 6670, 162 lines modified | Offset 6724, 166 lines modified |
6670 | ················break·Label_0018; | 6724 | ················break·Label_0018; |
6671 | ············} | 6725 | ············} |
6672 | ············try·{ | 6726 | ············try·{ |
6673 | ············} | 6727 | ············} |
6674 | ············//·monitorexit(mLock) | 6728 | ············//·monitorexit(mLock) |
6675 | ············finally·{ | 6729 | ············finally·{ |
6676 | ················//·monitorexit(mLock) | 6730 | ················//·monitorexit(mLock) |
6677 | ················WifiMetricsProto$WifiUsabilityStatsEntry·wifiMetricsProto$WifiUsabilityStatsEntry·=·null; | |
6678 | ················Label_0134:·{ | |
6679 | ····················wifiMetricsProto$WifiUsabilityStatsEntry·=·this.mWifiUsabilityStatsEntriesList.remove(); | |
6680 | ················} | |
6681 | ················//·monitorexit(mLock) | |
6682 | ················//·iftrue(Label_1159:,·mScoreBreachLowTimeMillis·==·mScoreBreachLowTimeMillis2) | 6731 | ················//·iftrue(Label_1159:,·mScoreBreachLowTimeMillis·==·mScoreBreachLowTimeMillis2) |
6683 | ················//·iftrue(Label_1064:,·mWifiUsabilityStatsCounter·<·100) | 6732 | ················//·iftrue(Label_1064:,·mWifiUsabilityStatsCounter·<·100) |
6684 | ················int·probeStatusSinceLastUpdate; | 6733 | ················//·iftrue(Label_0938:,·mProbeStatusSinceLastUpdate·==·n) |
| 6734 | ················//·iftrue(Label_0634:,·wifiLinkLayerStats$ChannelStats·==·null) |
| 6735 | ················//·iftrue(Label_1159:,·n3·<·60000L) |
| 6736 | ················//·iftrue(Label_0918:,·mProbeStatusSinceLastUpdate·==·probeStatusSinceLastUpdate) |
| 6737 | ················//·monitorexit(mLock) |
| 6738 | ················//·iftrue(Label_0097:,·wifiLinkLayerStats·!=·null) |
| 6739 | ················//·iftrue(Label_1159:,·n3·>·90000L) |
| 6740 | ················//·iftrue(Label_0134:,·this.mWifiUsabilityStatsEntriesList.size()·>=·40) |
| 6741 | ················WifiMetricsProto$WifiUsabilityStatsEntry·wifiMetricsProto$WifiUsabilityStatsEntry; |
| 6742 | ················long·mScoreBreachLowTimeMillis; |
| 6743 | ················long·mScoreBreachLowTimeMillis2; |
| 6744 | ················String·s; |
| 6745 | ················StringBuilder·sb; |
6685 | ················boolean·isSameBssidAndFreq; | 6746 | ················boolean·isSameBssidAndFreq; |
6686 | ················int·n; | 6747 | ················int·n; |
6687 | ················int·n2; | |
6688 | ················long·mScoreBreachLowTimeMillis; | |
6689 | ················long·mScoreBreachLowTimeMillis2·=·0L; | |
6690 | ················int·mWifiUsabilityStatsCounter; | 6748 | ················int·mWifiUsabilityStatsCounter; |
6691 | ················WifiLinkLayerStats$ChannelStats·wifiLinkLayerStats$ChannelStats; | 6749 | ················WifiLinkLayerStats$ChannelStats·wifiLinkLayerStats$ChannelStats; |
| 6750 | ················String·mLastBssid; |
| 6751 | ················int·n2; |
| 6752 | ················int·mProbeStatusSinceLastUpdate; |
6692 | ················long·n3; | 6753 | ················long·n3; |
| 6754 | ················int·probeStatusSinceLastUpdate; |
6693 | ················int·probeStatusSinceLastUpdate2; | 6755 | ················int·probeStatusSinceLastUpdate2; |
6694 | ················int·mProbeStatusSinceLastUpdate; | 6756 | ················Label_0945:Block_12_Outer: |
6695 | ················String·mLastBssid; | |
6696 | ················String·s; | |
6697 | ················StringBuilder·sb; | |
6698 | ················Label_1159_Outer:Block_12_Outer:Block_17_Outer: | |
6699 | ················while·(true)·{ | 6757 | ················while·(true)·{ |
6700 | ····················while·(true)·{ | 6758 | ····················while·(true)·{ |
6701 | ························Block_16:·{ | 6759 | ····················Label_0154: |
6702 | ····························Block_13:·{ | 6760 | ························while·(true)·{ |
6703 | ································while·(true)·{ | 6761 | ····························Label_1064_Outer:Block_13_Outer:Block_4_Outer:Block_17_Outer: |
6704 | ····································Label_0634:·{ | 6762 | ····························while·(true)·{ |
6705 | ········································Block_14_Outer:Block_5_Outer: | 6763 | ································wifiMetricsProto$WifiUsabilityStatsEntry·=·new·WifiMetricsProto$WifiUsabilityStatsEntry(); |
6706 | ········································while·(true)·{ | 6764 | ································break·Label_0154; |
| 6765 | ································Label_0097:·{ |
| 6766 | ····································while·(true)·{ |
| 6767 | ········································Block_16:·{ |
6707 | ············································while·(true)·{ | 6768 | ············································while·(true)·{ |
6708 | ················································Block_15:·{ | 6769 | ················································while·(true)·{ |
6709 | ····················································while·(true)·{ | 6770 | ····················································while·(true)·{ |
6710 | ························································Label_0154:·{ | 6771 | ····················································Block_15: |
6711 | ····························································break·Label_0154; | 6772 | ························································while·(true)·{ |
6712 | ····························································Label_0928: | 6773 | ····························································mScoreBreachLowTimeMillis·=·this.mScoreBreachLowTimeMillis; |
6713 | ····························································wifiMetricsProto$WifiUsabilityStatsEntry.probeStatusSinceLastUpdate·=·probeStatusSinceLastUpdate; | 6774 | ····························································mScoreBreachLowTimeMillis2·=·-1; |
6714 | ····························································break·Label_0945; | 6775 | ····························································break·Block_15; |
6715 | ····························································this.sendWifiUsabilityStats(this.mSeqNumInsideFramework,·isSameBssidAndFreq,·this.createNewWifiUsabilityStatsEntryParcelable(wifiMetricsProto$WifiUsabilityStatsEntry)); | 6776 | ····························································wifiMetricsProto$WifiUsabilityStatsEntry.probeStatusSinceLastUpdate·=·0; |
6716 | ····························································this.mSeqNumInsideFramework·+=·n; | 6777 | ····························································s·=·"WifiMetrics"; |
6717 | ····························································this.mProbeStatusSinceLastUpdate·=·n; | 6778 | ····························································sb·=·new·StringBuilder(); |
6718 | ····························································this.mProbeElapsedTimeSinceLastUpdateMs·=·n2; | 6779 | ····························································sb.append("Unknown·link·probe·status:·"); |
6719 | ····························································this.mProbeMcsRateSinceLastUpdate·=·n2; | 6780 | ····························································sb.append(this.mProbeStatusSinceLastUpdate); |
6720 | ····························································return; | 6781 | ····························································Log.e(s,·sb.toString()); |
6721 | ····························································while·(true)·{ | 6782 | ····························································wifiMetricsProto$WifiUsabilityStatsEntry.probeElapsedTimeSinceLastUpdateMs·=·this.mProbeElapsedTimeSinceLastUpdateMs; |
| 6783 | ····························································wifiMetricsProto$WifiUsabilityStatsEntry.probeMcsRateSinceLastUpdate·=·this.mProbeMcsRateSinceLastUpdate; |
| 6784 | ····························································wifiMetricsProto$WifiUsabilityStatsEntry.rxLinkSpeedMbps·=·wifiInfo.getRxLinkSpeedMbps(); |
| 6785 | ····························································wifiMetricsProto$WifiUsabilityStatsEntry.isSameBssidAndFreq·=·isSameBssidAndFreq; |
| 6786 | ····························································wifiMetricsProto$WifiUsabilityStatsEntry.seqNumInsideFramework·=·this.mSeqNumInsideFramework; |
| 6787 | ····························································wifiMetricsProto$WifiUsabilityStatsEntry.deviceMobilityState·=·this.mCurrentDeviceMobilityState; |
| 6788 | ····························································this.mWifiUsabilityStatsEntriesList.add(wifiMetricsProto$WifiUsabilityStatsEntry); |
| 6789 | ····························································mWifiUsabilityStatsCounter·=·this.mWifiUsabilityStatsCounter·+·n; |
| 6790 | ····························································this.mWifiUsabilityStatsCounter·=·mWifiUsabilityStatsCounter; |
| 6791 | ····························································Block_14:·{ |
| 6792 | ································································break·Block_14; |
6722 | ································································while·(true)·{ | 6793 | ································································while·(true)·{ |
6723 | ····································································mScoreBreachLowTimeMillis·=·this.mScoreBreachLowTimeMillis; | 6794 | ····································································wifiMetricsProto$WifiUsabilityStatsEntry.totalRadioOnFreqTimeMs·=·wifiLinkLayerStats$ChannelStats.radioOnTimeMs; |
6724 | ····································································mScoreBreachLowTimeMillis2·=·-1; | 6795 | ····································································wifiMetricsProto$WifiUsabilityStatsEntry.totalCcaBusyFreqTimeMs·=·wifiLinkLayerStats$ChannelStats.ccaBusyTimeMs; |
6725 | ····································································break·Block_15; | 6796 | ····································································Label_0634:·{ |
6726 | ····································································this.addToWifiUsabilityStatsList(n,·0,·n2); | 6797 | ········································································wifiMetricsProto$WifiUsabilityStatsEntry.totalBeaconRx·=·wifiLinkLayerStats.beacon_rx; |
6727 | ····································································continue·Block_14_Outer; | 6798 | ····································································} |
| 6799 | ····································································mLastBssid·=·this.mLastBssid; |
| 6800 | ····································································n2·=·-1; |
| 6801 | ····································································n·=·1; |
| 6802 | ····································································isSameBssidAndFreq·=·((mLastBssid·==·null·||·this.mLastFrequency·==·n2·||·(this.mLastBssid.equals(wifiInfo.getBSSID())·&&·this.mLastFrequency·==·wifiInfo.getFrequency()))·&&·n); |
| 6803 | ····································································this.mLastBssid·=·wifiInfo.getBSSID(); |
| 6804 | ····································································this.mLastFrequency·=·wifiInfo.getFrequency(); |
| 6805 | ····································································wifiMetricsProto$WifiUsabilityStatsEntry.wifiScore·=·this.mLastScoreNoReset; |
| 6806 | ····································································wifiMetricsProto$WifiUsabilityStatsEntry.wifiUsabilityScore·=·this.mLastWifiUsabilityScoreNoReset; |
| 6807 | ····································································wifiMetricsProto$WifiUsabilityStatsEntry.seqNumToFramework·=·this.mSeqNumToFramework; |
| 6808 | ····································································wifiMetricsProto$WifiUsabilityStatsEntry.predictionHorizonSec·=·this.mLastPredictionHorizonSecNoReset; |
| 6809 | ····································································mProbeStatusSinceLastUpdate·=·this.mProbeStatusSinceLastUpdate; |
| 6810 | ····································································break·Label_0154; |
| 6811 | ····································································wifiMetricsProto$WifiUsabilityStatsEntry.timeStampMs·=·wifiLinkLayerStats.timeStampInMs; |
| 6812 | ····································································wifiMetricsProto$WifiUsabilityStatsEntry.totalTxSuccess·=·wifiLinkLayerStats.txmpdu_be·+·wifiLinkLayerStats.txmpdu_bk·+·wifiLinkLayerStats.txmpdu_vi·+·wifiLinkLayerStats.txmpdu_vo; |
| 6813 | ····································································wifiMetricsProto$WifiUsabilityStatsEntry.totalTxRetries·=·wifiLinkLayerStats.retries_be·+·wifiLinkLayerStats.retries_bk·+·wifiLinkLayerStats.retries_vi·+·wifiLinkLayerStats.retries_vo; |
| 6814 | ····································································wifiMetricsProto$WifiUsabilityStatsEntry.totalTxBad·=·wifiLinkLayerStats.lostmpdu_be·+·wifiLinkLayerStats.lostmpdu_bk·+·wifiLinkLayerStats.lostmpdu_vi·+·wifiLinkLayerStats.lostmpdu_vo; |
| 6815 | ····································································wifiMetricsProto$WifiUsabilityStatsEntry.totalRxSuccess·=·wifiLinkLayerStats.rxmpdu_be·+·wifiLinkLayerStats.rxmpdu_bk·+·wifiLinkLayerStats.rxmpdu_vi·+·wifiLinkLayerStats.rxmpdu_vo; |
| 6816 | ····································································wifiMetricsProto$WifiUsabilityStatsEntry.totalRadioOnTimeMs·=·wifiLinkLayerStats.on_time; |
| 6817 | ····································································wifiMetricsProto$WifiUsabilityStatsEntry.totalRadioTxTimeMs·=·wifiLinkLayerStats.tx_time; |
| 6818 | ····································································wifiMetricsProto$WifiUsabilityStatsEntry.totalRadioRxTimeMs·=·wifiLinkLayerStats.rx_time; |
| 6819 | ····································································wifiMetricsProto$WifiUsabilityStatsEntry.totalScanTimeMs·=·wifiLinkLayerStats.on_time_scan; |
| 6820 | ····································································wifiMetricsProto$WifiUsabilityStatsEntry.totalNanScanTimeMs·=·wifiLinkLayerStats.on_time_nan_scan; |
| 6821 | ····································································wifiMetricsProto$WifiUsabilityStatsEntry.totalBackgroundScanTimeMs·=·wifiLinkLayerStats.on_time_background_scan; |
| 6822 | ····································································wifiMetricsProto$WifiUsabilityStatsEntry.totalRoamScanTimeMs·=·wifiLinkLayerStats.on_time_roam_scan; |
| 6823 | ····································································wifiMetricsProto$WifiUsabilityStatsEntry.totalPnoScanTimeMs·=·wifiLinkLayerStats.on_time_pno_scan; |
| 6824 | ····································································wifiMetricsProto$WifiUsabilityStatsEntry.totalHotspot2ScanTimeMs·=·wifiLinkLayerStats.on_time_hs20_scan; |
| 6825 | ····································································wifiMetricsProto$WifiUsabilityStatsEntry.rssi·=·wifiInfo.getRssi(); |
| 6826 | ····································································wifiMetricsProto$WifiUsabilityStatsEntry.linkSpeedMbps·=·wifiInfo.getLinkSpeed(); |
| 6827 | ····································································wifiLinkLayerStats$ChannelStats·=·(WifiLinkLayerStats$ChannelStats)wifiLinkLayerStats.channelStatsMap.get(wifiInfo.getFrequency()); |
| 6828 | ····································································continue·Block_4_Outer; |
6728 | ································································} | 6829 | ································································} |
6729 | ································································wifiMetricsProto$WifiUsabilityStatsEntry.probeElapsedTimeSinceLastUpdateMs·=·this.mProbeElapsedTimeSinceLastUpdateMs; | |
6730 | ································································wifiMetricsProto$WifiUsabilityStatsEntry.probeMcsRateSinceLastUpdate·=·this.mProbeMcsRateSinceLastUpdate; | |
6731 | ································································wifiMetricsProto$WifiUsabilityStatsEntry.rxLinkSpeedMbps·=·wifiInfo.getRxLinkSpeedMbps(); | |
6732 | ································································wifiMetricsProto$WifiUsabilityStatsEntry.isSameBssidAndFreq·=·isSameBssidAndFreq; | |
6733 | ································································wifiMetricsProto$WifiUsabilityStatsEntry.seqNumInsideFramework·=·this.mSeqNumInsideFramework; | |
6734 | ································································wifiMetricsProto$WifiUsabilityStatsEntry.deviceMobilityState·=·this.mCurrentDeviceMobilityState; | |
6735 | ································································this.mWifiUsabilityStatsEntriesList.add(wifiMetricsProto$WifiUsabilityStatsEntry); | |
6736 | ································································mWifiUsabilityStatsCounter·=·this.mWifiUsabilityStatsCounter·+·n; | |
6737 | ································································this.mWifiUsabilityStatsCounter·=·mWifiUsabilityStatsCounter; | |
6738 | ································································continue·Block_5_Outer; | |
6739 | ····························································} | 6830 | ····························································} |
6740 | ····························································wifiMetricsProto$WifiUsabilityStatsEntry·=·new·WifiMetricsProto$WifiUsabilityStatsEntry(); | 6831 | ····························································this.addToWifiUsabilityStatsList(n,·0,·n2); |
6741 | ····························································break·Label_0154; | 6832 | ····························································continue·Block_13_Outer; |
6742 | ····························································wifiMetricsProto$WifiUsabilityStatsEntry.totalRadioOnFreqTimeMs·=·wifiLinkLayerStats$ChannelStats.radioOnTimeMs; | |
6743 | ····························································wifiMetricsProto$WifiUsabilityStatsEntry.totalCcaBusyFreqTimeMs·=·wifiLinkLayerStats$ChannelStats.ccaBusyTimeMs; | |
6744 | ····························································break·Label_0634; | |
6745 | ························································} | 6833 | ························································} |
6746 | ························································wifiMetricsProto$WifiUsabilityStatsEntry.timeStampMs·=·wifiLinkLayerStats.timeStampInMs; | 6834 | ························································n3·=·this.mClock.getElapsedSinceBootMillis()·-·this.mScoreBreachLowTimeMillis; |
6747 | ························································wifiMetricsProto$WifiUsabilityStatsEntry.totalTxSuccess·=·wifiLinkLayerStats.txmpdu_be·+·wifiLinkLayerStats.txmpdu_bk·+·wifiLinkLayerStats.txmpdu_vi·+·wifiLinkLayerStats.txmpdu_vo; | 6835 | ························································break·Block_16; |
6748 | ························································wifiMetricsProto$WifiUsabilityStatsEntry.totalTxRetries·=·wifiLinkLayerStats.retries_be·+·wifiLinkLayerStats.retries_bk·+·wifiLinkLayerStats.retries_vi·+·wifiLinkLayerStats.retries_vo; | 6836 | ························································wifiLinkLayerStats·=·new·WifiLinkLayerStats(); |
6749 | ························································wifiMetricsProto$WifiUsabilityStatsEntry.totalTxBad·=·wifiLinkLayerStats.lostmpdu_be·+·wifiLinkLayerStats.lostmpdu_bk·+·wifiLinkLayerStats.lostmpdu_vi·+·wifiLinkLayerStats.lostmpdu_vo; | 6837 | ························································wifiLinkLayerStats.timeStampInMs·=·this.mClock.getElapsedSinceBootMillis(); |
6750 | ························································wifiMetricsProto$WifiUsabilityStatsEntry.totalRxSuccess·=·wifiLinkLayerStats.rxmpdu_be·+·wifiLinkLayerStats.rxmpdu_bk·+·wifiLinkLayerStats.rxmpdu_vi·+·wifiLinkLayerStats.rxmpdu_vo; | 6838 | ························································wifiLinkLayerStats.txmpdu_be·=·wifiInfo.txSuccess; |
6751 | ························································wifiMetricsProto$WifiUsabilityStatsEntry.totalRadioOnTimeMs·=·wifiLinkLayerStats.on_time; | 6839 | ························································wifiLinkLayerStats.retries_be·=·wifiInfo.txRetries; |
6752 | ························································wifiMetricsProto$WifiUsabilityStatsEntry.totalRadioTxTimeMs·=·wifiLinkLayerStats.tx_time; | 6840 | ························································wifiLinkLayerStats.lostmpdu_be·=·wifiInfo.txBad; |
6753 | ························································wifiMetricsProto$WifiUsabilityStatsEntry.totalRadioRxTimeMs·=·wifiLinkLayerStats.rx_time; | 6841 | ························································wifiLinkLayerStats.rxmpdu_be·=·wifiInfo.rxSuccess; |
6754 | ························································wifiMetricsProto$WifiUsabilityStatsEntry.totalScanTimeMs·=·wifiLinkLayerStats.on_time_scan; | 6842 | ························································break·Label_0097; |
6755 | ························································wifiMetricsProto$WifiUsabilityStatsEntry.totalNanScanTimeMs·=·wifiLinkLayerStats.on_time_nan_scan; | 6843 | ························································probeStatusSinceLastUpdate·=·3; |
6756 | ························································wifiMetricsProto$WifiUsabilityStatsEntry.totalBackgroundScanTimeMs·=·wifiLinkLayerStats.on_time_background_scan; | 6844 | ························································continue·Block_4_Outer; |
6757 | ························································wifiMetricsProto$WifiUsabilityStatsEntry.totalRoamScanTimeMs·=·wifiLinkLayerStats.on_time_roam_scan; | |
6758 | ························································wifiMetricsProto$WifiUsabilityStatsEntry.totalPnoScanTimeMs·=·wifiLinkLayerStats.on_time_pno_scan; | |
6759 | ························································wifiMetricsProto$WifiUsabilityStatsEntry.totalHotspot2ScanTimeMs·=·wifiLinkLayerStats.on_time_hs20_scan; | |
6760 | ························································wifiMetricsProto$WifiUsabilityStatsEntry.rssi·=·wifiInfo.getRssi(); | |
6761 | ························································wifiMetricsProto$WifiUsabilityStatsEntry.linkSpeedMbps·=·wifiInfo.getLinkSpeed(); | |
6762 | ························································wifiLinkLayerStats$ChannelStats·=·(WifiLinkLayerStats$ChannelStats)wifiLinkLayerStats.channelStatsMap.get(wifiInfo.getFrequency()); | |
6763 | ························································continue·Block_12_Outer; | |
6764 | ····················································} | 6845 | ····················································} |
| 6846 | ····················································this.sendWifiUsabilityStats(this.mSeqNumInsideFramework,·isSameBssidAndFreq,·this.createNewWifiUsabilityStatsEntryParcelable(wifiMetricsProto$WifiUsabilityStatsEntry)); |
| 6847 | ····················································this.mSeqNumInsideFramework·+=·n; |
| 6848 | ····················································this.mProbeStatusSinceLastUpdate·=·n; |
| 6849 | ····················································this.mProbeElapsedTimeSinceLastUpdateMs·=·n2; |
| 6850 | ····················································this.mProbeMcsRateSinceLastUpdate·=·n2; |
| 6851 | ····················································return; |
| 6852 | ····················································Label_0928:·{ |
| 6853 | ························································wifiMetricsProto$WifiUsabilityStatsEntry.probeStatusSinceLastUpdate·=·probeStatusSinceLastUpdate2; |
| 6854 | ····················································} |
| 6855 | ····················································continue·Label_0945; |
| 6856 | ····················································continue·Block_12_Outer; |
6765 | ················································} | 6857 | ················································} |
6766 | ················································n3·=·this.mClock.getElapsedSinceBootMillis()·-·this.mScoreBreachLowTimeMillis; | 6858 | ················································this.addToWifiUsabilityStatsList(n,·0,·n2); |
6767 | ················································break·Block_16; | 6859 | ················································continue·Block_17_Outer; |
6768 | ················································Block_4:·{ | |
6769 | ····················································break·Block_4; | |
6770 | ····················································probeStatusSinceLastUpdate2·=·3; | |
6771 | ····················································break·Block_13; | |
6772 | ················································} | |
6773 | ················································wifiLinkLayerStats·=·new·WifiLinkLayerStats(); | |
6774 | ················································wifiLinkLayerStats.timeStampInMs·=·this.mClock.getElapsedSinceBootMillis(); | |
6775 | ················································wifiLinkLayerStats.txmpdu_be·=·wifiInfo.txSuccess; | |
6776 | ················································wifiLinkLayerStats.retries_be·=·wifiInfo.txRetries; | |
6777 | ················································wifiLinkLayerStats.lostmpdu_be·=·wifiInfo.txBad; | |
6778 | ················································wifiLinkLayerStats.rxmpdu_be·=·wifiInfo.rxSuccess; | |
6779 | ················································Label_0097: | |
6780 | ················································continue·Block_12_Outer; | |
6781 | ············································} | 6860 | ············································} |
6782 | ············································this.addToWifiUsabilityStatsList(n,·0,·n2); | |
6783 | ············································continue·Block_5_Outer; | |
6784 | ········································} | 6861 | ········································} |
| 6862 | ········································this.mScoreBreachLowTimeMillis·=·mScoreBreachLowTimeMillis2; |
| 6863 | ········································continue; |
6785 | ····································} | 6864 | ····································} |
6786 | ····································wifiMetricsProto$WifiUsabilityStatsEntry.totalBeaconRx·=·wifiLinkLayerStats.beacon_rx; | 6865 | ····································Label_0918:·{ |
6787 | ····································mLastBssid·=·this.mLastBssid; | 6866 | ········································wifiMetricsProto$WifiUsabilityStatsEntry.probeStatusSinceLastUpdate·=·probeStatusSinceLastUpdate; |
6788 | ····································n2·=·-1; | 6867 | ····································} |
6789 | ····································n·=·1; | 6868 | ····································continue·Label_0945; |
6790 | ····································isSameBssidAndFreq·=·((mLastBssid·==·null·||·this.mLastFrequency·==·n2·||·(this.mLastBssid.equals(wifiInfo.getBSSID())·&&·this.mLastFrequency·==·wifiInfo.getFrequency()))·&&·n); | |
6791 | ····································this.mLastBssid·=·wifiInfo.getBSSID(); | |
6792 | ····································this.mLastFrequency·=·wifiInfo.getFrequency(); | |
6793 | ····································wifiMetricsProto$WifiUsabilityStatsEntry.wifiScore·=·this.mLastScoreNoReset; | |
6794 | ····································wifiMetricsProto$WifiUsabilityStatsEntry.wifiUsabilityScore·=·this.mLastWifiUsabilityScoreNoReset; | |
6795 | ····································wifiMetricsProto$WifiUsabilityStatsEntry.seqNumToFramework·=·this.mSeqNumToFramework; | |
6796 | ····································wifiMetricsProto$WifiUsabilityStatsEntry.predictionHorizonSec·=·this.mLastPredictionHorizonSecNoReset; | |
6797 | ····································mProbeStatusSinceLastUpdate·=·this.mProbeStatusSinceLastUpdate; | |
6798 | ····································probeStatusSinceLastUpdate·=·2; | |
6799 | ····································continue·Block_17_Outer; | |
6800 | ································} | 6869 | ································} |
6801 | ································Label_0918: | 6870 | ································continue·Label_1064_Outer; |
6802 | ································wifiMetricsProto$WifiUsabilityStatsEntry.probeStatusSinceLastUpdate·=·probeStatusSinceLastUpdate2; | |
6803 | ································continue·Label_1159_Outer; | |
6804 | ····························} | 6871 | ····························} |
Max diff block lines reached; 1312/81581 bytes (1.61%) of diff not shown.
|