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

Address comment from aosp/2335004

Browse Source 
Bug: 263681262
Test: atest TetheringMetricsTest
Change-Id: I7372b7717a903d43a543f82e31a0439725d02e3a
This commit is contained in:
Wayne Ma
2023-03-31 09:22:22 +08:00
parent 8f9cab3268
commit fab745c8ae
2 changed files with 19 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
Tethering/src/com/android/networkstack/tethering/metrics/TetheringMetrics.java
View File

@@ -20,7 +20,6 @@ import static android.net.NetworkCapabilities.TRANSPORT_BLUETOOTH;
import static android.net.NetworkCapabilities.TRANSPORT_CELLULAR;
import static android.net.NetworkCapabilities.TRANSPORT_ETHERNET;
import static android.net.NetworkCapabilities.TRANSPORT_LOWPAN;
import static android.net.NetworkCapabilities.TRANSPORT_VPN;
import static android.net.NetworkCapabilities.TRANSPORT_WIFI;
import static android.net.NetworkCapabilities.TRANSPORT_WIFI_AWARE;
import static android.net.TetheringManager.TETHERING_BLUETOOTH;
@@ -159,16 +158,6 @@ public class TetheringMetrics {
mCurrentUpStreamStartTime = newTime;
}
/**
* Returns the greater of two start times.
* @param first the first start time
* @param second the second start time
* @return the greater start time
*/
private long getGreaterStartTime(long first, long second) {
return first > second ? first : second;
}
/**
* Updates the upstream events builder with a new upstream event.
* @param upstreamEventsBuilder the builder for the upstream events list
@@ -176,7 +165,7 @@ public class TetheringMetrics {
* @param stop the stop time of the upstream event
* @param upstream the type of upstream type (e.g. Wifi, Cellular, Bluetooth, ...)
*/
private void updateUpstreamEvents(final UpstreamEvents.Builder upstreamEventsBuilder,
private void addUpstreamEvent(final UpstreamEvents.Builder upstreamEventsBuilder,
final long start, final long stop, @Nullable final UpstreamType upstream) {
final UpstreamEvent.Builder upstreamEventBuilder = UpstreamEvent.newBuilder()
.setUpstreamType(upstream == null ? UpstreamType.UT_NO_NETWORK : upstream)
@@ -201,21 +190,21 @@ public class TetheringMetrics {
* @param downstreamStartTime the start time of the downstream event to find relevant upstream
* events for
*/
private void updateStatsBuilderToWrite(final NetworkTetheringReported.Builder statsBuilder,
private void noteDownstreamStopped(final NetworkTetheringReported.Builder statsBuilder,
final long downstreamStartTime) {
UpstreamEvents.Builder upstreamEventsBuilder = UpstreamEvents.newBuilder();
for (RecordUpstreamEvent event : mUpstreamEventList) {
if (downstreamStartTime > event.mStopTime) continue;
final long startTime = getGreaterStartTime(downstreamStartTime, event.mStartTime);
final long startTime = Math.max(downstreamStartTime, event.mStartTime);
// Handle completed upstream events.
updateUpstreamEvents(upstreamEventsBuilder, startTime, event.mStopTime,
addUpstreamEvent(upstreamEventsBuilder, startTime, event.mStopTime,
event.mUpstreamType);
}
final long startTime = getGreaterStartTime(downstreamStartTime, mCurrentUpStreamStartTime);
final long startTime = Math.max(downstreamStartTime, mCurrentUpStreamStartTime);
final long stopTime = timeNow();
// Handle the last upstream event.
updateUpstreamEvents(upstreamEventsBuilder, startTime, stopTime, mCurrentUpstream);
addUpstreamEvent(upstreamEventsBuilder, startTime, stopTime, mCurrentUpstream);
statsBuilder.setUpstreamEvents(upstreamEventsBuilder);
statsBuilder.setDurationMillis(stopTime - downstreamStartTime);
}
@@ -237,7 +226,7 @@ public class TetheringMetrics {
return;
}
updateStatsBuilderToWrite(statsBuilder, mDownstreamStartTime.get(downstreamType));
noteDownstreamStopped(statsBuilder, mDownstreamStartTime.get(downstreamType));
write(statsBuilder.build());
mBuilderMap.remove(downstreamType);
@@ -365,34 +354,19 @@ public class TetheringMetrics {
if (nc == null) return UpstreamType.UT_NO_NETWORK;
final int typeCount = nc.getTransportTypes().length;
// It's possible for a VCN network to be mapped to UT_UNKNOWN, as it may consist of both
// Wi-Fi and cellular transport.
// TODO: It's necessary to define a new upstream type for VCN, which can be identified by
// NET_CAPABILITY_NOT_VCN_MANAGED.
if (typeCount > 1) return UpstreamType.UT_UNKNOWN;
boolean hasCellular = nc.hasTransport(TRANSPORT_CELLULAR);
boolean hasWifi = nc.hasTransport(TRANSPORT_WIFI);
boolean hasBT = nc.hasTransport(TRANSPORT_BLUETOOTH);
boolean hasEthernet = nc.hasTransport(TRANSPORT_ETHERNET);
boolean hasVpn = nc.hasTransport(TRANSPORT_VPN);
boolean hasWifiAware = nc.hasTransport(TRANSPORT_WIFI_AWARE);
boolean hasLopan = nc.hasTransport(TRANSPORT_LOWPAN);
if (nc.hasTransport(TRANSPORT_CELLULAR)) return UpstreamType.UT_CELLULAR;
if (nc.hasTransport(TRANSPORT_WIFI)) return UpstreamType.UT_WIFI;
if (nc.hasTransport(TRANSPORT_BLUETOOTH)) return UpstreamType.UT_BLUETOOTH;
if (nc.hasTransport(TRANSPORT_ETHERNET)) return UpstreamType.UT_ETHERNET;
if (nc.hasTransport(TRANSPORT_WIFI_AWARE)) return UpstreamType.UT_WIFI_AWARE;
if (nc.hasTransport(TRANSPORT_LOWPAN)) return UpstreamType.UT_LOWPAN;
if (typeCount == 3 && hasCellular && hasWifi && hasVpn) {
return UpstreamType.UT_WIFI_CELLULAR_VPN;
}
if (typeCount == 2 && hasVpn) {
if (hasCellular) return UpstreamType.UT_CELLULAR_VPN;
if (hasWifi) return UpstreamType.UT_WIFI_VPN;
if (hasBT) return UpstreamType.UT_BLUETOOTH_VPN;
if (hasEthernet) return UpstreamType.UT_ETHERNET_VPN;
}
if (typeCount == 1) {
if (hasCellular) return UpstreamType.UT_CELLULAR;
if (hasWifi) return UpstreamType.UT_WIFI;
if (hasBT) return UpstreamType.UT_BLUETOOTH;
if (hasEthernet) return UpstreamType.UT_ETHERNET;
if (hasWifiAware) return UpstreamType.UT_WIFI_AWARE;
if (hasLopan) return UpstreamType.UT_LOWPAN;
}
return UpstreamType.UT_UNKNOWN;
}
}

13
Tethering/tests/unit/src/com/android/networkstack/tethering/metrics/TetheringMetricsTest.java
View File

@@ -20,7 +20,6 @@ import static android.net.NetworkCapabilities.TRANSPORT_BLUETOOTH;
import static android.net.NetworkCapabilities.TRANSPORT_CELLULAR;
import static android.net.NetworkCapabilities.TRANSPORT_ETHERNET;
import static android.net.NetworkCapabilities.TRANSPORT_LOWPAN;
import static android.net.NetworkCapabilities.TRANSPORT_VPN;
import static android.net.NetworkCapabilities.TRANSPORT_WIFI;
import static android.net.NetworkCapabilities.TRANSPORT_WIFI_AWARE;
import static android.net.TetheringManager.TETHERING_BLUETOOTH;
@@ -278,17 +277,7 @@ public final class TetheringMetricsTest {
runUpstreamTypesTest(buildUpstreamState(TRANSPORT_ETHERNET), UpstreamType.UT_ETHERNET);
runUpstreamTypesTest(buildUpstreamState(TRANSPORT_WIFI_AWARE), UpstreamType.UT_WIFI_AWARE);
runUpstreamTypesTest(buildUpstreamState(TRANSPORT_LOWPAN), UpstreamType.UT_LOWPAN);
runUpstreamTypesTest(buildUpstreamState(TRANSPORT_CELLULAR, TRANSPORT_VPN),
UpstreamType.UT_CELLULAR_VPN);
runUpstreamTypesTest(buildUpstreamState(TRANSPORT_WIFI, TRANSPORT_VPN),
UpstreamType.UT_WIFI_VPN);
runUpstreamTypesTest(buildUpstreamState(TRANSPORT_BLUETOOTH, TRANSPORT_VPN),
UpstreamType.UT_BLUETOOTH_VPN);
runUpstreamTypesTest(buildUpstreamState(TRANSPORT_ETHERNET, TRANSPORT_VPN),
UpstreamType.UT_ETHERNET_VPN);
runUpstreamTypesTest(buildUpstreamState(TRANSPORT_CELLULAR, TRANSPORT_WIFI, TRANSPORT_VPN),
UpstreamType.UT_WIFI_CELLULAR_VPN);
runUpstreamTypesTest(buildUpstreamState(TRANSPORT_CELLULAR, TRANSPORT_WIFI, TRANSPORT_VPN,
runUpstreamTypesTest(buildUpstreamState(TRANSPORT_CELLULAR, TRANSPORT_WIFI,
TRANSPORT_BLUETOOTH), UpstreamType.UT_UNKNOWN);
}