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

Commit a9b73c41 authored by Fabian Kozynski's avatar Fabian Kozynski Committed by Automerger Merge Worker
Browse files

Merge "Prevent NPE on race condition" into udc-qpr-dev am: 21648e77 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23711767



Change-Id: Idef14b83d8d51dce8f63eeaf9350d9d50165070b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents fc5cf20c 21648e77

packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialogController.java

+29 −10
Original line number Diff line number Diff line
@@ -173,6 +173,7 @@ public class InternetDialogController implements AccessPointController.AccessPoi 
    private AccessPointController mAccessPointController;

    private IntentFilter mConnectionStateFilter;

    @VisibleForTesting

    @Nullable

    InternetDialogCallback mCallback;

    private UiEventLogger mUiEventLogger;

    private BroadcastDispatcher mBroadcastDispatcher;
@@ -730,7 +731,7 @@ public class InternetDialogController implements AccessPointController.AccessPoi 
        ActivityLaunchAnimator.Controller controller =

                mDialogLaunchAnimator.createActivityLaunchController(view);



        if (controller == null) {

        if (controller == null && mCallback != null) {

            mCallback.dismissDialog();

        }
@@ -1101,8 +1102,10 @@ public class InternetDialogController implements AccessPointController.AccessPoi 
            mHasWifiEntries = false;

        }



        if (mCallback != null) {

            mCallback.onAccessPointsChanged(wifiEntries, connectedEntry, hasMoreWifiEntries);

        }

    }



    @Override

    public void onSettingsActivityTriggered(Intent settingsIntent) {
@@ -1123,36 +1126,48 @@ public class InternetDialogController implements AccessPointController.AccessPoi 


        @Override

        public void onServiceStateChanged(@NonNull ServiceState serviceState) {

            if (mCallback != null) {

                mCallback.onServiceStateChanged(serviceState);

            }

        }



        @Override

        public void onDataConnectionStateChanged(int state, int networkType) {

            if (mCallback != null) {

                mCallback.onDataConnectionStateChanged(state, networkType);

            }

        }



        @Override

        public void onSignalStrengthsChanged(@NonNull SignalStrength signalStrength) {

            if (mCallback != null) {

                mCallback.onSignalStrengthsChanged(signalStrength);

            }

        }



        @Override

        public void onDisplayInfoChanged(@NonNull TelephonyDisplayInfo telephonyDisplayInfo) {

            mSubIdTelephonyDisplayInfoMap.put(mSubId, telephonyDisplayInfo);

            if (mCallback != null) {

                mCallback.onDisplayInfoChanged(telephonyDisplayInfo);

            }

        }



        @Override

        public void onUserMobileDataStateChanged(boolean enabled) {

            if (mCallback != null) {

                mCallback.onUserMobileDataStateChanged(enabled);

            }

        }



        @Override

        public void onCarrierNetworkChange(boolean active) {

            mCarrierNetworkChangeMode = active;

            if (mCallback != null) {

                mCallback.onCarrierNetworkChange(active);

            }

        }

    }



    private class InternetOnSubscriptionChangedListener

            extends SubscriptionManager.OnSubscriptionsChangedListener {
@@ -1177,16 +1192,20 @@ public class InternetDialogController implements AccessPointController.AccessPoi 
                scanWifiAccessPoints();

            }

            // update UI

            if (mCallback != null) {

                mCallback.onCapabilitiesChanged(network, capabilities);

            }

        }



        @Override

        @WorkerThread

        public void onLost(@NonNull Network network) {

            mHasEthernet = false;

            if (mCallback != null) {

                mCallback.onLost(network);

            }

        }

    }



    /**

     * Helper class for monitoring the Internet access of the connected WifiEntry.