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

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

Merge "Adding an extras Bundle to MessagingStyle messages."

parents 13a8b797 5a871867

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -5415,6 +5415,7 @@ package android.app { 
    ctor public Notification.MessagingStyle.Message(java.lang.CharSequence, long, java.lang.CharSequence);

    method public java.lang.String getDataMimeType();

    method public android.net.Uri getDataUri();

    method public android.os.Bundle getExtras();

    method public java.lang.CharSequence getSender();

    method public java.lang.CharSequence getText();

    method public long getTimestamp();

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -5589,6 +5589,7 @@ package android.app { 
    ctor public Notification.MessagingStyle.Message(java.lang.CharSequence, long, java.lang.CharSequence);

    method public java.lang.String getDataMimeType();

    method public android.net.Uri getDataUri();

    method public android.os.Bundle getExtras();

    method public java.lang.CharSequence getSender();

    method public java.lang.CharSequence getText();

    method public long getTimestamp();

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -5425,6 +5425,7 @@ package android.app { 
    ctor public Notification.MessagingStyle.Message(java.lang.CharSequence, long, java.lang.CharSequence);

    method public java.lang.String getDataMimeType();

    method public android.net.Uri getDataUri();

    method public android.os.Bundle getExtras();

    method public java.lang.CharSequence getSender();

    method public java.lang.CharSequence getText();

    method public long getTimestamp();

core/java/android/app/Notification.java

+15 −1
Original line number Diff line number Diff line
@@ -5657,11 +5657,13 @@ public class Notification implements Parcelable 
            static final String KEY_SENDER = "sender";

            static final String KEY_DATA_MIME_TYPE = "type";

            static final String KEY_DATA_URI= "uri";

            static final String KEY_EXTRAS_BUNDLE = "extras";



            private final CharSequence mText;

            private final long mTimestamp;

            private final CharSequence mSender;



            private Bundle mExtras = new Bundle();

            private String mDataMimeType;

            private Uri mDataUri;
@@ -5729,6 +5731,13 @@ public class Notification implements Parcelable 
                return mTimestamp;

            }



            /**

             * Get the extras Bundle for this message.

             */

            public Bundle getExtras() {

                return mExtras;

            }



            /**

             * Get the text used to display the contact's name in the messaging experience

             */
@@ -5766,6 +5775,9 @@ public class Notification implements Parcelable 
                if (mDataUri != null) {

                    bundle.putParcelable(KEY_DATA_URI, mDataUri);

                }

                if (mExtras != null) {

                    bundle.putBundle(KEY_EXTRAS_BUNDLE, mExtras);

                }

                return bundle;

            }
@@ -5800,10 +5812,12 @@ public class Notification implements Parcelable 
                                bundle.getLong(KEY_TIMESTAMP), bundle.getCharSequence(KEY_SENDER));

                        if (bundle.containsKey(KEY_DATA_MIME_TYPE) &&

                                bundle.containsKey(KEY_DATA_URI)) {



                            message.setData(bundle.getString(KEY_DATA_MIME_TYPE),

                                    (Uri) bundle.getParcelable(KEY_DATA_URI));

                        }

                        if (bundle.containsKey(KEY_EXTRAS_BUNDLE)) {

                            message.getExtras().putAll(bundle.getBundle(KEY_EXTRAS_BUNDLE));

                        }

                        return message;

                    }

                } catch (ClassCastException e) {