From 7f6fc86b9ce6c2c505830b4462bb47bcdf44b566 Mon Sep 17 00:00:00 2001 From: Maurice Lam Date: Wed, 12 Jul 2017 16:43:49 -0700 Subject: 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 --- .../SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java b/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java index ec4141518f82..ec3b520e2012 100644 --- a/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java +++ b/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java @@ -1170,8 +1170,9 @@ public class AccessPoint implements Comparable { 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); } -- cgit v1.2.3-59-g8ed1b