Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 59e2f424 authored by Jason Monk's avatar Jason Monk Committed by The Android Automerger
Browse files

Make sure mWifiManager gets initialized 

To avoid crashing.

Bug: 27561590
Change-Id: I417b8382cb3d1b6c22fa33e05e9b4bf35e048e7e
parent bbe01876

src/com/android/settings/TetherSettings.java

+5 −6
Original line number Diff line number Diff line
@@ -16,10 +16,6 @@ 


package com.android.settings;



import static android.net.ConnectivityManager.TETHERING_BLUETOOTH;

import static android.net.ConnectivityManager.TETHERING_USB;

import static android.net.ConnectivityManager.TETHERING_WIFI;



import android.app.Activity;

import android.app.Dialog;

import android.bluetooth.BluetoothAdapter;
@@ -43,7 +39,6 @@ import android.support.v14.preference.SwitchPreference; 
import android.support.v7.preference.Preference;

import android.support.v7.preference.PreferenceScreen;

import android.util.Log;



import com.android.internal.logging.MetricsProto.MetricsEvent;

import com.android.settings.wifi.WifiApDialog;

import com.android.settings.wifi.WifiApEnabler;
@@ -53,6 +48,10 @@ import java.lang.ref.WeakReference; 
import java.util.ArrayList;

import java.util.concurrent.atomic.AtomicReference;



import static android.net.ConnectivityManager.TETHERING_BLUETOOTH;

import static android.net.ConnectivityManager.TETHERING_USB;

import static android.net.ConnectivityManager.TETHERING_WIFI;



/*

 * Displays preferences for Tethering.

 */
@@ -147,6 +146,7 @@ public class TetherSettings extends RestrictedSettingsFragment 
        mBluetoothTether = (SwitchPreference) findPreference(ENABLE_BLUETOOTH_TETHERING);



        mCm = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE);

        mWifiManager = (WifiManager) getSystemService(Context.WIFI_SERVICE);



        mUsbRegexs = mCm.getTetherableUsbRegexs();

        mWifiRegexs = mCm.getTetherableWifiRegexs();
@@ -182,7 +182,6 @@ public class TetherSettings extends RestrictedSettingsFragment 


    private void initWifiTethering() {

        final Activity activity = getActivity();

        mWifiManager = (WifiManager) getSystemService(Context.WIFI_SERVICE);

        mWifiConfig = mWifiManager.getWifiApConfiguration();

        mSecurityType = getResources().getStringArray(R.array.wifi_ap_security);