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

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

Merge "Make NotificationChannel#getOriginalImportance fully public" into main

parents 7cdd2a78 ae7d70f1

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -7127,6 +7127,7 @@ package android.app { 
    method public int getLightColor();

    method public int getLockscreenVisibility();

    method public CharSequence getName();

    method @FlaggedApi("android.service.notification.notification_get_original_importance") public int getOriginalImportance();

    method @Nullable public String getParentChannelId();

    method public android.net.Uri getSound();

    method @FlaggedApi("android.app.notification_channel_vibration_effect_api") @Nullable public android.os.VibrationEffect getVibrationEffect();

core/api/test-current.txt

+0 −1
Original line number Diff line number Diff line
@@ -371,7 +371,6 @@ package android.app { 


  public final class NotificationChannel implements android.os.Parcelable {

    method @NonNull public android.app.NotificationChannel copy();

    method public int getOriginalImportance();

    method public boolean isImportanceLockedByCriticalDeviceFunction();

    method public void lockFields(int);

    method public void setDeleted(boolean);

core/java/android/app/NotificationChannel.java

+8 −2
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import static android.service.notification.Adjustment.TYPE_NEWS; 
import static android.service.notification.Adjustment.TYPE_PROMOTION;

import static android.service.notification.Adjustment.TYPE_SOCIAL_MEDIA;

import static android.service.notification.Flags.FLAG_NOTIFICATION_CONVERSATION_CHANNEL_MANAGEMENT;

import static android.service.notification.Flags.FLAG_NOTIFICATION_GET_ORIGINAL_IMPORTANCE;



import android.annotation.FlaggedApi;

import android.annotation.NonNull;
@@ -1147,9 +1148,14 @@ public final class NotificationChannel implements Parcelable { 
    }



    /**

     * @hide

     * Returns the app-defined importance for this channel, prior to any user modifications. This

     * may differ from {@link #getImportance()} if the user has changed the setting. Typically

     * reflects the channel's initial importance set upon creation.

     *

     * @return The original importance as set by the app.

     * @see #getImportance()

     */

    @TestApi

    @FlaggedApi(FLAG_NOTIFICATION_GET_ORIGINAL_IMPORTANCE)

    public int getOriginalImportance() {

        return mOriginalImportance;

    }

core/java/android/service/notification/flags.aconfig

+8 −0
Original line number Diff line number Diff line
@@ -74,6 +74,14 @@ flag { 
  bug: "398153219"

}



flag {

  name: "notification_get_original_importance"

  is_exported: true

  namespace: "systemui"

  description: "Makes NotificationChannel#getOriginalImportance public"

  bug: "409474564"

}