summaryrefslogtreecommitdiff
path: root/services
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2021-03-19 04:13:36 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2021-03-19 04:13:36 +0000
commit47157e77113e9362e9a511c9c0be99639cc5139a (patch)
treecbaaa5b4adc4d260c085ab251e1aec7776a28bba /services
parent7e26e33269d388b35014a901a3ee6d6bea25b596 (diff)
parent88d7e789a21967eeec0019c077e1946e072f08f4 (diff)
Merge "CaptivePortalData: use CharSequence in VenueFriendlyName API"
Diffstat (limited to 'services')
-rw-r--r--services/core/java/com/android/server/connectivity/NetworkNotificationManager.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/connectivity/NetworkNotificationManager.java b/services/core/java/com/android/server/connectivity/NetworkNotificationManager.java
index 508739f2e1e0..181a10d2a63e 100644
--- a/services/core/java/com/android/server/connectivity/NetworkNotificationManager.java
+++ b/services/core/java/com/android/server/connectivity/NetworkNotificationManager.java
@@ -156,7 +156,7 @@ public class NetworkNotificationManager {
final String tag = tagFor(id);
final int eventId = notifyType.eventId;
final int transportType;
- final String name;
+ final CharSequence name;
if (nai != null) {
transportType = approximateTransportType(nai);
final String extraInfo = nai.networkInfo.getExtraInfo();