Merge "Do not treat EXTRA_SMALL_ICON <int> as Parcelable" into pi-dev

am: 82614bed0b Change-Id: Iae08aea13f79273e6f47d3c32832cd4eddd51010
2018-06-13 14:40:21 -07:00
parent ad824eb7a8 82614bed0b
commit 255c3b664d
1 changed files with 0 additions and 1 deletions
--- a/core/java/android/app/Notification.java
+++ b/core/java/android/app/Notification.java
@@ -2767,7 +2767,6 @@ public class Notification implements Parcelable
     */
    private void fixDuplicateExtras() {
        if (extras != null) {
-            fixDuplicateExtra(mSmallIcon, EXTRA_SMALL_ICON);
            fixDuplicateExtra(mLargeIcon, EXTRA_LARGE_ICON);
        }
    }