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

Commit 0fe65b58 authored by Quang Luong's avatar Quang Luong
Browse files

Do not request P2P if user declined interface conflict dialog 

P2P iface requests may prompt the user to accept/decline. We should avoid prompting the user twice by not making any additional P2P iface requests after the user declines (i.e. device becomes unavailable).

Bug: 243436630
Test: enable iface creation dialog and turn on STA + AP, verify dialog
does not reappear after user reject in P2P Settings

Change-Id: I6fdda273d898c1d456a1f39d90b1257c8ff4de15
parent 285bfe29

src/com/android/settings/wifi/p2p/WifiP2pSettings.java

+33 −27
Original line number Diff line number Diff line
@@ -140,6 +140,11 @@ public class WifiP2pSettings extends DashboardFragment 
                mLastGroupFormed = wifip2pinfo.groupFormed;

                mIsIgnoreInitConnectionInfoCallback = true;

            } else if (WifiP2pManager.WIFI_P2P_THIS_DEVICE_CHANGED_ACTION.equals(action)) {

                WifiP2pDevice device =

                        (WifiP2pDevice) intent.getExtra(WifiP2pManager.EXTRA_WIFI_P2P_DEVICE);

                if (device != null && device.status == WifiP2pDevice.UNAVAILABLE) {

                    return;

                }

                // Do not use WifiP2pManager.EXTRA_WIFI_P2P_DEVICE from the extras, as the system

                // broadcast does not contain the device's MAC.

                // Requesting our own device info as an app holding the NETWORK_SETTINGS permission
@@ -340,8 +345,8 @@ public class WifiP2pSettings extends DashboardFragment 
    }



    @Override

    public void onResume() {

        super.onResume();

    public void onStart() {

        super.onStart();

        mIntentFilter.addAction(WifiP2pManager.WIFI_P2P_STATE_CHANGED_ACTION);

        mIntentFilter.addAction(WifiP2pManager.WIFI_P2P_PEERS_CHANGED_ACTION);

        mIntentFilter.addAction(WifiP2pManager.WIFI_P2P_CONNECTION_CHANGED_ACTION);
@@ -355,44 +360,21 @@ public class WifiP2pSettings extends DashboardFragment 
            mWifiP2pManager.requestPeers(mChannel, WifiP2pSettings.this);

            mWifiP2pManager.requestDeviceInfo(mChannel, WifiP2pSettings.this);

            mIsIgnoreInitConnectionInfoCallback = false;

            mWifiP2pManager.requestNetworkInfo(mChannel, networkInfo -> {

                if (mChannel == null) return;

                mWifiP2pManager.requestConnectionInfo(mChannel, wifip2pinfo -> {

                    if (!mIsIgnoreInitConnectionInfoCallback) {

                        if (networkInfo.isConnected()) {

                            if (DBG) {

                                Log.d(TAG, "Connected");

                            }

                        } else if (!mLastGroupFormed) {

                            // Find peers when p2p doesn't connected.

                            startSearch();

                        }

                        mLastGroupFormed = wifip2pinfo.groupFormed;

                    }

                });

            });

        }

    }



    @Override

    public void onPause() {

        super.onPause();

        if (mWifiP2pManager != null && mChannel != null) {

            mWifiP2pManager.stopPeerDiscovery(mChannel, null);

        }

        getActivity().unregisterReceiver(mReceiver);

    }



    @Override

    public void onStop() {

        super.onStop();

        if (mWifiP2pManager != null && mChannel != null) {

            mWifiP2pManager.stopPeerDiscovery(mChannel, null);

            if (!mLastGroupFormed) {

                // Close the channel when p2p doesn't connected.

                mChannel.close();

                mChannel = null;

            }

        }

        getActivity().unregisterReceiver(mReceiver);

    }



    @Override
@@ -627,6 +609,30 @@ public class WifiP2pSettings extends DashboardFragment 
        mThisDevice = wifiP2pDevice;

        if (DBG) Log.d(TAG, "Update device info: " + mThisDevice);

        mThisDevicePreferenceController.updateDeviceName(mThisDevice);

        if (wifiP2pDevice.status == WifiP2pDevice.UNAVAILABLE

                || wifiP2pDevice.status == WifiP2pDevice.FAILED) {

            return;

        }

        onDeviceAvailable();

    }



    private void onDeviceAvailable() {

        mWifiP2pManager.requestNetworkInfo(mChannel, networkInfo -> {

            if (mChannel == null) return;

            mWifiP2pManager.requestConnectionInfo(mChannel, wifip2pinfo -> {

                if (!mIsIgnoreInitConnectionInfoCallback) {

                    if (networkInfo.isConnected()) {

                        if (DBG) {

                            Log.d(TAG, "Connected");

                        }

                    } else if (!mLastGroupFormed) {

                        // Find peers when p2p doesn't connected.

                        startSearch();

                    }

                    mLastGroupFormed = wifip2pinfo.groupFormed;

                }

            });

        });

    }



    private void handleP2pStateChanged() {