diff options
| author | Jan Nordqvist <jannq@google.com> | 2015-06-23 00:19:49 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-06-23 00:19:49 +0000 |
| commit | 50071b7e5a2dec607b6302d2966049207fd41250 (patch) | |
| tree | 99614bc2a95931abee97a0973d559fa7a3d0e202 | |
| parent | 7811b1168438dd0e667f5cfa01262860e2c2fcc7 (diff) | |
| parent | 0694d5c4498466208bb21df6197787a6c12c7fba (diff) | |
| download | android_packages_apps_CertInstaller-50071b7e5a2dec607b6302d2966049207fd41250.tar.gz android_packages_apps_CertInstaller-50071b7e5a2dec607b6302d2966049207fd41250.tar.bz2 android_packages_apps_CertInstaller-50071b7e5a2dec607b6302d2966049207fd41250.zip | |
am 0694d5c4: Catching runtime exception in WifiInstaller.
* commit '0694d5c4498466208bb21df6197787a6c12c7fba':
Catching runtime exception in WifiInstaller.
| -rw-r--r-- | src/com/android/certinstaller/WiFiInstaller.java | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/com/android/certinstaller/WiFiInstaller.java b/src/com/android/certinstaller/WiFiInstaller.java index cf7933b..aa58c22 100644 --- a/src/com/android/certinstaller/WiFiInstaller.java +++ b/src/com/android/certinstaller/WiFiInstaller.java @@ -90,8 +90,15 @@ public class WiFiInstaller extends Activity { new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { - if(mWifiManager.addNetwork(mWifiConfiguration) != -1 - && mWifiManager.saveConfiguration()) { + boolean success; + try { + success = mWifiManager.addNetwork(mWifiConfiguration) != -1 + && mWifiManager.saveConfiguration(); + } + catch (RuntimeException rte) { + success = false; + } + if(success) { Intent intent = new Intent(getApplicationContext(), CredentialsInstallDialog.class); intent.putExtra(NETWORK_NAME, mWifiConfiguration.providerFriendlyName); @@ -115,7 +122,7 @@ public class WiFiInstaller extends Activity { dialog.dismiss(); finish(); } - }); + }); } else { text.setText(getResources().getString(R.string.wifi_installer_download_error)); builder.setPositiveButton(R.string.done_label, new DialogInterface.OnClickListener() { |