Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make getter & setting names consistent."

Browse Source
This commit is contained in:
TreeHugger Robot
2016-11-11 20:19:45 +00:00
committed by Android (Google) Code Review
parent 0a408f16a3 3785605a44
commit 3a7c696fc5
6 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -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);

2
api/system-current.txt
View File

@@ -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);

2
api/test-current.txt
View File

@@ -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);

2
core/java/android/app/Notification.java
View File

@@ -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;
}

2
services/core/java/com/android/server/notification/NotificationManagerService.java
View File

@@ -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());

2
services/core/java/com/android/server/notification/NotificationRecord.java
View File

@@ -283,7 +283,7 @@ public final class NotificationRecord {
pw.println(prefix + " mVisibleSinceMs=" + mVisibleSinceMs);
pw.println(prefix + " mUpdateTimeMs=" + mUpdateTimeMs);
pw.println(prefix + " mSuppressedVisualEffects= " + mSuppressedVisualEffects);
pw.println(prefix + " notificationChannel= " + notification.getNotificationChannel());
pw.println(prefix + " notificationChannel= " + notification.getChannel());
}