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

Commit b8bf0fc6 authored by Etan Cohen's avatar Etan Cohen Committed by Les Lee
Browse files

Remove notification on SAP B&R changes 

SoftAP (SAP) configuration changes on B&R will no longer trigger a
notification. This notification was not providing any value to the user:
- It was not specific (what changed)
- It was not actionable

Bug: 307579005
Test: atest -c android.net.wifi.cts.WifiBackupRestoreTest#testCanRestoreSoftApBackupData
Change-Id: I8b04276a23b2304ae2d7f126bc89c22f90c4991a
parent b0baf0ca

packages/SettingsProvider/res/values/strings.xml

+0 −10
Original line number Diff line number Diff line
@@ -19,14 +19,4 @@ 
<resources>

    <!-- Name of the activity for Settings storage. -->

    <string name="app_label">Settings Storage</string>



    <!-- A notification is shown when the user's softap config has been changed due to underlying

     hardware restrictions. This is the notifications's title.

     [CHAR_LIMIT=NONE] -->

    <string name="wifi_softap_config_change">Hotspot settings have changed</string>



    <!-- A notification is shown when the user's softap config has been changed due to underlying

         hardware restrictions. This is the notification's summary message.

         [CHAR_LIMIT=NONE] -->

    <string name="wifi_softap_config_change_summary">Tap to see details</string>

</resources>

packages/SettingsProvider/src/com/android/providers/settings/SettingsBackupAgent.java

+3 −4
Original line number Diff line number Diff line
@@ -1133,16 +1133,15 @@ public class SettingsBackupAgent extends BackupAgentHelper { 
            // Depending on device hardware, we may need to notify the user of a setting change

            SoftApConfiguration storedConfig = mWifiManager.getSoftApConfiguration();



            if (isNeedToNotifyUserConfigurationHasChanged(configInCloud, storedConfig)) {

                Log.d(TAG, "restored ap configuration requires a conversion, notify the user"

            if (isConfigurationHasChanged(configInCloud, storedConfig)) {

                Log.d(TAG, "restored ap configuration requires a conversion: "

                        + ", configInCloud is " + configInCloud + " but storedConfig is "

                        + storedConfig);

                WifiSoftApConfigChangedNotifier.notifyUserOfConfigConversion(this);

            }

        }

    }



    private boolean isNeedToNotifyUserConfigurationHasChanged(SoftApConfiguration configInCloud,

    private boolean isConfigurationHasChanged(SoftApConfiguration configInCloud,

            SoftApConfiguration storedConfig) {

        // Check if the cloud configuration was modified when restored to the device.

        // All elements of the configuration are compared except:

packages/SettingsProvider/src/com/android/providers/settings/WifiSoftApConfigChangedNotifier.java

deleted100644 → 0
+0 −112
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2019 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

package com.android.providers.settings;



import android.app.ActivityManager;

import android.app.Notification;

import android.app.NotificationChannel;

import android.app.NotificationManager;

import android.app.PendingIntent;

import android.content.Context;

import android.content.Intent;

import android.content.pm.PackageManager;

import android.content.pm.ResolveInfo;

import android.content.res.Resources;

import android.os.UserHandle;

import android.provider.Settings;



import com.android.internal.messages.nano.SystemMessageProto;

import com.android.internal.notification.SystemNotificationChannels;



import java.util.List;



/**

 * Helper class for sending notifications when the user's Soft AP config was changed upon restore.

 */

public class WifiSoftApConfigChangedNotifier {

    private WifiSoftApConfigChangedNotifier() {}



    /**

     * Send a notification informing the user that their' Soft AP Config was changed upon restore.

     * When the user taps on the notification, they are taken to the Wifi Tethering page in

     * Settings.

     */

    public static void notifyUserOfConfigConversion(Context context) {

        NotificationManager notificationManager =

                context.getSystemService(NotificationManager.class);



        // create channel, or update it if it already exists

        NotificationChannel channel = new NotificationChannel(

                SystemNotificationChannels.NETWORK_STATUS,

                context.getString(

                        com.android.internal.R.string.notification_channel_network_status),

                NotificationManager.IMPORTANCE_LOW);

        notificationManager.createNotificationChannel(channel);



        notificationManager.notify(

                SystemMessageProto.SystemMessage.NOTE_SOFTAP_CONFIG_CHANGED,

                createConversionNotification(context));

    }



    private static Notification createConversionNotification(Context context) {

        Resources resources = context.getResources();

        CharSequence title = resources.getText(R.string.wifi_softap_config_change);

        CharSequence contentSummary = resources.getText(R.string.wifi_softap_config_change_summary);

        int color = resources.getColor(

                android.R.color.system_notification_accent_color, context.getTheme());



        return new Notification.Builder(context, SystemNotificationChannels.NETWORK_STATUS)

                .setSmallIcon(R.drawable.ic_wifi_settings)

                .setPriority(Notification.PRIORITY_HIGH)

                .setCategory(Notification.CATEGORY_SYSTEM)

                .setContentTitle(title)

                .setContentText(contentSummary)

                .setContentIntent(getPendingActivity(context))

                .setTicker(title)

                .setShowWhen(false)

                .setLocalOnly(true)

                .setColor(color)

                .setStyle(new Notification.BigTextStyle()

                        .setBigContentTitle(title)

                        .setSummaryText(contentSummary))

                .setAutoCancel(true)

                .build();

    }



    private static PendingIntent getPendingActivity(Context context) {

        Intent intent = new Intent("com.android.settings.WIFI_TETHER_SETTINGS")

                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)

                .setPackage(getSettingsPackageName(context));

        return PendingIntent.getActivity(context, 0, intent,

                PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);

    }



    /**

     * @return Get settings package name.

     */

    private static String getSettingsPackageName(Context context) {

        if (context == null) return null;



        Intent intent = new Intent(Settings.ACTION_WIFI_SETTINGS);

        List<ResolveInfo> resolveInfos = context.getPackageManager().queryIntentActivitiesAsUser(

                intent, PackageManager.MATCH_SYSTEM_ONLY | PackageManager.MATCH_DEFAULT_ONLY,

                UserHandle.of(ActivityManager.getCurrentUser()));

        if (resolveInfos == null || resolveInfos.isEmpty()) {

            return "com.android.settings";

        }

        return resolveInfos.get(0).activityInfo.packageName;

    }

}