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

Commit a0c8d6d6 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix Settings crash issue" into sc-qpr1-dev am: fae29c6b 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15605528

Change-Id: Id846fe391823dbfbb8dae0ea40c369d6bb8c92c8
parents 0050cbc7 fae29c6b

src/com/android/settings/network/NetworkProviderSettings.java

+10 −0
Original line number Diff line number Diff line
@@ -710,6 +710,11 @@ public class NetworkProviderSettings extends RestrictedSettingsFragment 
            Log.i(TAG, "onWifiStateChanged called with wifi state: " + wifiState);

        }



        if (isFinishingOrDestroyed()) {

            Log.w(TAG, "onWifiStateChanged shouldn't run when fragment is finishing or destroyed");

            return;

        }



        switch (wifiState) {

            case WifiManager.WIFI_STATE_ENABLED:

                updateWifiEntryPreferences();
@@ -981,6 +986,11 @@ public class NetworkProviderSettings extends RestrictedSettingsFragment 


    private String getSavedNetworkSettingsSummaryText(

            int numSavedNetworks, int numSavedSubscriptions) {

        if (getResources() == null) {

            Log.w(TAG, "getSavedNetworkSettingsSummaryText shouldn't run if resource is not ready");

            return null;

        }



        if (numSavedSubscriptions == 0) {

            return getResources().getQuantityString(R.plurals.wifi_saved_access_points_summary,

                    numSavedNetworks, numSavedNetworks);