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

Commit 7620c1a5 authored by Alisa Hung's avatar Alisa Hung Committed by Android (Google) Code Review
Browse files

Merge "Apply the @Importance annotation to the getImportance(),... 

Merge "Apply the @Importance annotation to the getImportance(), getOriginalImportance(), and setOriginalImportance methods of NotificationChannel" into main
parents 93c6771c 686bc8ac

core/java/android/app/NotificationChannel.java

+3 −3
Original line number Diff line number Diff line
@@ -928,7 +928,7 @@ public final class NotificationChannel implements Parcelable { 
     * See {@link NotificationChannelGroup#isBlocked()} and

     * {@link NotificationManager#areNotificationsEnabled()}.

     */

    public int getImportance() {

    public @Importance int getImportance() {

        return mImportance;

    }
@@ -1156,7 +1156,7 @@ public final class NotificationChannel implements Parcelable { 
     * @see #getImportance()

     */

    @FlaggedApi(FLAG_NOTIFICATION_GET_ORIGINAL_IMPORTANCE)

    public int getOriginalImportance() {

    public @Importance int getOriginalImportance() {

        return mOriginalImportance;

    }
@@ -1164,7 +1164,7 @@ public final class NotificationChannel implements Parcelable { 
     * @hide

     */

    @TestApi

    public void setOriginalImportance(int importance) {

    public void setOriginalImportance(@Importance int importance) {

        mOriginalImportance = importance;

    }