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

Commit c8516380 authored by Scott Main's avatar Scott Main Committed by Android Git Automerger
Browse files

am eebec7b1: Merge "fix javadoc links. turns out, without parameters, javadoc... 

am eebec7b1: Merge "fix javadoc links. turns out, without parameters, javadoc will link to the best matching method signature, even if it\'s from the superclass. So these were pointing to Object.nofify()" into jb-mr2-dev

* commit 'eebec7b1':
  fix javadoc links. turns out, without parameters, javadoc will link to the best matching method signature, even if it's from the superclass. So these were pointing to Object.nofify()
parents 4026a797 eebec7b1

core/java/android/service/notification/StatusBarNotification.java

+4 −4
Original line number Diff line number Diff line
@@ -190,13 +190,13 @@ public class StatusBarNotification implements Parcelable { 
        return pkg;

    }



    /** The id supplied to {@link android.app.NotificationManager#notify}. */

    /** The id supplied to {@link android.app.NotificationManager#notify(int,Notification)}. */

    public int getId() {

        return id;

    }



    /** The tag supplied to {@link android.app.NotificationManager#notify}, or null if no tag

     * was specified. */

    /** The tag supplied to {@link android.app.NotificationManager#notify(int,Notification)},

     * or null if no tag was specified. */

    public String getTag() {

        return tag;

    }
@@ -217,7 +217,7 @@ public class StatusBarNotification implements Parcelable { 
    }



    /** The {@link android.app.Notification} supplied to

     * {@link android.app.NotificationManager#notify}. */

     * {@link android.app.NotificationManager#notify(int,Notification)}. */

    public Notification getNotification() {

        return notification;

    }