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

Commit 7c3c6ecf authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by android-build-merger
Browse files

Merge "Don't use a high-priority notification on auto-join." into qt-dev am:... 

Merge "Don't use a high-priority notification on auto-join." into qt-dev am: 831831c7 am: 71feb646
am: cda472e6

Change-Id: I605c0570c51f718e0883f540999670768e0a2a4d
parents 826f25b2 cda472e6

services/core/java/com/android/server/ConnectivityService.java

+12 −1
Original line number Original line Diff line number Diff line
@@ -3597,21 +3597,31 @@ public class ConnectivityService extends IConnectivityManager.Stub 




    private void showNetworkNotification(NetworkAgentInfo nai, NotificationType type) {

    private void showNetworkNotification(NetworkAgentInfo nai, NotificationType type) {

        final String action;

        final String action;

        final boolean highPriority;

        switch (type) {

        switch (type) {

            case LOGGED_IN:

            case LOGGED_IN:

                action = Settings.ACTION_WIFI_SETTINGS;

                action = Settings.ACTION_WIFI_SETTINGS;

                mHandler.removeMessages(EVENT_TIMEOUT_NOTIFICATION);

                mHandler.removeMessages(EVENT_TIMEOUT_NOTIFICATION);

                mHandler.sendMessageDelayed(mHandler.obtainMessage(EVENT_TIMEOUT_NOTIFICATION,

                mHandler.sendMessageDelayed(mHandler.obtainMessage(EVENT_TIMEOUT_NOTIFICATION,

                        nai.network.netId, 0), TIMEOUT_NOTIFICATION_DELAY_MS);

                        nai.network.netId, 0), TIMEOUT_NOTIFICATION_DELAY_MS);

                // High priority because it is a direct result of the user logging in to a portal.

                highPriority = true;

                break;

                break;

            case NO_INTERNET:

            case NO_INTERNET:

                action = ConnectivityManager.ACTION_PROMPT_UNVALIDATED;

                action = ConnectivityManager.ACTION_PROMPT_UNVALIDATED;

                // High priority because it is only displayed for explicitly selected networks.

                highPriority = true;

                break;

                break;

            case LOST_INTERNET:

            case LOST_INTERNET:

                action = ConnectivityManager.ACTION_PROMPT_LOST_VALIDATION;

                action = ConnectivityManager.ACTION_PROMPT_LOST_VALIDATION;

                // High priority because it could help the user avoid unexpected data usage.

                highPriority = true;

                break;

                break;

            case PARTIAL_CONNECTIVITY:

            case PARTIAL_CONNECTIVITY:

                action = ConnectivityManager.ACTION_PROMPT_PARTIAL_CONNECTIVITY;

                action = ConnectivityManager.ACTION_PROMPT_PARTIAL_CONNECTIVITY;

                // Don't bother the user with a high-priority notification if the network was not

                // explicitly selected by the user.

                highPriority = nai.networkMisc.explicitlySelected;

                break;

                break;

            default:

            default:

                Slog.wtf(TAG, "Unknown notification type " + type);

                Slog.wtf(TAG, "Unknown notification type " + type);
@@ -3628,7 +3638,8 @@ public class ConnectivityService extends IConnectivityManager.Stub 




        PendingIntent pendingIntent = PendingIntent.getActivityAsUser(

        PendingIntent pendingIntent = PendingIntent.getActivityAsUser(

                mContext, 0, intent, PendingIntent.FLAG_CANCEL_CURRENT, null, UserHandle.CURRENT);

                mContext, 0, intent, PendingIntent.FLAG_CANCEL_CURRENT, null, UserHandle.CURRENT);

        mNotifier.showNotification(nai.network.netId, type, nai, null, pendingIntent, true);



        mNotifier.showNotification(nai.network.netId, type, nai, null, pendingIntent, highPriority);

    }

    }





    private boolean shouldPromptUnvalidated(NetworkAgentInfo nai) {

    private boolean shouldPromptUnvalidated(NetworkAgentInfo nai) {