From eae986e47411b285ed577e0e06f3f286c13d2df9 Mon Sep 17 00:00:00 2001
From: Mady Mellor <madym@google.com>
Date: Fri, 26 Apr 2019 13:53:40 -0700
Subject: [PATCH] Remove bubble API added & deprecated in Q

Test: treehugger
Bug: 131428392
Change-Id: I272c830ab1f63e8de8ef6b03d74d7d60fad2388c
---
 api/current.txt                         |  3 --
 core/java/android/app/Notification.java | 42 -------------------------
 2 files changed, 45 deletions(-)

diff --git a/api/current.txt b/api/current.txt
index f62c689943d86..462ff82e93e30 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -5502,8 +5502,6 @@ package android.app {
     method @DimenRes public int getDesiredHeightResId();
     method @NonNull public android.graphics.drawable.Icon getIcon();
     method @NonNull public android.app.PendingIntent getIntent();
-    method @Deprecated public boolean getSuppressInitialNotification();
-    method @Deprecated public boolean getSuppressNotification();
     method public boolean isNotificationSuppressed();
     method public void writeToParcel(android.os.Parcel, int);
     field @NonNull public static final android.os.Parcelable.Creator<android.app.Notification.BubbleMetadata> CREATOR;
@@ -5518,7 +5516,6 @@ package android.app {
     method @NonNull public android.app.Notification.BubbleMetadata.Builder setDesiredHeightResId(@DimenRes int);
     method @NonNull public android.app.Notification.BubbleMetadata.Builder setIcon(@NonNull android.graphics.drawable.Icon);
     method @NonNull public android.app.Notification.BubbleMetadata.Builder setIntent(@NonNull android.app.PendingIntent);
-    method @Deprecated @NonNull public android.app.Notification.BubbleMetadata.Builder setSuppressInitialNotification(boolean);
     method @NonNull public android.app.Notification.BubbleMetadata.Builder setSuppressNotification(boolean);
   }
 
diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java
index d0361b7e1118e..15b571ffcd72e 100644
--- a/core/java/android/app/Notification.java
+++ b/core/java/android/app/Notification.java
@@ -8641,27 +8641,6 @@ public class Notification implements Parcelable
             return (mFlags & FLAG_AUTO_EXPAND_BUBBLE) != 0;
         }
 
-        /**
-         * @return whether this bubble should suppress the initial notification when it is posted.
-         *
-         * @see BubbleMetadata.Builder#setSuppressInitialNotification(boolean)
-         * @deprecated TO BE REMOVED, use {@link #isNotificationSuppressed()} instead.
-         */
-        @Deprecated
-        public boolean getSuppressInitialNotification() {
-            return isNotificationSuppressed();
-        }
-
-        /**
-         * @return whether this bubble should suppress the notification when it is posted.
-         *
-         * @see BubbleMetadata.Builder#setSuppressNotification(boolean)
-         * @deprecated TO BE REMOVED, use {@link #isNotificationSuppressed()} instead.
-         */
-        public boolean getSuppressNotification() {
-            return isNotificationSuppressed();
-        }
-
         /**
          * @return whether this bubble should suppress the notification when it is posted.
          *
@@ -8817,27 +8796,6 @@ public class Notification implements Parcelable
                 return this;
             }
 
-            /**
-             * If set and the app creating the bubble is in the foreground, the bubble will be
-             * posted <b>without</b> the associated notification in the notification shade.
-             * Subsequent update notifications to this bubble will post a notification in the shade.
-             *
-             * <p>If the app creating the bubble is not in the foreground this flag has no effect.
-             * </p>
-             *
-             * <p>Generally this flag should only be set if the user has performed an action to
-             * request or create a bubble.</p>
-             *
-             * @deprecated TO BE REMOVED, use {@link #setSuppressNotification(boolean)} instead.
-             */
-            @Deprecated
-            @NonNull
-            public BubbleMetadata.Builder setSuppressInitialNotification(
-                    boolean shouldSupressNotif) {
-                setFlag(FLAG_SUPPRESS_NOTIFICATION, shouldSupressNotif);
-                return this;
-            }
-
             /**
              * If set and the app posting the bubble is in the foreground, the bubble will be
              * posted <b>without</b> the associated notification in the notification shade.