commit 5bfa2c140aeb4fb562649853b9d8d84a253d551e
author Peter Qiu <zqiu@google.com> Wed Feb 01 03:24:11 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Feb 01 03:24:11 2017 +0000
tree cb8293d38995954744dad77db17fe0f213b42040
parent ebb46f0e8506e619ebfad3c8bc0447e57349a4af
parent a16a3cf06722fc244371197663c4eca0e04994d7

Merge "WifiInstaller: use updated PasspointConfiguration APIs" am: b2d845283e
am: a16a3cf067

Change-Id: I57d8472a9813cce515880cc61771bba6df3a2935

src/com/android/certinstaller/WiFiInstaller.java

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 @@
         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 @@
         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 @@
                                 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 {