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

Commit 03cb9dcb authored by Les Lee's avatar Les Lee Committed by Automerger Merge Worker
Browse files

Merge "wifi: Handle wifi ap initial state before register intent" into tm-qpr-dev am: b75858bf 

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



Change-Id: I65a54ab88204a4dfd484a8faf157d6b9db5b3f69
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b248478d b75858bf

src/com/android/settings/AllInOneTetherSettings.java

+3 −0
Original line number Diff line number Diff line
@@ -251,6 +251,9 @@ public class AllInOneTetherSettings extends RestrictedDashboardFragment 
        }

        final Context context = getContext();

        if (context != null) {

            // The intent WIFI_AP_STATE_CHANGED_ACTION is not sticky intent after SC-V2

            // But ACTION_TETHER_STATE_CHANGED is still sticky intent. So no need to handle

            // initial state for WIFI_AP_STATE_CHANGED_ACTION

            IntentFilter filter = new IntentFilter(ACTION_TETHER_STATE_CHANGED);

            filter.addAction(WIFI_AP_STATE_CHANGED_ACTION);

            context.registerReceiver(mTetherChangeReceiver, filter);

src/com/android/settings/homepage/contextualcards/conditional/HotspotConditionController.java

+3 −0
Original line number Diff line number Diff line
@@ -106,6 +106,9 @@ public class HotspotConditionController implements ConditionalCardController { 
    @Override

    public void startMonitoringStateChange() {

        mAppContext.registerReceiver(mReceiver, WIFI_AP_STATE_FILTER);

        // The intent WIFI_AP_STATE_CHANGED_ACTION is not sticky intent anymore after SC-V2

        // Handle the initial state after register the receiver.

        mConditionManager.onConditionChanged();

    }



    @Override

src/com/android/settings/wifi/tether/WifiTetherSettings.java

+3 −0
Original line number Diff line number Diff line
@@ -161,6 +161,9 @@ public class WifiTetherSettings extends RestrictedDashboardFragment 
        if (context != null) {

            context.registerReceiver(mTetherChangeReceiver, TETHER_STATE_CHANGE_FILTER,

                    Context.RECEIVER_EXPORTED_UNAUDITED);

            // The intent WIFI_AP_STATE_CHANGED_ACTION is not sticky intent anymore after SC-V2

            // Handle the initial state after register the receiver.

            updateDisplayWithNewConfig();

        }

    }

src/com/android/settings/wifi/tether/WifiTetherSwitchBarController.java

+1 −0
Original line number Diff line number Diff line
@@ -93,6 +93,7 @@ public class WifiTetherSwitchBarController implements 
        mSwitchBar.addOnSwitchChangeListener(this);

        mContext.registerReceiver(mReceiver, WIFI_INTENT_FILTER,

                Context.RECEIVER_EXPORTED_UNAUDITED);

        handleWifiApStateChanged(mWifiManager.getWifiApState());

    }



    @Override