Merge "Remove EBS notification" into pi-dev

3 files changed, 0 insertions, 72 deletions

diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml
index 7038887a6994..0ef93e57d0ed 100644
--- a/core/res/res/values/strings.xml
+++ b/core/res/res/values/strings.xml
@@ -4877,12 +4877,6 @@
     -->
     <string name="shortcut_disabled_reason_unknown">Shortcut is disabled</string>
 
-    <!--Battery saver warning. STOPSHIP: Remove it eventually. -->
-    <string name="battery_saver_warning" translatable="false">\"Extreme\" battery saver activated.\n\nSee the details at: go/extreme-battery-saver\n\nEBS aggressively throttles background apps and changes screen-off behavior.\n</string>
-
-    <!--Battery saver warning. STOPSHIP: Remove it eventually. -->
-    <string name="battery_saver_warning_title" translatable="false">Extreme battery saver</string>
-
     <!-- Label for the uninstall button on the harmful app warning dialog. [CHAR LIMIT=20] -->
     <string name="harmful_app_warning_uninstall">UNINSTALL</string>
     <!-- Label for the open anyway button on the harmful app warning dialog. [CHAR LIMIT=20] -->
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index 3bf97d0f5840..b9215f844423 100644
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -3250,7 +3250,6 @@
   <java-symbol type="string" name="shortcut_restore_not_supported" />
   <java-symbol type="string" name="shortcut_restore_signature_mismatch" />
   <java-symbol type="string" name="shortcut_restore_unknown_issue" />
-  <java-symbol type="string" name="battery_saver_warning" />
 
   <!-- From media projection -->
   <java-symbol type="string" name="config_mediaProjectionPermissionDialogComponent" />
@@ -3261,7 +3260,6 @@
   <java-symbol type="string" name="unsupported_compile_sdk_message" />
   <java-symbol type="string" name="unsupported_compile_sdk_check_update" />
 
-  <java-symbol type="string" name="battery_saver_warning_title" />
   <java-symbol type="string" name="keyguard_accessibility_pattern_unlock" />
   <java-symbol type="string" name="keyguard_accessibility_pin_unlock" />
   <java-symbol type="string" name="keyguard_accessibility_sim_pin_unlock" />
diff --git a/services/core/java/com/android/server/power/batterysaver/BatterySaverController.java b/services/core/java/com/android/server/power/batterysaver/BatterySaverController.java
index a9a1456e7c12..c5275333b184 100644
--- a/services/core/java/com/android/server/power/batterysaver/BatterySaverController.java
+++ b/services/core/java/com/android/server/power/batterysaver/BatterySaverController.java
@@ -16,18 +16,12 @@
 package com.android.server.power.batterysaver;
 
 import android.Manifest;
-import android.app.ActivityManager;
 import android.app.ActivityManagerInternal;
-import android.app.Notification;
-import android.app.Notification.BigTextStyle;
-import android.app.NotificationManager;
-import android.app.PendingIntent;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.hardware.power.V1_0.PowerHint;
-import android.net.Uri;
 import android.os.BatteryManager;
 import android.os.Handler;
 import android.os.Looper;
@@ -40,10 +34,7 @@ import android.os.UserHandle;
 import android.util.ArrayMap;
 import android.util.Slog;
 
-import com.android.internal.R;
 import com.android.internal.annotations.GuardedBy;
-import com.android.internal.messages.nano.SystemMessageProto.SystemMessage;
-import com.android.internal.notification.SystemNotificationChannels;
 import com.android.internal.util.ArrayUtils;
 import com.android.internal.util.Preconditions;
 import com.android.server.EventLogTags;
@@ -76,8 +67,6 @@ public class BatterySaverController implements BatterySaverPolicyListener {
 
     private final BatterySavingStats mBatterySavingStats;
 
-    private static final String WARNING_LINK_URL = "http://goto.google.com/extreme-battery-saver";
-
     @GuardedBy("mLock")
     private final ArrayList<LowPowerModeListener> mListeners = new ArrayList<>();
 
@@ -331,12 +320,6 @@ public class BatterySaverController implements BatterySaverPolicyListener {
         }
 
         if (sendBroadcast) {
-            if (enabled) {
-                // STOPSHIP Remove the toast.
-                postWarningNotification();
-            } else {
-                cancelWarningNotification();
-            }
 
             if (DEBUG) {
                 Slog.i(TAG, "Sending broadcasts for mode: " + enabled);
@@ -368,53 +351,6 @@ public class BatterySaverController implements BatterySaverPolicyListener {
         }
     }
 
-    private void postWarningNotification() {
-        final UserHandle foregroundUser = UserHandle.of(ActivityManager.getCurrentUser());
-
-        final PendingIntent pendingIntent = PendingIntent
-                .getActivityAsUser(mContext, 0,
-                        new Intent(Intent.ACTION_VIEW, Uri.parse(WARNING_LINK_URL)),
-                        PendingIntent.FLAG_CANCEL_CURRENT, null,
-                       foregroundUser);
-
-        final CharSequence title = mContext.getString
-                (com.android.internal.R.string.battery_saver_warning_title);
-        final CharSequence text = mContext.getString
-                (com.android.internal.R.string.battery_saver_warning);
-
-        final Notification notification =
-                new Notification.Builder(mContext, SystemNotificationChannels.ALERTS)
-                .setSmallIcon(R.drawable.stat_notify_error)
-                .setTicker(title)
-                .setWhen(System.currentTimeMillis())
-                .setContentTitle(title)
-                .setContentText(text)
-                .setContentIntent(pendingIntent)
-                .setStyle(new BigTextStyle().bigText(text))
-                .build();
-
-        final NotificationManager nm = mContext.getSystemService(NotificationManager.class);
-
-        if (nm != null) {
-            nm.notifyAsUser(title.toString(),
-                    SystemMessage.NOTE_BATTERY_SAVER_WARNING,
-                    notification,
-                    foregroundUser);
-        }
-    }
-
-    private void cancelWarningNotification() {
-        final UserHandle foregroundUser = UserHandle.of(ActivityManager.getCurrentUser());
-        final CharSequence title = mContext.getString
-                (com.android.internal.R.string.battery_saver_warning_title);
-
-        final NotificationManager nm = mContext.getSystemService(NotificationManager.class);
-        if (nm != null) {
-            nm.cancelAsUser(title.toString(), SystemMessage.NOTE_BATTERY_SAVER_WARNING,
-                    foregroundUser);
-        }
-    }
-
     private void updateBatterySavingStats() {
         final PowerManager pm = getPowerManager();
         if (pm == null) {