Merge "[SysUI] Add Low Quality QS indication" into rvc-qpr-dev am: 1c7dda8baf am: fbdbd5ecc6

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12432107

Change-Id: Icd8f84333bb6f73778c51c331ed1c9f4a2aa539c
This commit is contained in:
Etan Cohen
2020-08-27 15:35:43 +00:00
committed by Automerger Merge Worker

View File

@@ -13,6 +13,7 @@ package com.android.settingslib.wifi;
import static android.net.NetworkCapabilities.NET_CAPABILITY_CAPTIVE_PORTAL;
import static android.net.NetworkCapabilities.NET_CAPABILITY_PARTIAL_CONNECTIVITY;
import static android.net.NetworkCapabilities.NET_CAPABILITY_VALIDATED;
import static android.net.NetworkCapabilities.TRANSPORT_CELLULAR;
import android.content.Context;
import android.content.Intent;
@@ -250,6 +251,10 @@ public class WifiStatusTracker {
statusLabel = mContext.getString(R.string.wifi_status_no_internet);
}
return;
} else if (!isDefaultNetwork && mDefaultNetworkCapabilities != null
&& mDefaultNetworkCapabilities.hasTransport(TRANSPORT_CELLULAR)) {
statusLabel = mContext.getString(R.string.wifi_connected_low_quality);
return;
}
}