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

Commit 7f6fc86b authored by Maurice Lam's avatar Maurice Lam
Browse files

Load internal resources using name rather than ID 

Since setup wizard is distributed by binary, and internal framework
resource IDs may shift due to OEM customizations, load the resource
via its name instead.
Long term SUW should move away from depeneding on framework internal
resources or be open sourced.

Test: Existing tests pass
Bug: 63546650
Change-Id: I3555945d1f310ee79bdfc3542411d46a4fd4bf7d
parent 717dd58c

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

                }