commit 6eae95ae51d3c4956f4aa07f72a9ee9fed6a47f8
author Hai Shalom <haishalom@google.com> Tue Mar 16 21:03:08 2021 -0700
committer Hai Shalom <haishalom@google.com> Tue Mar 16 21:03:08 2021 -0700
tree 67f992408693b6a58d7e6c2ae342d00ff0665675
parent 140817284531ee66a178f5da27ddf4c53e7dd977

CaptivePortalData: use CharSequence in VenueFriendlyName API

Following up on feedback from API council, change the String type
to CharSequence in the get and set Venue friendly name API.

Bug: 179163405
Test: atest ConnectivityServiceTest CtsNetTestCasesLatestSdk:CaptivePortalDataTest
Test: atest NetworkNotificationManagerTest NetworkMonitorTest
Change-Id: I122f10af80970727054db8a7691241412636d99c

src/com/android/captiveportallogin/CaptivePortalLoginActivity.java

diff --git a/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java b/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java
index 5b26444..7701fe8 100755
--- a/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java
+++ b/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java
@@ -120,7 +120,7 @@
     private CaptivePortalProbeSpec mProbeSpec;
     private String mUserAgent;
     private Network mNetwork;
-    private String mVenueFriendlyName = null;
+    private CharSequence mVenueFriendlyName = null;
     @VisibleForTesting
     protected CaptivePortal mCaptivePortal;
     private NetworkCallback mNetworkCallback;
@@ -912,7 +912,7 @@
 
     private String getHeaderTitle() {
         NetworkCapabilities nc = mCm.getNetworkCapabilities(mNetwork);
-        final String networkName = getNetworkName();
+        final CharSequence networkName = getNetworkName();
         if (TextUtils.isEmpty(networkName)
                 || nc == null || !nc.hasTransport(NetworkCapabilities.TRANSPORT_WIFI)) {
             return getString(R.string.action_bar_label);
@@ -920,7 +920,7 @@
         return getString(R.string.action_bar_title, networkName);
     }
 
-    private String getNetworkName() {
+    private CharSequence getNetworkName() {
         // Use the venue friendly name if available
         if (!TextUtils.isEmpty(mVenueFriendlyName)) {
             return mVenueFriendlyName;
@@ -993,7 +993,7 @@
                 || (propertyVersion != 0 && mPackageVersion >= propertyVersion);
     }
 
-    private String getVenueFriendlyName() {
+    private CharSequence getVenueFriendlyName() {
         if (!isAtLeastR()) {
             return null;
         }
@@ -1016,7 +1016,7 @@
         try {
             final Method getVenueFriendlyNameMethod = captivePortalDataClass.getDeclaredMethod(
                     "getVenueFriendlyName");
-            return (String) getVenueFriendlyNameMethod.invoke(captivePortalData);
+            return (CharSequence) getVenueFriendlyNameMethod.invoke(captivePortalData);
         } catch (Exception e) {
             // Do nothing
         }