summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorLorenzo Colitti <lorenzo@google.com>2021-03-19 17:45:27 +0900
committerLorenzo Colitti <lorenzo@google.com>2021-03-21 01:54:51 +0900
commit8b77bf790c66b2a64aa2c106502d3482d3dd3437 (patch)
treeda80dae0a37000dfa9c78a793939f324635f81c7 /packages
parent250710c6879ea3b2fbd33ab67f81081a5d878e0c (diff)
Use module resources in NetworkNotificationManager.
Also make getTransportName non-static so it can access the module resources. Also fix a duplicate comment in a resource file. Bug: 183097033 Test: atest FrameworksNetTests Test: connected to Wi-Fi with no Internet, observed notification Change-Id: Ic0d24d36af0b87153d527083f8964ddc6cd78482 Merged-In: Ic0d24d36af0b87153d527083f8964ddc6cd78482
Diffstat (limited to 'packages')
-rw-r--r--packages/Connectivity/service/ServiceConnectivityResources/res/values/strings.xml2
1 files changed, 0 insertions, 2 deletions
diff --git a/packages/Connectivity/service/ServiceConnectivityResources/res/values/strings.xml b/packages/Connectivity/service/ServiceConnectivityResources/res/values/strings.xml
index 7a9cf57afcd6..b2fa5f5b4129 100644
--- a/packages/Connectivity/service/ServiceConnectivityResources/res/values/strings.xml
+++ b/packages/Connectivity/service/ServiceConnectivityResources/res/values/strings.xml
@@ -68,8 +68,6 @@
<item>VPN</item>
</string-array>
- <!-- Network type names used in the network_switch_metered and network_switch_metered_detail strings. These must be kept in the sync with the values NetworkCapabilities.TRANSPORT_xxx values, and in the same order. -->
-
<!-- Network type name displayed if one of the types is not found in network_switch_type_name. -->
<string name="network_switch_type_name_unknown">an unknown network type</string>