Merge "Enable wakeup marking for Cellular transport"

This commit is contained in:
Treehugger Robot
2023-04-26 11:13:01 +00:00
committed by Gerrit Code Review

View File

@@ -7925,10 +7925,20 @@ public class ConnectivityService extends IConnectivityManager.Stub
return SdkLevel.isAtLeastU() ? (networkHandle + ":" + iface) : ("iface:" + iface);
}
private static boolean isWakeupMarkingSupported(NetworkCapabilities capabilities) {
if (capabilities.hasTransport(TRANSPORT_WIFI)) {
return true;
}
if (SdkLevel.isAtLeastU() && capabilities.hasTransport(TRANSPORT_CELLULAR)) {
return true;
}
return false;
}
private void wakeupModifyInterface(String iface, NetworkAgentInfo nai, boolean add) {
// Marks are only available on WiFi interfaces. Checking for
// marks on unsupported interfaces is harmless.
if (!nai.networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_WIFI)) {
if (!isWakeupMarkingSupported(nai.networkCapabilities)) {
return;
}