summaryrefslogtreecommitdiff
path: root/packages/SettingsLib/src
diff options
context:
space:
mode:
authorEtan Cohen <etancohen@google.com>2020-08-27 15:17:24 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-08-27 15:17:24 +0000
commitfbdbd5ecc6916591b7a6690e22e587a6f585a0d0 (patch)
treeaf369503170cb87780680166c2700eac3f26db34 /packages/SettingsLib/src
parent8100add1fe3e176c17614743a20a62c63113f417 (diff)
parent1c7dda8baf967ba0e69a101d04627b00f21d21be (diff)
Merge "[SysUI] Add Low Quality QS indication" into rvc-qpr-dev am: 1c7dda8baf
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12432107 Change-Id: Ie623ce0b5d4584beb78d608989d583a8776446f4
Diffstat (limited to 'packages/SettingsLib/src')
-rw-r--r--packages/SettingsLib/src/com/android/settingslib/wifi/WifiStatusTracker.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/packages/SettingsLib/src/com/android/settingslib/wifi/WifiStatusTracker.java b/packages/SettingsLib/src/com/android/settingslib/wifi/WifiStatusTracker.java
index bc58bfc97718..c57d4ad962bd 100644
--- a/packages/SettingsLib/src/com/android/settingslib/wifi/WifiStatusTracker.java
+++ b/packages/SettingsLib/src/com/android/settingslib/wifi/WifiStatusTracker.java
@@ -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;
}
}