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

Commit 956118fc authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Wifi: User notification on wrong Password for PSK Networks"

parents df4e734f bdf2f0bd

core/res/AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -82,6 +82,7 @@ 
    <protected-broadcast android:name="android.intent.action.USER_INITIALIZE" />

    <protected-broadcast android:name="android.intent.action.INTENT_FILTER_NEEDS_VERIFICATION" />



    <protected-broadcast android:name="Auth_password_wrong" />

    <protected-broadcast android:name="android.os.action.POWER_SAVE_MODE_CHANGED" />

    <protected-broadcast android:name="android.os.action.POWER_SAVE_MODE_CHANGING" />

    <protected-broadcast android:name="android.os.action.DEVICE_IDLE_MODE_CHANGED" />

packages/SettingsLib/res/values/strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -83,6 +83,9 @@ 
    <!-- Summary for Connected wifi network without internet -->

    <string name="wifi_connected_no_internet">Connected, no Internet</string>



    <!-- Text when wrong password entered for psk networks -->

    <string name="wifi_auth_password_wrong">Password may be incorrect</string>



    <!-- Bluetooth settings.  Message when a device is disconnected -->

    <string name="bluetooth_disconnected">Disconnected</string>

    <!-- Bluetooth settings.  Message when disconnecting from a device -->

packages/SettingsLib/src/com/android/settingslib/wifi/WifiTracker.java

+5 −0
Original line number Diff line number Diff line
@@ -149,6 +149,7 @@ public class WifiTracker { 
        mFilter.addAction(WifiManager.CONFIGURED_NETWORKS_CHANGED_ACTION);

        mFilter.addAction(WifiManager.LINK_CONFIGURATION_CHANGED_ACTION);

        mFilter.addAction(WifiManager.NETWORK_STATE_CHANGED_ACTION);

        mFilter.addAction(WifiManager.ACTION_AUTH_PASSWORD_WRONG);



        mNetworkRequest = new NetworkRequest.Builder()

                .clearCapabilities()
@@ -537,7 +538,11 @@ public class WifiTracker { 
                mWorkHandler.sendEmptyMessage(WorkHandler.MSG_UPDATE_ACCESS_POINTS);

                mWorkHandler.obtainMessage(WorkHandler.MSG_UPDATE_NETWORK_INFO, info)

                        .sendToTarget();

            } else if (WifiManager.ACTION_AUTH_PASSWORD_WRONG.equals(action)) {

                Toast.makeText(context, R.string.wifi_auth_password_wrong,

                             Toast.LENGTH_SHORT).show();

            }



        }

    };

wifi/java/android/net/wifi/WifiManager.java

+7 −0
Original line number Diff line number Diff line
@@ -87,6 +87,13 @@ public class WifiManager { 
     */

    public static final String EXTRA_SCAN_AVAILABLE = "scan_enabled";



    /**

     *  ACTION_AUTH_PASSWORD_WRONG

     *

     * @ @hide

     **/

    public static final String  ACTION_AUTH_PASSWORD_WRONG = "Auth_password_wrong";



    /**

     * Broadcast intent action indicating that the credential of a Wi-Fi network

     * has been changed. One extra provides the ssid of the network. Another