Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 43e249ff27

Change-Id: Ifa239877c607468fe4ca9bdb87f712b10633762b
This commit is contained in:
Maurice Lam
2017-07-15 15:01:13 +00:00
committed by android-build-merger
parent 6acd78fbd4 43e249ff27
commit f4d873fd56
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java
View File

@@ -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);
}