From 68820ca61312f7032798208765ec2aea0da2b235 Mon Sep 17 00:00:00 2001
From: Sally <sallyyuen@google.com>
Date: Tue, 9 Mar 2021 19:43:38 +0000
Subject: [PATCH] Update Notification content description API

Test: atest NotificationManagerTest, atest NotificationTest
Bug: 182216039
Change-Id: Idd1a20eea8ef97108a70a4063be5c757cafd5b57
---
 core/api/current.txt                    | 2 +-
 core/java/android/app/Notification.java | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/api/current.txt b/core/api/current.txt
index 001e960d2867f..8dfc0a77b838b 100644
--- a/core/api/current.txt
+++ b/core/api/current.txt
@@ -5830,8 +5830,8 @@ package android.app {
     method @NonNull public android.app.Notification.BigPictureStyle bigLargeIcon(@Nullable android.graphics.drawable.Icon);
     method @NonNull public android.app.Notification.BigPictureStyle bigPicture(@Nullable android.graphics.Bitmap);
     method @NonNull public android.app.Notification.BigPictureStyle bigPicture(@Nullable android.graphics.drawable.Icon);
-    method @NonNull public android.app.Notification.BigPictureStyle bigPictureContentDescription(@Nullable CharSequence);
     method @NonNull public android.app.Notification.BigPictureStyle setBigContentTitle(@Nullable CharSequence);
+    method @NonNull public android.app.Notification.BigPictureStyle setContentDescription(@Nullable CharSequence);
     method @NonNull public android.app.Notification.BigPictureStyle setSummaryText(@Nullable CharSequence);
     method @NonNull public android.app.Notification.BigPictureStyle showBigPictureWhenCollapsed(boolean);
   }
diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java
index 3a533c98cb603..5dd10f10930bf 100644
--- a/core/java/android/app/Notification.java
+++ b/core/java/android/app/Notification.java
@@ -1216,7 +1216,7 @@ public class Notification implements Parcelable
     /**
      * {@link #extras} key: this is a content description of the big picture supplied from
      * {@link BigPictureStyle#bigPicture(Bitmap)}, supplied to
-     * {@link BigPictureStyle#bigPictureContentDescription(CharSequence)}.
+     * {@link BigPictureStyle#setContentDescription(CharSequence)}.
      */
     public static final String EXTRA_PICTURE_CONTENT_DESCRIPTION =
             "android.pictureContentDescription";
@@ -7292,7 +7292,7 @@ public class Notification implements Parcelable
          * Set the content description of the big picture.
          */
         @NonNull
-        public BigPictureStyle bigPictureContentDescription(
+        public BigPictureStyle setContentDescription(
                 @Nullable CharSequence contentDescription) {
             mPictureContentDescription = contentDescription;
             return this;