diff options
| author | Chiachang Wang <chiachangwang@google.com> | 2020-03-23 11:52:43 +0000 |
|---|---|---|
| committer | Chiachang Wang <chiachangwang@google.com> | 2020-03-23 13:31:44 +0000 |
| commit | 65ba4e7b630618046904a3f024fa3ed5e7af8120 (patch) | |
| tree | e91354b05479271cd3096fdf6f18b8d0a875cebc | |
| parent | 347f667a3fd8f495cb7cb9442bf5a55e9d610264 (diff) | |
Use location mcc to load the array config resource
Align the mechanism to load resource with others inside
NetworkMonitor.
Bug: 141406258
Test: atest NetworkStackTests
Change-Id: I66141e4bdc71d19e766aeec6ca33db8e1cb737fe
Merged-In: I66141e4bdc71d19e766aeec6ca33db8e1cb737fe
(cherry picked from commit a2d25ddbd828fa45f6875e722c6ff18ff4049827)
| -rw-r--r-- | src/com/android/server/connectivity/NetworkMonitor.java | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/com/android/server/connectivity/NetworkMonitor.java b/src/com/android/server/connectivity/NetworkMonitor.java index 438080c..b0a8f8c 100644 --- a/src/com/android/server/connectivity/NetworkMonitor.java +++ b/src/com/android/server/connectivity/NetworkMonitor.java @@ -1608,7 +1608,8 @@ public class NetworkMonitor extends StateMachine { settingProviderUrls = new URL[0]; } - return getArrayConfig(settingProviderUrls, R.array.config_captive_portal_fallback_urls, + return getProbeUrlArrayConfig(settingProviderUrls, + R.array.config_captive_portal_fallback_urls, R.array.default_captive_portal_fallback_urls, this::makeURL); } catch (Exception e) { // Don't let a misconfiguration bootloop the system. @@ -1627,7 +1628,8 @@ public class NetworkMonitor extends StateMachine { ? emptySpecs : parseCaptivePortalProbeSpecs(settingsValue).toArray(emptySpecs); - return getArrayConfig(providerValue, R.array.config_captive_portal_fallback_probe_specs, + return getProbeUrlArrayConfig(providerValue, + R.array.config_captive_portal_fallback_probe_specs, R.array.default_captive_portal_fallback_probe_specs, CaptivePortalProbeSpec::parseSpecOrNull); } catch (Exception e) { @@ -1674,9 +1676,9 @@ public class NetworkMonitor extends StateMachine { * @param resourceConverter Converter from the resource strings to stored setting class. Null * return values are ignored. */ - private <T> T[] getArrayConfig(@NonNull T[] providerValue, @ArrayRes int configResId, + private <T> T[] getProbeUrlArrayConfig(@NonNull T[] providerValue, @ArrayRes int configResId, @ArrayRes int defaultResId, @NonNull Function<String, T> resourceConverter) { - final Resources res = mContext.getResources(); + final Resources res = getContextByMccIfNoSimCardOrDefault().getResources(); String[] configValue = res.getStringArray(configResId); if (configValue.length == 0) { |