summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2017-02-01 02:35:19 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2017-02-01 02:35:20 +0000
commitb2d845283e35d72b4123a383cbdca31b0c88bc92 (patch)
treed9b0f610f454e30e491c728f7580732b230f60e2
parent26cfd49791431924b93caf2adbc88d4cb117c3a6 (diff)
parent15eb8cad9a117e7e3d2bf37d44bc721df3c56019 (diff)
downloadplatform_packages_apps_CertInstaller-b2d845283e35d72b4123a383cbdca31b0c88bc92.tar.gz
platform_packages_apps_CertInstaller-b2d845283e35d72b4123a383cbdca31b0c88bc92.tar.bz2
platform_packages_apps_CertInstaller-b2d845283e35d72b4123a383cbdca31b0c88bc92.zip
Merge "WifiInstaller: use updated PasspointConfiguration APIs"
-rw-r--r--src/com/android/certinstaller/WiFiInstaller.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/com/android/certinstaller/WiFiInstaller.java b/src/com/android/certinstaller/WiFiInstaller.java
index 1e36715..7af7b6f 100644
--- a/src/com/android/certinstaller/WiFiInstaller.java
+++ b/src/com/android/certinstaller/WiFiInstaller.java
@@ -52,7 +52,7 @@ public class WiFiInstaller extends Activity {
if (mPasspointConfig == null) {
Log.w(TAG, "failed to build passpoint configuration");
doNotInstall = true;
- } else if (mPasspointConfig.homeSp == null) {
+ } else if (mPasspointConfig.getHomeSp() == null) {
Log.w(TAG, "Passpoint profile missing HomeSP information");
doNotInstall = true;
}
@@ -77,9 +77,9 @@ public class WiFiInstaller extends Activity {
TextView text = (TextView) layout.findViewById(R.id.wifi_info);
if (!doNotInstall) {
text.setText(String.format(getResources().getString(R.string.wifi_installer_detail),
- mPasspointConfig.homeSp.friendlyName));
+ mPasspointConfig.getHomeSp().getFriendlyName()));
- builder.setTitle(mPasspointConfig.homeSp.friendlyName);
+ builder.setTitle(mPasspointConfig.getHomeSp().getFriendlyName());
builder.setIcon(res.getDrawable(R.drawable.signal_wifi_4_bar_lock_black_24dp));
builder.setPositiveButton(R.string.wifi_install_label,
@@ -104,7 +104,7 @@ public class WiFiInstaller extends Activity {
Intent intent = new Intent(getApplicationContext(),
CredentialsInstallDialog.class);
intent.putExtra(NETWORK_NAME,
- mPasspointConfig.homeSp.friendlyName);
+ mPasspointConfig.getHomeSp().getFriendlyName());
intent.putExtra(INSTALL_STATE, INSTALL_SUCCESS);
startActivity(intent);
} else {