commit 0e06994b73c4f88b66fd73de4e4c7341e90e5b4c
author Selim Cinek <cinek@google.com> Thu Jan 24 16:09:41 2019 -0800
committer Selim Cinek <cinek@google.com> Thu Jan 24 16:09:41 2019 -0800
tree 1bccb7ef5c4996ef7ca514d41a956fbc8c5b6046
parent 95b6e959fca26ddf77d4af0c57c5f5cfb92b09d3

Fixes an issue where the ambient layout could be null

Change-Id: I0dd190b2349445fbaafe4a5b612619e2dd002539
Fixes: 123247127

core/java/android/app/Notification.java

diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java
index b8d748d..b405d0c 100644
--- a/core/java/android/app/Notification.java
+++ b/core/java/android/app/Notification.java
@@ -5257,7 +5257,11 @@
          * @hide
          */
         public RemoteViews makeAmbientNotification() {
-            return createHeadsUpContentView(false /* increasedHeight */);
+            RemoteViews headsUpContentView = createHeadsUpContentView(false /* increasedHeight */);
+            if (headsUpContentView != null) {
+                return headsUpContentView;
+            }
+            return createContentView();
         }
 
         private void hideLine1Text(RemoteViews result) {