commit 24c47597142a9f0b6e3194ca3987726482a1979b
author android-build-team Robot <android-build-team-robot@google.com> Tue May 01 00:26:46 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue May 01 00:26:46 2018 +0000
tree 3f0df2987d2b905c2519b359ee0c930104120e92
parent c0775117c42db38ba3465b04f567d80d5936bf25
parent ed07b96aef925507990df6b6c04355c5975ca03d

Merge "Substituting the app name also on the public content view" into pi-dev

core/java/android/app/Notification.java

diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java
index c5b8019..725f240 100644
--- a/core/java/android/app/Notification.java
+++ b/core/java/android/app/Notification.java
@@ -5102,6 +5102,10 @@
                     savedBundle.getBoolean(EXTRA_SHOW_CHRONOMETER));
             publicExtras.putBoolean(EXTRA_CHRONOMETER_COUNT_DOWN,
                     savedBundle.getBoolean(EXTRA_CHRONOMETER_COUNT_DOWN));
+            String appName = savedBundle.getString(EXTRA_SUBSTITUTE_APP_NAME);
+            if (appName != null) {
+                publicExtras.putString(EXTRA_SUBSTITUTE_APP_NAME, appName);
+            }
             mN.extras = publicExtras;
             RemoteViews view;
             if (ambient) {