am 04e3fca3: Merge "Remove dead hidden ConnectivityManager and NetworkInfo APIs." into mnc-dev

* commit '04e3fca391b9d4fd0493f7ef38ab4f9b8ddafa95':
  Remove dead hidden ConnectivityManager and NetworkInfo APIs.
This commit is contained in:
Paul Jensen
2015-06-15 13:45:21 +00:00
committed by Android Git Automerger

View File

@@ -120,7 +120,7 @@ public class WirelessSettings extends SettingsPreferenceFragment implements Inde
mManageMobilePlanMessage = null;
Resources resources = getActivity().getResources();
NetworkInfo ni = mCm.getProvisioningOrActiveNetworkInfo();
NetworkInfo ni = mCm.getActiveNetworkInfo();
if (mTm.hasIccCard() && (ni != null)) {
// Check for carrier apps that can handle provisioning first
Intent provisioningIntent = new Intent(TelephonyIntents.ACTION_CARRIER_SETUP);