Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f4d873fd authored by Maurice Lam's avatar Maurice Lam Committed by android-build-merger
Browse files

Merge "Load internal resources using name rather than ID" into oc-dr1-dev 

am: 43e249ff

Change-Id: Ifa239877c607468fe4ca9bdb87f712b10633762b
parents 6acd78fb 43e249ff

packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java

+3 −2
Original line number Diff line number Diff line
@@ -1170,8 +1170,9 @@ public class AccessPoint implements Comparable<AccessPoint> { 


            if (nc != null) {

                if (nc.hasCapability(nc.NET_CAPABILITY_CAPTIVE_PORTAL)) {

                    return context.getString(

                        com.android.internal.R.string.network_available_sign_in);

                    int id = context.getResources()

                            .getIdentifier("network_available_sign_in", "string", "android");

                    return context.getString(id);

                } else if (!nc.hasCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED)) {

                    return context.getString(R.string.wifi_connected_no_internet);

                }