diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-11-23 00:17:39 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-11-23 00:17:39 +0000 |
| commit | 6b609765e5bfc6a5026e0b4e87580b3612506498 (patch) | |
| tree | ac02d108cb2642c4d71e10313baf2bb8571c7ec9 | |
| parent | cfca9d6a6ab40c946f57d953e723ab446c9ce45f (diff) | |
| parent | 8eb0f80289db65d0591eeb046f23f7158c265b3a (diff) | |
| download | wifi-6b609765e5bfc6a5026e0b4e87580b3612506498.tar.gz | |
Snap for 11135477 from 8eb0f80289db65d0591eeb046f23f7158c265b3a to 24Q1-release
Change-Id: I9a50e9e302ebf2ac4ca8e19c7f8dfb60174da7c5
| -rw-r--r-- | libs/WifiTrackerLib/res/values-de/strings.xml | 3 | ||||
| -rw-r--r-- | libs/WifiTrackerLib/src/com/android/wifitrackerlib/WifiPickerTracker.java | 10 |
2 files changed, 9 insertions, 4 deletions
diff --git a/libs/WifiTrackerLib/res/values-de/strings.xml b/libs/WifiTrackerLib/res/values-de/strings.xml index 0dce5cee8..e59101aeb 100644 --- a/libs/WifiTrackerLib/res/values-de/strings.xml +++ b/libs/WifiTrackerLib/res/values-de/strings.xml @@ -45,8 +45,7 @@ <string name="wifi_connected_low_quality" msgid="4478331645458058445">"Niedrige Qualität"</string> <string name="wifitrackerlib_admin_restricted_network" msgid="5439914801076897515">"Von deiner Organisation nicht zugelassen"</string> <string name="wifitrackerlib_hotspot_network_summary" msgid="7661086683527884190">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> von <xliff:g id="MODEL_NAME">%2$s</xliff:g>"</string> - <!-- no translation found for wifitrackerlib_hotspot_network_summary_new (1165705867298669621) --> - <skip /> + <string name="wifitrackerlib_hotspot_network_summary_new" msgid="1165705867298669621">"{DEVICE_TYPE,select, PHONE{{NETWORK_NAME} von deinem Smartphone}TABLET{{NETWORK_NAME} von deinem Tablet}COMPUTER{{NETWORK_NAME} von deinem Computer}WATCH{{NETWORK_NAME} von deiner Smartwatch}VEHICLE{{NETWORK_NAME} von deinem Fahrzeug}other{{NETWORK_NAME} von deinem Gerät}}"</string> <string name="wifitrackerlib_hotspot_network_alternate" msgid="4966814473758893807">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> von <xliff:g id="DEVICE_NAME">%2$s</xliff:g>"</string> <string name="wifitrackerlib_hotspot_network_connecting" msgid="2072252282318270780">"Wird verbunden…"</string> <string name="wifitrackerlib_known_network_summary" msgid="6035425130009353268">"Verfügbar auf <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string> diff --git a/libs/WifiTrackerLib/src/com/android/wifitrackerlib/WifiPickerTracker.java b/libs/WifiTrackerLib/src/com/android/wifitrackerlib/WifiPickerTracker.java index c6de060a7..d36c62594 100644 --- a/libs/WifiTrackerLib/src/com/android/wifitrackerlib/WifiPickerTracker.java +++ b/libs/WifiTrackerLib/src/com/android/wifitrackerlib/WifiPickerTracker.java @@ -507,9 +507,15 @@ public class WifiPickerTracker extends BaseWifiTracker { protected void handleServiceConnected() { if (mInjector.isSharedConnectivityFeatureEnabled()) { mKnownNetworkDataCache.clear(); - mKnownNetworkDataCache.addAll(mSharedConnectivityManager.getKnownNetworks()); + List<KnownNetwork> knownNetworks = mSharedConnectivityManager.getKnownNetworks(); + if (knownNetworks != null) { + mKnownNetworkDataCache.addAll(knownNetworks); + } mHotspotNetworkDataCache.clear(); - mHotspotNetworkDataCache.addAll(mSharedConnectivityManager.getHotspotNetworks()); + List<HotspotNetwork> hotspotNetworks = mSharedConnectivityManager.getHotspotNetworks(); + if (hotspotNetworks != null) { + mHotspotNetworkDataCache.addAll(hotspotNetworks); + } updateKnownNetworkEntryScans(mScanResultUpdater.getScanResults()); updateHotspotNetworkEntries(); HotspotNetworkConnectionStatus status = |