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

Commit 3a7c696f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Make getter & setting names consistent."

parents 0a408f16 3785605a

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -4954,9 +4954,9 @@ package android.app { 
    ctor public Notification(android.os.Parcel);

    method public android.app.Notification clone();

    method public int describeContents();

    method public java.lang.String getChannel();

    method public java.lang.String getGroup();

    method public android.graphics.drawable.Icon getLargeIcon();

    method public java.lang.String getNotificationChannel();

    method public android.graphics.drawable.Icon getSmallIcon();

    method public java.lang.String getSortKey();

    method public void writeToParcel(android.os.Parcel, int);

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -5107,9 +5107,9 @@ package android.app { 
    ctor public Notification(android.os.Parcel);

    method public android.app.Notification clone();

    method public int describeContents();

    method public java.lang.String getChannel();

    method public java.lang.String getGroup();

    method public android.graphics.drawable.Icon getLargeIcon();

    method public java.lang.String getNotificationChannel();

    method public android.graphics.drawable.Icon getSmallIcon();

    method public java.lang.String getSortKey();

    method public void writeToParcel(android.os.Parcel, int);

api/test-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -4964,9 +4964,9 @@ package android.app { 
    ctor public Notification(android.os.Parcel);

    method public android.app.Notification clone();

    method public int describeContents();

    method public java.lang.String getChannel();

    method public java.lang.String getGroup();

    method public android.graphics.drawable.Icon getLargeIcon();

    method public java.lang.String getNotificationChannel();

    method public android.graphics.drawable.Icon getSmallIcon();

    method public java.lang.String getSortKey();

    method public void writeToParcel(android.os.Parcel, int);

core/java/android/app/Notification.java

+1 −1
Original line number Diff line number Diff line
@@ -2239,7 +2239,7 @@ public class Notification implements Parcelable 
    /**

     * Returns the id of the channel this notification posts to.

     */

    public String getNotificationChannel() {

    public String getChannel() {

        return mChannelId;

    }

services/core/java/com/android/server/notification/NotificationManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -2722,7 +2722,7 @@ public class NotificationManagerService extends SystemService { 
                    + " id=" + id + " notification=" + notification);

        }

        final NotificationChannel channel =  mRankingHelper.getNotificationChannelWithFallback(pkg,

                callingUid, notification.getNotificationChannel());

                callingUid, notification.getChannel());

        final StatusBarNotification n = new StatusBarNotification(

                pkg, opPkg, channel, id, tag, callingUid, callingPid, notification,

                user, null, System.currentTimeMillis());